Daniel Hensby
1d1227cc9a
Merge branch '3'
2016-08-23 10:37:47 +01:00
Daniel Hensby
058f57979b
Merge branch '3.4' into 3
2016-08-22 16:23:22 +01:00
Daniel Hensby
060bf6b327
Merge branch '3.3' into 3.4
2016-08-22 16:22:37 +01:00
Daniel Hensby
088d88e978
Merge branch '3.2' into 3.3
2016-08-22 16:22:02 +01:00
Daniel Hensby
bdf9e97b0e
Cleaning up GridFieldAddExistingAutocompleter
2016-08-19 00:00:56 +01:00
Damian Mooyman
59efd280ad
Fix issues with CMS permission codes
...
Standardise template locations
Move CMSSettingsController class to SiteConfig module
Fix CMSMenu behaviour for namespaced admin sections
Split classes into one per file
Manual fixes and cleanup
2016-08-17 11:19:14 +12:00
Damian Mooyman
db34e011f3
Apply SilverStripe\Admin namespace
2016-08-17 11:12:22 +12:00
Christopher Joe
0363351ee5
Add React HtmlReadonlyField and fixed TextField id
2016-08-16 11:10:44 +12:00
Christopher Joe
a68ba38478
Improve FormBuilder API and added HeaderField and LiteralField
2016-08-16 11:09:19 +12:00
Damian Mooyman
d88516203c
Merge 3.4 into 3
2016-08-15 19:05:20 +12:00
Damian Mooyman
b0ba2015d9
[ss-2016-015] Fix value / title escaping in CheckboxSetField and OptionsetField
2016-08-15 15:53:21 +12:00
Damian Mooyman
049cdefacf
[ss-2016-015] Fix value / title escaping in CheckboxSetField and OptionsetField
2016-08-15 15:02:58 +12:00
Damian Mooyman
12a6b357e7
[ss-2016-015] Fix value / title escaping in CheckboxSetField and OptionsetField
2016-08-15 14:14:42 +12:00
Damian Mooyman
6005a1c2b2
API Upgrade for silverstripe CMS namespace changes
2016-08-11 11:51:02 +12:00
Damian Mooyman
7de5b998e1
Merge 3.4 into 3
2016-08-05 19:12:25 +12:00
Damian Mooyman
ca754eb887
Merge 3.3 into 3.4
...
# Conflicts:
# admin/javascript/lang/fa_IR.js
# admin/javascript/lang/it.js
# admin/javascript/lang/src/fa_IR.js
# admin/javascript/lang/src/it.js
# lang/cs.yml
# lang/eo.yml
# lang/fa_IR.yml
# lang/fi.yml
# lang/it.yml
# lang/sk.yml
2016-08-05 16:48:26 +12:00
Paul Clarke
b9445511b7
Bootstrap GridField
2016-08-03 18:35:18 +12:00
Daniel Hensby
af3412a4c2
Merge pull request #5340 from dnadesign/fixToGridFieldLoadingWrongCurrentPage
...
fix to grid field loading wrong current page id when using multiple tabs
2016-08-02 12:44:11 +01:00
Damian Mooyman
12adba3d34
BUG Fix [buttons] appearing instead of actual buttons when uploading files
2016-08-02 11:55:25 +12:00
Jono Menz
6c37532a7a
FIX Gridfield delete action back link ( #5848 )
...
Access backlink before the record is deleted
2016-07-29 10:51:53 +12:00
Damian Mooyman
d15b19d208
Fix merge regressions in add-link fixes
2016-07-28 17:03:46 +12:00
Damian Mooyman
c556b01071
API Update core templates for CompositeField / SelectionGroup.ss
2016-07-28 16:32:40 +12:00
Damian Mooyman
a809e80d01
API Convert CMS forms to bootstrap
...
NEW Add cms-forms microtheme to cater to bootstrap's needs.
Note that the old SS3 assets section is buggy as a result of this change.
2016-07-25 17:24:26 +12:00
Damian Mooyman
20daf1f8e1
API Abstract ThemeManifest into ThemeList
...
BUG Fix Requirements not resolving $default theme
2016-07-21 12:11:25 +12:00
Daniel Hensby
f548ddf8a8
Merge branch '3'
2016-07-20 21:44:47 +01:00
Anton Smith
4c856c4377
Use columns from gridfield for export
2016-07-19 08:26:07 +12:00
Daniel Hensby
2bbddab210
Merge pull request #5821 from open-sausages/pulls/4.0/fix-uploadfield-casting
...
BUG Fix regression with uploadfield casting
2016-07-18 09:46:39 +01:00
Damian Mooyman
b89fcfa188
BUG Fix regression with uploadfield casting
2016-07-18 18:33:44 +12:00
Damian Mooyman
9ce433c7fe
Merge pull request #5744 from jonners99/patch-1
...
Update GridFieldAddExistingAutocompleter.php
2016-07-18 18:13:32 +12:00
Loz Calver
2b1dd99be1
Refactor duplicate code in Form
2016-07-15 16:47:27 +01:00
Loz Calver
0a7e4cf7c3
Merge branch '3'
2016-07-15 16:01:48 +01:00
Loz Calver
391161208e
Merge branch '3.4' into 3
2016-07-15 14:34:50 +01:00
Loz Calver
44d7919496
Merge branch '3.3' into 3.4
2016-07-15 14:34:18 +01:00
Loz Calver
b3fea3723f
FIX: Fixes support for "inline" form actions ( fixes #2534 )
2016-07-15 10:11:47 +01:00
Sam Minnée
5c98d331a3
Merge pull request #5804 from open-sausages/feature/themestack
...
API Theme stacking
2016-07-15 17:12:54 +12:00
Hamish Friedlander
b8b4e98ac2
API Theme stacking
2016-07-15 16:29:25 +12:00
Damian Mooyman
5cb4ab4a82
API Add PopoverField for extra-actions popup in react
2016-07-15 15:46:11 +12:00
Damian Mooyman
9e1b12a891
API Support composite react formfields
...
Cleanup and standardise CompositeField API and subclasses
2016-07-15 14:26:28 +12:00
Daniel Hensby
a64a066bbf
Merge pull request #5665 from tractorcow/pulls/3.3/fix-button-clicked
...
BUG Fix buttonClicked() error
2016-07-15 00:30:25 +01:00
Daniel Hensby
4c40cf8dbb
Merge branch '3.4' into 3
2016-07-14 12:01:19 +01:00
Daniel Hensby
d766c8559b
Merge branch '3.3' into 3.4
2016-07-14 11:57:15 +01:00
Daniel Hensby
a2581b9cf7
Merge branch '3.2' into 3.3
2016-07-14 11:56:35 +01:00
Damian Mooyman
83c2af72ca
BUG Fix some regressions from #5653 ( #5806 )
2016-07-14 14:43:53 +12:00
zauberfisch
3482c98cce
only use PjaxResponseNegotiator in GridFieldDetailForm if the Request is actually AJAX ( fixes #5801 )
2016-07-13 13:32:50 +00:00
Damian Mooyman
fb6f8a0a04
BUG Fix Security page showing double escaped HTML
2016-07-13 19:08:09 +12:00
Damian Mooyman
26d46517ac
API Remove custom DBHTMLText::exists() custom behaviour
...
Fix merge regressions
2016-07-13 18:45:57 +12:00
Damian Mooyman
6a7c1056fe
BUG Fix shortcode parsing in HTMLEditorField::getanchors()
...
Fixes #5678
2016-07-13 17:15:45 +12:00
Damian Mooyman
b7ac5c564d
API / BUG Fix DBField summary methods
...
Cleanup DBField subclasses
Fixes #2929
Fixes #1381
Fixes #5547
Fixes #1751
2016-07-13 17:15:45 +12:00
Damian Mooyman
5c9044a007
API Enforce default_cast for all field usages
...
API Introduce HTMLFragment as casting helper for HTMLText with shortcodes disabled
API Introduce DBField::CDATA for XML file value encoding
API RSSFeed now casts from the underlying model rather than by override
API Introduce CustomMethods::getExtraMethodConfig() to allow metadata to be queried
BUG Remove _call hack from VirtualPage
API Remove FormField::$dontEscape
API Introduce HTMLReadonlyField for non-editable readonly HTML
API FormField::Field() now returns string in many cases rather than DBField instance.
API Remove redundant *_val methods from ViewableData
API ViewableData::obj() no longer has a $forceReturnObject parameter as it always returns an object
BUG Fix issue with ViewableData caching incorrect field values after being modified.
API Remove deprecated DB class methods
API Enforce plain text left/right formfield titles
2016-07-13 17:15:45 +12:00
Daniel Hensby
5776a03141
Merge branch '3'
2016-07-11 23:45:41 +01:00
