tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
14,631 Commits 31 Branches 527 Tags 162 MiB
c170f90d5e
Commit Graph

1484 Commits

Author SHA1 Message Date
Daniel Hensby
1d4150bee4 Merge pull request #3787 from uniun/patch-4 
FIX. Use i18n_plural_name() instead of plural_name()
 2015-02-17 10:54:45 +00:00
David Craig
33930597c0 Improve styling on modal dialogs 2015-02-16 08:58:23 +13:00
Aden Fraser
d555b5b26e Fixed JS error in lib.js (fixes #3481) 2015-02-11 16:59:53 +00:00
Ingo Schommer
d5bb290b8e Don't update CMS preview on a CMS redirect 
The CMS preview causes unnecessary browser processing by loading a URL
which should be considered "in transit" when a CMS redirect is set through
the X-ControllerURL HTTP header. The CMS history processing will
load this new URL, and cause a new preview URL to be loaded.

Fixes https://github.com/silverstripe/silverstripe-translatable/issues/158
 2015-02-08 19:58:55 +13:00
Oliver Shaw
7484b4f5d9 Trim ModelAdmin SearchForm values 2015-02-08 19:25:51 +13:00
Elvinas L
730c4d3733 Dropdowns admin styling 2015-02-08 18:59:38 +13:00
Will Rossiter
a4d4d0273b Merge pull request #2506 from chillu/pulls/form-validation-exempt 
Form validation exempts
 2015-02-08 16:58:49 +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
Damian Mooyman
58cb0af753 Merge remote-tracking branch 'origin/3' 
Conflicts:
	composer.json
	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/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/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
 2015-01-16 10:08:40 +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
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
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
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
Russell Michell
ef237f69cc FIX: Expands the CMS' centre-pane when collapsed and it's clicked. 2015-01-14 08:40:05 +13:00
Elvinas L.
ab24ed3bea FIX. Use i18n_plural_name() instead of plural_name() 2015-01-13 15:31:17 +02:00
Damian Mooyman
c2af23033f Update translations 2015-01-12 17:54:49 +13: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
Damian Mooyman
19549d620f Moved deprecation of SQLQuery to 4.0 2014-12-04 09:30:50 +13:00
Ingo Schommer
5d1c355cad Form action validation excempts 
Thanks to @kinglozzer for doing the majority of work on this. See #2493.
 2014-11-26 22:49:37 +13:00
Jonathon Menz
e4db619f8d MINOR: Fix broken 'Insert From CMS' layout 
Some updates to UploadField styles broke the layout of this form a bit
 2014-11-19 10:52:08 +10:30
Damian Mooyman
0b1f297873 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	.travis.yml
	README.md
	admin/code/LeftAndMain.php
	admin/css/screen.css
	admin/scss/screen.scss
	api/RestfulService.php
	conf/ConfigureFromEnv.php
	control/injector/ServiceConfigurationLocator.php
	control/injector/SilverStripeServiceConfigurationLocator.php
	core/ClassInfo.php
	core/Object.php
	css/AssetUploadField.css
	css/ComplexTableField_popup.css
	dev/CSSContentParser.php
	dev/DevelopmentAdmin.php
	docs/en/changelogs/index.md
	docs/en/misc/contributing/code.md
	docs/en/reference/execution-pipeline.md
	filesystem/GD.php
	filesystem/ImagickBackend.php
	filesystem/Upload.php
	forms/Form.php
	forms/FormField.php
	forms/HtmlEditorConfig.php
	forms/gridfield/GridFieldDetailForm.php
	forms/gridfield/GridFieldSortableHeader.php
	lang/en.yml
	model/Aggregate.php
	model/DataList.php
	model/DataObject.php
	model/DataQuery.php
	model/Image.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	model/fieldtypes/HTMLText.php
	model/fieldtypes/Text.php
	scss/AssetUploadField.scss
	search/filters/SearchFilter.php
	security/Authenticator.php
	security/LoginForm.php
	security/Member.php
	security/MemberAuthenticator.php
	security/MemberLoginForm.php
	security/Security.php
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
	tests/control/HTTPTest.php
	tests/control/RequestHandlingTest.php
	tests/filesystem/UploadTest.php
	tests/forms/FormTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataListTest.php
	tests/model/DataObjectTest.php
	tests/model/TextTest.php
	tests/security/MemberAuthenticatorTest.php
	tests/security/SecurityDefaultAdminTest.php
	tests/view/SSViewerCacheBlockTest.php
	tests/view/SSViewerTest.php
 2014-11-18 12:45:54 +13:00
Loz Calver
e4ddb4b975 FIX: Ensure query string in X-Backurl is encoded (fixes #3563) 2014-11-16 20:35:41 +00:00
Naomi Guyer
ec0c259c17 BUG: Reinstate tab and form focus states (fixes CMS #732 and #817) 
* Added methods to track and restore field focus
* Added a trigger event when tabstate reset

Update LeftAndMain.EditForm.js
 2014-10-26 14:21:47 +13:00
Damian Mooyman
3f1102306d Merge pull request #3575 from kinglozzer/pulls/fix-reopen-tab-response 
FIX: Prevent JSON response showing when re-opening closed tab (fixes silverstripe/silverstripe-cms#1121)
 2014-10-24 17:04:41 +13:00
Loz Calver
d6e1c5131c FIX: Prevent JSON response showing when re-opening closed tab (fixes silverstripe/silverstripe-cms#1121) 2014-10-23 22:24:36 +01:00
lukepercy
7e4e9dc40c fixed RemoteURL css for issue 1086 2014-10-22 14:57:59 +13:00
Damian Mooyman
53c40a94fa API Enable re-authentication within the CMS if a user session is lost 
BUG Resolve issue with error redirection being ignored within CMS
BUG Fix issue with invalid securityID being re-emitted on failure
 2014-10-14 15:19:48 +13:00
Loz Calver
5f653a00eb Add "retina" styles for high-dpi screens 2014-08-27 17:06:57 +01:00
Damian Mooyman
eb069e605d Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Sean Harvey
404478b07f Removing @deprecated 3.1 functionality and classes. 
Changelog has been updated to include what was removed in terms of
major functionality, and what to use as a replacement.
 2014-08-18 16:00:13 +12:00
Damian Mooyman
79c7276611 BUG Reapply fix for cms crashing due to History.js blindly appending slashes to end of url 2014-08-15 15:17:39 +12:00
Mateusz Uzdowski
8bf3853887 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	docs/en/misc/contributing/issues.md
	docs/en/reference/uploadfield.md
	forms/HtmlEditorField.php
	i18n/i18n.php
	javascript/HtmlEditorField.js
	model/DB.php
	model/Image.php
	model/SQLQuery.php
 2014-08-14 09:08:26 +12:00
Damian Mooyman
69de7e3fce BUG Fix incorrect parsing of HTML content 2014-08-11 11:47:14 +12:00
Damian Mooyman
fbc7e7c264 BUG Fix issue with generating tree data for missing pages 2014-08-08 15:29:28 +12:00
Damian Mooyman
e3d4e79bba Update translations 2014-08-05 15:02:18 +12:00
Stig Lindqvist
333a2aa8f9 BUG: CMS tree filters doesn't count the correct number of children for deleted pages 
This is a bug that combines Hierarchy, Versioned and LeftAndMain admins and CMSSiteTreeFilters.

This bug can be reproduced by having a large site tree with enough deleted pages in it so it doesn't
pre load all the children pages when initially opening an admin. Filter by either 'All pages including deleted'
or 'Deleted pages'. For CMS users it will look like deleted pages are gone.

The solution involves a couple of smaller fixes in both CMS and framework modules.

1) Ensure that 'numHistoricalChildren' are used instead of 'numChildren' when dealing with deleted pages
2) LeftAndMain::currentPage() deletes all the 'marking' cache previously built up by Hierarchy::markPartialTree()
3) Use Versioned::get_included_deleted() instead of raw DB queries against the DataObject tables when calculating parents in CMSSiteTreeFilter
 2014-07-25 16:19:30 +12:00
Mateusz U
613722053c Merge pull request #3299 from stojg/pull/if-user-logged-out-causes-500-error 
BUG If user is logged out getHtmlEditorConfigForCMS() gets called on non object
 2014-07-17 15:15:30 +12:00
Stig Lindqvist
ac64d258b7 BUG If user is logged out getHtmlEditorConfigForCMS() gets called on non object 
This can happen if the auto-logout feature logs a user out and the user then tries to open another admin or
do an pjax call.
 2014-07-17 14:45:22 +12:00
Mateusz Uzdowski
b34aaca2e8 BUG Fix several issues around onmatch/onunmatch entwines. 
1. Add missing _super calls.

2. Make UI widget destroys more consistent to avoid exceptions.
Selectable would throw an exception in the GridField.js if destroy
called from onunmatch - at that stage jQuery UI would have had called
the destroy already. Add a guard, and change to onremove, which triggers
before the element is removed from DOM.

3. DOM traversal fails after the element is removed from DOM.
Onunmatch triggers after the removal of the element from the DOM, which
makes DOM traversal fail. Use onremove instead, which triggers while the
element is still in DOM.
 2014-07-17 14:14:52 +12:00
Simon Welsh
c14d58f585 Merge branch '3.1' 
Conflicts:
	.travis.yml
	model/ManyManyList.php
	model/fieldtypes/DBField.php
 2014-07-16 21:24:02 +10:00
Damian Mooyman
d8e9af8af8 API New Database abstraction layer. Ticket #7429 
Database abstraction broken up into controller, connector, query builder, and schema manager, each independently configurable via YAML / Injector
Creation of new DBQueryGenerator for database specific generation of SQL
Support for parameterised queries, move of code base to use these over escaped conditions
Refactor of SQLQuery into separate query classes for each of INSERT UPDATE DELETE and SELECT
Support for PDO
Installation process upgraded to use new ORM
SS_DatabaseException created to handle database errors, maintaining details of raw sql and parameter details for user code designed interested in that data.
Renamed DB static methods to conform correctly to naming conventions (e.g. DB::getConn -> DB::get_conn)
3.2 upgrade docs
Performance Optimisation and simplification of code to use more concise API
API Ability for database adapters to register extensions to ConfigureFromEnv.php
 2014-07-09 18:04:05 +12:00
Sean Harvey
50214abf7f Merge pull request #2998 from torleif/patch-4 
Fix: WYSIWYG now returns valid HTML in tables
 2014-07-08 19:56:16 +12:00
Damian Mooyman
e9c3ff933f Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	.travis.yml
	composer.json
 2014-05-06 10:22:09 +12:00
Damian Mooyman
aef4b80fda Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	.travis.yml
	forms/ConfirmedPasswordField.php
 2014-05-06 10:06:58 +12:00
Stephen Shkardoon
677f0edcfc MINOR LeftAndMain::getRecord check $ClassName before use 
While the check for `$classname` was done in the first conditional, it was left out of the other two, leading to potential issues when an invalid ID was given, instead of the expected `false`.
 2014-05-05 19:26:05 +12:00
Damian Mooyman
0b4f62dfd8 BUG Fix jstree when duplicating subtrees 2014-04-29 16:00:07 +12:00
Damian Mooyman
4c69d42bd2 Merge remote-tracking branch 'origin/3.1' 2014-04-02 17:23:39 +13:00
Damian Mooyman
a2cadf9d5a Merge pull request #2974 from sunnysideup/patch-30 
typo fix
 2014-04-02 16:17:15 +13:00
torleif
169273b38d Fix: WYSIWYG now returns valid HTML in tables 
The WYSIWYG by default creates invalid HTML5. Creating a table and running it through W3C validator returns the following error: The border attribute on the table element is obsolete. Use CSS instead.
 2014-04-01 10:16:07 +13:00
Damian Mooyman
da1231a6e5 Updated translation masters 2014-03-31 14:13:15 +13:00
Simon Welsh
1d5706f15c Correct line length and indentation 2014-03-30 21:11:56 +13:00
Simon Welsh
2566795b59 Merge branch '3.1' 
Conflicts:
	view/SSViewer.php
 2014-03-30 19:39:18 +13:00
Simon Welsh
ac1546eb97 Correct line length and indentation 2014-03-30 19:37:54 +13:00
Simon Welsh
fe8dc50ffc Merge branch '3.1' 
Conflicts:
	tests/view/SSViewerTest.php
 2014-03-30 18:17:24 +13:00
Nicolaas
005e8065b9 typo fix 
upated should be spelled updated
 2014-03-21 14:30:17 +13:00
Simon Welsh
cbbce430e1 Merge pull request #2297 from colymba/htmleditorconfig-mode-fix 
HtmlEditorConfig default TinyMCE mode is now none
 2014-03-17 08:22:14 +13:00
colymba
9b5e5e812e HtmlEditorConfig default TinyMCE mode is now none 2014-03-16 13:48:01 +02:00
Ingo Schommer
d8361f9d3f Merge remote-tracking branch 'origin/3.1' 2014-02-18 22:06:59 +13:00
Ingo Schommer
a101d4edb3 Updated translations 2014-02-18 11:49:55 +13:00
Ingo Schommer
0d7e9a9692 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	_config/routes.yml
	docs/en/topics/datamodel.md
	forms/DropdownField.php
 2014-02-04 08:19:04 +13:00
Will Rossiter
6d9d53059c Tidy up active tab styles to match background, border alignment on page tabs. 
Before: https://www.evernote.com/shard/s6/sh/82f0a398-c80a-4cb7-81d7-a10b6e2c85ff/b1dfa1ae8ffcbd633b548fa3b2ea8951

After: https://www.evernote.com/shard/s6/sh/66cbe9d3-df0a-42c8-a6e8-a82c68161efe/27df7167802de9c3a267d40324972aa3

Tested throughout the CMS in IE8, Firefox and Chrome.
 2014-01-29 15:47:15 +13:00
Mateusz U
027022ef67 Merge pull request #2785 from halkyon/cmsmenu_test_fix 
Fixing failing tests because ?locale= is appended to the end of the URL.
 2014-01-16 17:50:40 -08:00
Sean Harvey
9d11f6f2f5 Fixing failing tests because ?locale= is appended to the end of the URL. 
Switching from assertEquals to assertContains to be more flexible when
extensions like Translatable add query vars at the end of the links.
 2014-01-17 13:48:46 +13:00
madmatt
77c35e7bde BUGFIX: Remove possibility of E_NOTICE in updatetreenodes(). 2014-01-13 17:47:33 +13:00
Matt Peel
aec29bf8c8 Properly fix SecurityAdmin Groups javascript checkbox toggling. 2014-01-09 08:47:41 +13:00
Simon Welsh
39d42e4ea3 Merge branch '3.1' 2014-01-09 08:22:47 +13:00
Matt Peel
ee1cfa2393 BUGFIX: Fix SecurityAdmin checkboxes not being properly unchecked 2014-01-08 14:55:23 +13:00
Will Rossiter
88c59ef0a7 Fix icon being stretched in ModelAdmins 2013-12-23 20:21:05 +13:00
Will Rossiter
3f6db0ddae Fix section icon in cms header 2013-12-21 17:23:07 +13:00
Will Rossiter
3e2cf27b38 Add ability for a panel link to link externally. 2013-12-21 16:59:09 +13:00
Will Rossiter
770e23f8e1 Merge pull request #2270 from ARNHOE/3.1-updatedfieldgroup 
BUG Updated fieldgroup class and example code
 2013-12-20 19:14:21 -08:00
Will Rossiter
57e65075e9 Dialog icon size 
The dialog close icon was one 1px higher then the dialog close hover icon causing a little bit of movement when hovering.
 2013-12-21 16:11:06 +13:00
Will Rossiter
1f125730e4 Merge pull request #2281 from mandrew/fixed_collapsed 
Fixing expanding/collapse CMS menu targeting wrong element
 2013-12-20 18:51:55 -08:00
Will Rossiter
9ee4de76c4 Merge pull request #1048 from silverstripe-rebelalliance/3.1_7876 
MINOR:added padding to ui-dialog-title so that it doesn't sit flush with...
 2013-12-20 16:09:23 -08:00
micmania1
229bea399b added logout url to Security and deprecated Security::set_login_url in favour of config 2013-12-20 21:55:54 +00:00
Ingo Schommer
f29d51f433 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	docs/en/reference/dataobject.md
	lang/es.yml
 2013-12-19 20:23:09 +01:00
Ingo Schommer
ca0c56e203 Updated translation masters 
Fixed two inconsistenties with missing namespaces in templates.
 2013-12-19 19:51:25 +01:00
Ingo Schommer
ddcdb2c0f0 Updated translations 2013-12-19 18:04:37 +01:00
Ingo Schommer
8d796cbea0 Merge pull request #2679 from micmania1/2658-get-templates-with-suffix 
API: moved getTemplatesWithSuffix functionality out into a SSViewer
 2013-12-12 13:39:13 -08:00
Ingo Schommer
41031900f9 Merge query strings in $.path rather than duplicating 
Fixes common duplications like ?locale=en_US&locale=en_US,
triggered e.g. by gridfield's showDetailView().

See https://github.com/silverstripe/silverstripe-translatable/issues/154
 2013-12-07 11:14:46 +01:00
Ingo Schommer
6176d65bd2 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	forms/gridfield/GridFieldSortableHeader.php
	model/DataList.php
	model/fieldtypes/Enum.php
 2013-12-02 20:49:34 +01:00
micmania1
b89ab1eb16 Added SSViewer::get_templates_by_class() to make the functionality in LeftAndMain::getTemplatesWithSuffix() more open. 2013-12-01 07:42:37 +00:00
Ingo Schommer
556090ccfa Generic “cancel” button behaviour with History.back() 
Used in “add page” dialog. See https://github.com/silverstripe/silverstripe-cms/pull/793 for context
 2013-11-22 12:47:35 +01:00
Loz Calver
c8caeb8154 Add X-Backurl header to CMS ajax requests 2013-11-15 09:20:53 +00:00
Andrew Short
bedf292612 Merge branch '3.1' 
Conflicts:
	docs/en/reference/execution-pipeline.md
	lang/nl.yml
 2013-11-11 18:18:25 +11:00
Ingo Schommer
8286ba346e admin/myprofile layout after validation (fixes #2644) 
Broke because the <form> tag was returned, while
the client logic was expecting the whole <div> including the <form>.
Fixed to display the button bar at the bottom,
and tested with validation errors as well as switching from/to
the panel via ajax.
 2013-11-07 16:19:40 +01:00
Ingo Schommer
adccda35aa Merge pull request #2609 from chillu/pulls/js-i18n-3.1 
API JS i18n files with short locale names, generated by build task
 2013-11-01 04:15:17 -07:00
Ingo Schommer
c547e426dd Merge pull request #2599 from tractorcow/pulls/3.1-uploadfield-formchanged 
BUG / API - Change tracking for UploadField
 2013-10-31 15:28:34 -07:00
Loz Calver
5a74a2e4e1 Set default encoding for compass 
See https://github.com/haml/haml/issues/269. Seems that OS X Mavericks causes this to occur, even when system default is set to utf-8.

Force encoding in admin scss as well
 2013-10-30 16:11:11 +00:00
Damian Mooyman
4102cc64a0 BUG Issues with CMSForm not consistently respecting new form naming scheme. 
Fixes for failing CMSFormTest cases
 2013-10-30 17:08:31 +13:00
Ingo Schommer
2c145cd454 API JS i18n files with short locale names, generated by build task 
The files are uploaded to transifex.com now, which means we needed
to consolidate the file names (= locales). Since Transifex doesn't allow
arbitrary JavaScript structures, we're using an intermediary JSON
format which gets transformed into the JS used by the framework.

See b59f3858af for generator logic.

Fixes https://github.com/silverstripe/silverstripe-framework/issues/2499
 2013-10-25 12:05:46 +02:00
Ingo Schommer
2266d77237 Revert "Style destructive actions destructively" 
This reverts commit 3851ef9f2c.
Breaks button alignment in CMS.
 2013-10-24 11:37:40 +02:00
Damian Mooyman
415f8a04b2 API Change tracker allows explicit dirty messages 
BUG Fixed issue with UploadField not detecting changes
 2013-10-24 17:53:40 +13:00
colymba
dda1441cce API TinyMCE contextmenu is disabled by default 
Allows for built-in browser spell-check to be used
 2013-10-23 19:15:16 +03:00
Ingo Schommer
4d1dd1e6c0 Merge pull request #2589 from kinglozzer/2188-treedropdownfield-overflow 
FIX: Allow TreeDropdownField to open upwards (fixes #2188)
 2013-10-23 06:11:41 -07:00
Ingo Schommer
b56ca812dc Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	tests/security/MemberTest.php
 2013-10-23 14:53:29 +02:00
Loz Calver
e46bcf792c FIX: Allow TreeDropdownField to open upwards (fixes #2188) 2013-10-23 13:32:01 +01:00
Ingo Schommer
d7e10e620a Merge pull request #2537 from wilr/membervalidator 
FIX: Use Injector API for managing Member_Validator instance.
 2013-10-23 03:01:15 -07:00
Ingo Schommer
ea5b3e4269 Merge pull request #2520 from wilr/destructivestyles 
Style destructive actions destructively
 2013-10-22 17:07:38 -07:00