Commit Graph

13986 Commits

Author SHA1 Message Date
jaredkipe
de09bffd84 Update Controller to allow extension in handleAction()
Controller's parent class (RequestHandler) has two extensions in its handleAction() method that are obscured by Controller's implementation.
2015-02-08 19:43:44 +13:00
Oliver Shaw
7484b4f5d9 Trim ModelAdmin SearchForm values 2015-02-08 19:25:51 +13:00
Ingo Schommer
5f31983ded NEW: updateAttributes hook in FormField 2015-02-08 19:14:31 +13:00
Elvinas L
730c4d3733 Dropdowns admin styling 2015-02-08 18:59:38 +13:00
Benjamin R. White
6212b4bd4b FIX: Versioned not ignoring obsolete fields 2015-02-08 18:42:36 +13:00
Damian Mooyman
85349820e4 BUG Debug error handler breaks error_get_last 2015-02-08 17:02:22 +13:00
Ralph Slooten
bdfcee7801 Prevent IE 9/10 errors
Both IE 9 & 10 generate a "SCRIPT70: Permission denied" when looping through the parents in the CMS. This happens after data has been edited in a UploadField iframe (eg: submitted Title change), followed by a click on any SiteTree link.
2015-02-08 16:38:26 +13:00
Will Rossiter
4ee38910cd Merge pull request #3861 from dhensby/pulls/3.2-docs
DOCS Updating contributing version
2015-02-08 13:58:48 +13:00
Daniel Hensby
e906f48d8d DOCS Updating contributing version 2015-02-07 14:36:21 +00:00
Loz Calver
bea6107f67 Merge pull request #3793 from dhensby/pulls/default-form-attributes
API Adding default_classes config option for Form and FormField
2015-02-03 14:08:24 +00:00
Will Rossiter
e724d6f578 BUG notice level error when value is not set on CreditCardField 2015-01-31 11:15:52 +13:00
Loz Calver
9944e82e51 Merge pull request #3712 from nickspiel/3
Update 'spinner' to a SilverStripe branded version
2015-01-27 09:33:12 +00:00
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
Nick Spiel
227ea82953 Update 'spinner' to an SilverStripe branded version
PSD: http://nickspiel.me/uploads/silverstripe-assets/spinner.psd
2015-01-14 20:29:07 +11: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