Damian Mooyman
|
db34e011f3
|
Apply SilverStripe\Admin namespace
|
2016-08-17 11:12:22 +12:00 |
|
Damian Mooyman
|
d88516203c
|
Merge 3.4 into 3
|
2016-08-15 19:05:20 +12:00 |
|
Damian Mooyman
|
bbc865ff67
|
Merge 3.4.1 into 3.4
|
2016-08-15 18:37:55 +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
|
62a242154e
|
[ss-2016-015] Fix value / title escaping in CheckboxSetField and OptionsetField
|
2016-08-15 13:24:06 +12:00 |
|
Damian Mooyman
|
ed7fe65156
|
BUG Fix usage of $this as closure argument
|
2016-08-12 09:49:23 +12:00 |
|
Jonathon Menz
|
d4114b3dce
|
FIX include related fields on canFilter() check
closes #5576
|
2016-08-11 10:26:18 -07:00 |
|
Damian Mooyman
|
6005a1c2b2
|
API Upgrade for silverstripe CMS namespace changes
|
2016-08-11 11:51:02 +12:00 |
|
Damian Mooyman
|
7026da20db
|
BUG Make template lookup use 'type' correctly
|
2016-08-10 15:52:15 +12:00 |
|
Hamish Friedlander
|
0fa39b591f
|
Merge pull request #5874 from open-sausages/pulls/4.0/fix-incorrect-versioned-basetable
BUG Fix incorrect use of baseClass as baseTable
|
2016-08-10 07:17:44 +07:00 |
|
Damian Mooyman
|
cb1f4335a0
|
API remove DataFormatter class and all subclasses
Cleanup of #5461
|
2016-08-09 15:49:11 +12:00 |
|
Damian Mooyman
|
01a13dcba9
|
BUG Fix incorrect use of baseClass as baseTable
|
2016-08-08 17:44:46 +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
|
e7c6509196
|
Merge remote-tracking branch 'cow/pulls/3.3/check-isset-config' into 3.3
|
2016-08-02 12:00:04 +01:00 |
|
Damian Mooyman
|
4ca3d1dc94
|
API Allow custom 'type' option for scripts
Fixes #5829
|
2016-08-02 18:49:13 +12:00 |
|
Damian Mooyman
|
cd80d501f9
|
BUG Fix unset config options returning isset() = true
Fixes #4791
|
2016-08-02 18:07:55 +12:00 |
|
Damian Mooyman
|
9188628ae3
|
API Add $action parameter to Controller::Link
|
2016-08-02 10:27:55 +12:00 |
|
Damian Mooyman
|
7d0b8e6520
|
BUG Fix permission checking code not correctly handling escaped SQL identifiers
Fixes https://github.com/silverstripe/silverstripe-installer/issues/96
|
2016-08-01 18:15:30 +12:00 |
|
Sam Minnée
|
c5d662b4fe
|
Merge pull request #5832 from open-sausages/pulls/4.0/bootify-forms-addpage
Add page styles based on new bootstrap forms
|
2016-07-28 18:13:25 +12:00 |
|
Hamish Friedlander
|
4d2fd04c64
|
FIX Behat preview mode finder being too specific (#5846)
|
2016-07-28 17:59:31 +12:00 |
|
Damian Mooyman
|
6e74b57c36
|
BUG Fix issue with gulpfile.js not compiling client/src/legacy dir
BUG Make SelectionGroup.ss and SelectionGroup.js work together
BUG Fix for IE visual indentation of composite field
|
2016-07-28 16:32:40 +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 |
|
Daniel Hensby
|
340a48306b
|
Merge branch '3.4' into 3
|
2016-07-20 19:48:17 +01:00 |
|
Daniel Hensby
|
cf247534d5
|
Merge branch '3.3' into 3.4
|
2016-07-20 19:43:41 +01:00 |
|
Daniel Hensby
|
96b061ffff
|
Merge branch '3.2' into 3.3
|
2016-07-20 19:41:46 +01:00 |
|
Daniel Hensby
|
ac17e12464
|
Merge pull request #3274 from colymba/custom-admin-url
|
2016-07-19 14:42:25 +01:00 |
|
Damian Mooyman
|
4b4aa4e91c
|
API Exclude templates in 'themes' directories from $default theme (#5820)
API $themes parameter is now mandatory in TemplateLoader::findTemplate()
|
2016-07-19 13:17:07 +12:00 |
|
madmatt
|
43dcde5197
|
FIX: Hierarchy was incorrectly unexpanding nodes that had been previously expanded
|
2016-07-19 11:22:36 +12: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 |
|
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
|
b7fc0a2752
|
Merge pull request #5790 from patricknelson/issue-5784-email-reply-to
FIX for #5784: Email API improvements, documentation cleanup.
|
2016-07-15 00:23:25 +01:00 |
|
Patrick Nelson
|
74c555e004
|
FIX for #5784: Added ->setReplyTo(), deprecated ->replyTo() for API consistency. Revamping, fixing, and enhancing internal Email API documentation. Simplified code and brought up-to-date with latest standards.
|
2016-07-14 10:25:40 -07:00 |
|
Daniel Hensby
|
d19955afc8
|
Merge branch '3'
|
2016-07-14 14:05:18 +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 |
|
Damian Mooyman
|
83c2af72ca
|
BUG Fix some regressions from #5653 (#5806)
|
2016-07-14 14:43:53 +12:00 |
|
Damian Mooyman
|
3b43145954
|
Merge pull request #5735 from silverstripe-terraformers/versions
FIX: Saving null values to the _versions table.
|
2016-07-14 13:30:30 +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 |
|