Ingo Schommer
1fb6bbb422
Merge pull request #4701 from scott1702/update-upload-button
...
Update asset admin toolbar
2015-10-30 09:14:41 +13:00
scott1702
9f9d0089df
Send user to new area when inserting url
2015-10-29 11:37:59 +13:00
Damian Mooyman
d1ea74e40d
API Implement AssetField to edit DBFile fields
2015-10-23 16:57:44 +13:00
Damian Mooyman
be239896d3
API Refactor of File / Folder to use DBFile
...
API Remove filesystem sync
API to handle file manipulations
2015-10-13 11:57:39 +13:00
scott1702
23baa288ba
Sticky footer on insert media/link elements
2015-10-01 15:35:56 +13:00
scott1702
33f181f72a
Update changelog to include removal of CMSFileAddController
...
Fix error in drag/drop functionality
2015-09-29 09:58:01 +13:00
scott1702
3f85c57013
Move 'upload new file' section to main files area
...
Optimise and fix drag drop on upload fields
Combine 3 tabs from the 'insert media' dialog box into 1
2015-09-28 12:02:33 +13:00
Damian Mooyman
34b71cf6c8
Merge remote-tracking branch 'origin/3'
2015-09-15 13:42:17 +12:00
Damian Mooyman
71b8aec306
Merge remote-tracking branch 'origin/3.2' into 3
2015-09-15 13:35:51 +12:00
Damian Mooyman
c4710b2272
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
admin/code/GroupImportForm.php
admin/code/MemberImportForm.php
tests/model/DataListTest.php
2015-09-15 13:18:47 +12:00
Damian Mooyman
6699f65b3f
Merge pull request #4594 from kinglozzer/uploadfield-attach-nonexistent
...
FIX: UploadField error when attempting to attach non-existent file IDs
2015-09-11 16:33:42 +12:00
Loz Calver
06cc18526a
FIX: UploadField error when attempting to attach non-existent file IDs
2015-09-09 09:24:56 +01:00
Damian Mooyman
b552a7370f
Merge remote-tracking branch 'origin/3'
...
Conflicts:
tests/model/ImageTest.php
2015-09-09 15:44:47 +12:00
Damian Mooyman
f10785350e
Merge remote-tracking branch 'origin/3.2' into 3
...
Conflicts:
docs/en/02_Developer_Guides/02_Controllers/01_Introduction.md
2015-09-09 14:50:47 +12:00
Damian Mooyman
92f9af1984
Update translations
2015-09-02 11:15:53 +12:00
Ingo Schommer
b7e4e9abb7
Merge pull request #4479 from hex0id/patch-2
...
Fix datefield to work with other form markup
2015-08-28 08:56:31 +12:00
hex0id
d678cfc1d1
Update DateField.js
...
change selector to preserve backwards compatibility
2015-08-27 16:50:25 -04:00
Damian Mooyman
f220adc3e0
Update translations
2015-08-24 16:52:39 +12:00
Patrick Nelson
e13aebc3d7
FIX for #4502 Prevents JSON.parse() from scrambling sorted results from server-side.
...
Conflicts:
tests/forms/gridfield/GridFieldAddExistingAutocompleterTest.php
2015-08-19 11:42:45 +01:00
Dan Hensby
c5c8a6a720
Merge remote-tracking branch '3.2' into 3
...
Conflicts:
admin/templates/Includes/ModelAdmin_ImportSpec.ss
css/GridField.css
2015-08-17 11:59:24 +00:00
hex0id
053c47499e
Fix datefield to work with other form markup
...
Changed onClick selector to catch any date field, so it will work with "nonstandard" form markups like adding new lines from https://github.com/silverstripe-australia/silverstripe-gridfieldextensions
2015-08-04 06:31:19 -04:00
Damian Mooyman
102892e247
Update translations
2015-08-04 13:02:20 +12:00
David Craig
ae3fc84181
Add three column layout to Page content view
...
- Content filters included in SiteTree view
- View (tree/list) buttons included in SiteTree view
- Update view button styles for new layout
- Updated breadcrumbs for new layout
2015-07-02 10:22:24 +12:00
Damian Mooyman
0abacaead6
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
admin/code/LeftAndMain.php
forms/EmailField.php
forms/Form.php
forms/HeaderField.php
forms/LiteralField.php
forms/PasswordField.php
forms/TextareaField.php
forms/TreeDropdownField.php
model/DataObject.php
tests/forms/uploadfield/UploadFieldTest.php
tests/model/DataObjectTest.php
2015-06-17 11:24:25 +12:00
Daniel Hensby
ad04eeb5c4
Merge pull request #4259 from tractorcow/pulls/3/multi-htmleditor-config
...
API Support for multiple HTMLEditorConfig per page
2015-06-12 00:53:44 +01:00
Daniel Hensby
6be0488731
FIX TreeDropdownField doesnt change label on unselect
2015-06-11 16:14:08 +01:00
Damian Mooyman
a8ace75341
API Support for multiple HTMLEditorConfig per page
2015-06-09 12:17:55 +12:00
scott1702
a9d22f1fbf
NEW: Files can be uploaded directly in the 'Insert Link' form
2015-06-03 11:20:29 +12:00
Damian Mooyman
8331171f2c
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
.scrutinizer.yml
admin/javascript/LeftAndMain.Panel.js
core/startup/ParameterConfirmationToken.php
dev/Debug.php
dev/FixtureBlueprint.php
docs/en/00_Getting_Started/05_Coding_Conventions.md
docs/en/00_Getting_Started/index.md
docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
filesystem/File.php
filesystem/Folder.php
forms/FieldList.php
forms/LabelField.php
forms/MoneyField.php
forms/TextField.php
forms/TreeDropdownField.php
forms/Validator.php
forms/gridfield/GridField.php
forms/gridfield/GridFieldExportButton.php
lang/de.yml
lang/fi.yml
model/DataObject.php
model/SQLQuery.php
parsers/ShortcodeParser.php
security/ChangePasswordForm.php
security/Security.php
tests/control/DirectorTest.php
tests/core/startup/ParameterConfirmationTokenTest.php
tests/dev/FixtureBlueprintTest.php
tests/forms/FieldListTest.php
tests/forms/MoneyFieldTest.php
tests/model/SQLQueryTest.php
tests/security/SecurityTest.php
2015-06-02 19:13:38 +12:00
Damian Mooyman
69a244e03f
Update translations
2015-05-14 13:45:03 +12:00
Damian Mooyman
19423e9a44
BUG Fix tinymce errors crashing CMS
...
When removing a tinymce field, internal third party errors should be caught and ignored gracefully rather than breaking the whole CMS.
2015-04-24 14:59:37 +12:00
Damian Mooyman
8caaae601b
BUG Fix accordion sometimes displaying scrollbars
2015-04-14 13:18:57 +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
David Craig
3a3c8c937b
Disable gridfield 'add' button when autocompleter is empty
2015-03-31 12:34:35 +13: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
a7bd6de2ec
Update translations
2015-03-09 17:11:10 +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
Damian Mooyman
1db08bac88
BUG Fix FormAction title encoding
...
BUG Fix TreeMultiSelectField using the wrong label
BUG Fix encoding of selected title on TreeDropdownField
BUG Fix DataDifferencer trying to compare non-comparable fields (non-dbfield objects)
BUG: Fix issue with TreeMultiSelectField not saving
BUG: Fix issue with GridFieldPrintButton
ENHANCEMENT Instead of using multiple api calls to encode dbfield values, delegate this operation to the individual fields via forTemplate
Instead of using a new API to communicate html encoding to treeselect, just ensure all content is HTML encoded, and enable html_titles in jstree.
2015-02-13 15:50:45 +13:00
Daniel Hensby
89c14d079d
Making TreeMultiSelectField consistent with parent class
...
NEW TreeDropdownField sanatiser helper added
Use config for default_cast of objects
FIX Determine if Diffed value should be escaped
Forcing casting for core DB fields
Fixing permissions labels
2015-02-13 11:12:30 +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
Daniel Hensby
6103d66116
Fix issue where TreeDropdownField loses value on show/hide
...
Fixes https://github.com/silverstripe/silverstripe-cms/issues/1157
2015-01-27 11:53:53 +00: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
Emma O'Keefe
2e6e8af161
BUG insert media trims whitespace - fixes #845
2015-01-13 15:40:12 +13:00
Damian Mooyman
c2af23033f
Update translations
2015-01-12 17:54:49 +13:00
Loz Calver
6ad8f7c3dd
NEW: Subject line for email links in HtmlEditorField
2014-12-15 21:56:10 +00:00
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
Sean Harvey
2c25358828
Merge pull request #2866 from kinglozzer/2862-uploadfield-editform-height
...
FIX: UploadField height calculation fix (fixes #2862 & #2863 )
2014-09-26 10:30:52 +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
Simon Welsh
9b8d07ca5b
Merge pull request #3180 from colymba/i18n-js-injection-fix
...
API New i18n JS sprintf and inject replacement functions
2014-08-07 21:24:52 +10:00
Damian Mooyman
e3d4e79bba
Update translations
2014-08-05 15:02:18 +12:00
