Damian Mooyman
cd1eb1b484
Merge remote-tracking branch 'origin/3'
...
Conflicts:
admin/tests/CMSFormTest.php
2015-05-19 09:19:47 +12:00
Loz Calver
f38836df37
Recompile SCSS
2015-05-07 12:38:18 +01:00
Sean Harvey
2a04713323
Merge pull request #4153 from tractorcow/pulls/3/filter-page-highlight
...
API Enable tree filter highlighting
2015-05-07 10:14:33 +12:00
scott1702
8107e86d01
Change cursor for drag + drop icon on hover/active
2015-05-05 16:43:47 +12:00
Damian Mooyman
8863797b76
API Enable tree filter highlighting
...
Decoupling of CMS / Framework
2015-05-04 17:06:16 +12:00
Stevie Mayhew
0d94cf15a5
UPDATE: change all instances of $this->request to use appropriate getter/setter
2015-04-30 11:04:08 +12:00
David Craig
fa6f446867
Add styling to handle toggleable descriptions for files
2015-04-28 10:49:17 +12:00
David Craig
3122226273
Add toggleable description to CMS fields
2015-04-24 11:40:29 +12:00
Ingo Schommer
72a284c9b8
Merge remote-tracking branch 'origin/3'
...
Conflicts:
core/Constants.php
docs/en/05_Contributing/01_Code.md
tests/model/SQLQueryTest.php
2015-04-09 16:26:16 +12:00
Damian Mooyman
43f49e8434
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
admin/code/ModelAdmin.php
control/Director.php
model/SQLQuery.php
security/Member.php
tests/control/HTTPTest.php
tests/model/SQLQueryTest.php
tests/security/SecurityTest.php
tests/view/SSViewerTest.php
2015-03-31 19:54:15 +13:00
Loz Calver
2d1fa46be8
Merge pull request #4011 from dhensby/pulls/model-admin-import-naming
...
Using sigular name for model import form rather than class name
2015-03-19 21:09:19 +00:00
Daniel Hensby
13cec2ee81
Using sigular name for model import form rather than class name
2015-03-13 13:36:52 +00:00
Damian Mooyman
319b96b48b
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
docs/en/05_Contributing/01_Code.md
forms/TreeDropdownField.php
model/DataObject.php
security/Member.php
tests/model/DataObjectTest.php
2015-03-11 11:40:06 +13:00
Damian Mooyman
636784845e
Update admin js translations
2015-03-10 09:13:35 +13:00
Damian Mooyman
a7bd6de2ec
Update translations
2015-03-09 17:11:10 +13:00
Daniel Hensby
d2a3da2203
Making docs gender agnostic
2015-03-07 12:32:04 +00:00
Jonathon Menz
8ee9130bcf
NEW: CMS site tree status icons
...
Added coloured status 'dots' to overlay page icons and improved visibility of status labels
2015-03-04 08:43:00 -08:00
Jonathon Menz
5216b67290
Compile latest scss
2015-03-04 08:43:00 -08:00
Ingo Schommer
7c4c30270a
Merge pull request #3901 from flashbackzoo/pulls/ui-dialog-styling
...
Improve styling on modal dialogs
2015-02-21 16:27:32 +13:00
Damian Mooyman
a86ed93759
Merge remote-tracking branch 'origin/3'
...
Conflicts:
docs/en/05_Contributing/01_Code.md
2015-02-20 14:09:38 +13:00
Damian Mooyman
dff65867cc
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
control/HTTP.php
control/HTTPResponse.php
docs/en/05_Contributing/01_Code.md
forms/CompositeField.php
forms/FormAction.php
forms/FormField.php
forms/InlineFormAction.php
forms/NumericField.php
forms/TreeDropdownField.php
forms/TreeMultiselectField.php
templates/forms/TreeDropdownField.ss
tests/core/CoreTest.php
tests/forms/NumericFieldTest.php
tests/model/DataDifferencerTest.php
2015-02-20 10:17:19 +13:00
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
