Daniel Hensby
5d4c2c4b34
API Adding default_classes to FormField
2015-01-20 13:36:32 +00:00
Daniel Hensby
6d0002780d
API Adding default_classes to Form
2015-01-20 13:36:31 +00:00
Damian Mooyman
33b18ce998
Fix merge error
2015-01-15 18:56:09 +13:00
Damian Mooyman
88fdc75456
Merge remote-tracking branch 'composer/3.1' into 3
...
Conflicts:
.editorconfig
docs/en/00_Getting_Started/00_Server_Requirements.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
docs/en/00_Getting_Started/04_Directory_Structure.md
docs/en/00_Getting_Started/index.md
docs/en/01_Tutorials/01_Building_A_Basic_Site.md
docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
docs/en/01_Tutorials/03_Forms.md
docs/en/01_Tutorials/04_Site_Search.md
docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
docs/en/01_Tutorials/index.md
docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
docs/en/02_Developer_Guides/01_Templates/06_Themes.md
docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
docs/en/02_Developer_Guides/05_Extending/05_Injector.md
docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
docs/en/02_Developer_Guides/10_Email/index.md
docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md
docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
docs/en/02_Developer_Guides/14_Files/index.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
docs/en/04_Changelogs/3.1.9.md
docs/en/05_Contributing/00_Issues_and_Bugs.md
docs/en/05_Contributing/02_Release_Process.md
docs/en/05_Contributing/03_Documentation.md
filesystem/File.php
filesystem/GD.php
model/DataDifferencer.php
model/Versioned.php
security/BasicAuth.php
security/Member.php
tests/filesystem/FileTest.php
tests/forms/uploadfield/UploadFieldTest.php
tests/model/VersionedTest.php
tests/security/BasicAuthTest.php
2015-01-15 18:52:46 +13:00
Elvinas L
cee7adc12c
FIX. Placeholder isn't completely translated
2015-01-15 14:15:03 +13:00
Damian Mooyman
50d80e5854
Merge remote-tracking branch 'origin/3.1.9' into 3.1
2015-01-15 13:24:34 +13:00
Damian Mooyman
87d6250ea7
Reword upgrading notes
2015-01-15 11:56:46 +13:00
Damian Mooyman
7b20f775f2
Updated changelog
2015-01-15 11:45:41 +13:00
Will Rossiter
220bdf342c
Merge pull request #3577 from tractorcow/pulls/3.1/fix-basicauth-resetlogin
...
BUG Fix BasicAuth not resetting failed login counts on authentication
2015-01-15 11:03:52 +13:00
Damian Mooyman
aa445b8e5a
Merge pull request #3564 from kinglozzer/pulls/3563-encode-backurl
...
FIX: Ensure query string in X-Backurl is encoded (fixes #3563 )
2015-01-15 10:23:19 +13:00
Loz Calver
c18bf6222b
Merge pull request #3788 from camfindlay/zippylinkfix
...
DOCS - fix reported broken links
2015-01-14 09:33:26 +00:00
Loz Calver
7b12fb9a60
Merge pull request #3791 from scott1702/patch-2
...
DOCS Minor spelling error
2015-01-14 09:25:39 +00:00
Loz Calver
dae4de1169
Merge pull request #3780 from phptek/centre-pane-expand
...
FIX: Expands the CMS' centre-pane when collapsed and it's clicked.
2015-01-14 09:13:43 +00:00
scott1702
bca4024ee8
DOCS Minor spelling error
...
Fixed a minor spelling error in tutorial 2.
2015-01-14 16:57:54 +13:00
Cam Findlay
3239cfd495
DOCS - fix reported broken links by zippy in IRC
2015-01-14 08:59:55 +13:00
Russell Michell
ef237f69cc
FIX: Expands the CMS' centre-pane when collapsed and it's clicked.
2015-01-14 08:40:05 +13:00
Will Rossiter
cf9c6666dd
Merge pull request #3785 from emmahuangokeefe/3.1
...
BUG insert media trims whitespace - fixes #845
2015-01-13 16:27:01 +13:00
Emma O'Keefe
2e6e8af161
BUG insert media trims whitespace - fixes #845
2015-01-13 15:40:12 +13:00
Will Rossiter
ee88a8e538
Merge pull request #3784 from silverstripe/revert-3783-3.1
...
Revert "BUG insert media trims whitespace fixes #845 "
2015-01-13 15:23:36 +13:00
Will Rossiter
90b134d0d1
Revert "BUG insert media trims whitespace fixes #845 "
2015-01-13 15:23:28 +13:00
Will Rossiter
b09091cb5f
Merge pull request #3783 from emmahuangokeefe/3.1
...
BUG insert media trims whitespace fixes #845
2015-01-13 15:16:35 +13:00
Emma O'Keefe
2861e7c840
BUG insert media trims whitespace fixes #845
2015-01-13 14:51:24 +13:00
Damian Mooyman
db314b2a76
Added 3.1.9-rc1 changelog
2015-01-13 09:04:39 +13:00
Damian Mooyman
c2af23033f
Update translations
2015-01-12 17:54:49 +13:00
Damian Mooyman
c49f16442b
Merge pull request #3781 from tractorcow/pulls/3.1/fix-file-canedit
...
Fix file and uploadfield permissions
2015-01-12 17:22:11 +13:00
Damian Mooyman
7816875e92
Fix file and uploadfield permissions
2015-01-12 10:56:25 +13:00
Will Rossiter
146b4689b8
Merge pull request #3768 from micmania1/patch-7
...
FIX Uneccessary class replacement
2015-01-08 21:33:09 +13:00
Michael Strong
a02adf6854
FIX Uneccessary class replacement
...
Overly complex code example.
2015-01-08 20:53:45 +13:00
Will Rossiter
e134c9b7c9
Merge pull request #3766 from scott1702/patch-2
...
DOCS Fixed dead link to image in tutorial 1
2015-01-08 20:51:37 +13:00
scott1702
971334b408
DOCS Fixed dead link to image in tutorial 1
...
Found a dead link to the Silverstripe Logo, have changed this to an updated working link of the same image.
2015-01-08 16:31:28 +13:00
Elvinas L
5637431a3f
FIX: The method 'name' does not exist on 'Form'
2015-01-07 20:59:05 +00:00
Loz Calver
5b1c8771c4
Merge pull request #3758 from stevie-mayhew/patch-2
...
Remove "Filter" title if no search form is present
2015-01-07 09:53:26 +00:00
Stevie Mayhew
11e48245c9
Remove "Filter" title if no search form is present
...
Same as with the import form - you can overload the public function `SearchForm` in your model admin subclass to not return a form and the title currently remains there which makes no sense.
2015-01-07 16:22:12 +13:00
Will Rossiter
218ef0b599
Merge commit 'ec0c259' into 3
...
* commit 'ec0c259':
BUG: Reinstate tab and form focus states (fixes CMS #732 and #817 )
2015-01-07 14:26:19 +13:00
Daniel Hensby
97a9e499a0
Merge pull request #3755 from chillu/pulls/behat-dropdown
...
Behat: Ignore native dropdowns if they're not visible
2015-01-07 00:18:36 +03:00
Ingo Schommer
c705c547fd
Behat: Ignore native dropdowns if they're not visible
...
The CmsUiContext->theIFillInTheDropdownWith() method was written
primarily for TreeDropdownField, which don't have a select tag (only an input tag).
The method currently fails for CMS dropdowns (Dropdown form field class),
since they have a hidden select tag.
I've checked through core feature files and confirmed that every use
of the method relates to TreeDropdownField, which is why this bug hasn't ocurred earlier.
2015-01-06 10:19:17 +13:00
Will Rossiter
fb8fda0058
Merge pull request #3753 from camfindlay/patch-10
...
DOCS Updating links in getting started index
2015-01-05 19:05:10 +13:00
Cam Findlay
e114301c7d
DOCS Updating links in getting started index
...
This index had some older links which have been updated.
2015-01-05 15:28:29 +13:00
Will Morgan
883d4a60a9
Merge pull request #3752 from camfindlay/patch-9
...
DOCS Core committers should have 2 t's
2015-01-04 22:03:21 +00:00
Cam Findlay
bfd05d7343
DOCS Core committers should have 2 t's
2015-01-05 10:57:15 +13:00
Loz Calver
524185c301
Merge pull request #3750 from OliBridgman/patch-2
...
Update 01_Data_Model_and_ORM.md
2015-01-04 18:40:50 +00:00
OliBridgman
95be3593ea
Update 01_Data_Model_and_ORM.md
...
Couple of grammatical errors.
2015-01-04 23:32:19 +13:00
Loz Calver
8b0bcd93e8
Merge pull request #3744 from Zomxilla/patch-1
...
Remove trailing "###"
2014-12-22 00:46:41 +00:00
Zomxilla
8e9f1d48c6
Remove trailing "###"
...
Incorrect markdown
2014-12-22 13:00:51 +13:00
Damian Mooyman
5a48501def
Merge pull request #3740 from camfindlay/fiximagelinks
...
DOCS Make links relative so they work nicely on github and docs site.
2014-12-18 12:12:48 +13:00
Cam Findlay
606d5667cf
DOCS Make links relative so they work nicely on github and docs site.
2014-12-18 12:11:57 +13:00
Damian Mooyman
97d0e2facd
Merge pull request #3739 from camfindlay/videolessons
...
DOCS Added links to the video lessons on silverstripe.org
2014-12-18 09:21:23 +13:00
Damian Mooyman
348262f88f
Merge pull request #3735 from camfindlay/3.2-plus-betadocs
...
DOCS forward port of new docs into 3.2
2014-12-18 09:19:56 +13:00
Cam Findlay
66d0fcc11c
Migrate 3.2 docs into new docs structure
2014-12-17 15:50:06 +13:00
Ingo Schommer
e48e4cac06
Semver documented in release process
...
See https://groups.google.com/forum/#!topic/silverstripe-dev/J4U4Nl2qTSg .
2014-12-17 15:50:06 +13:00
