Commit Graph

17980 Commits

Author SHA1 Message Date
Daniel Hensby
f225b83e2b
Merge branch '3' 2017-03-03 15:55:22 +00:00
Daniel Hensby
e932b22388
Merge branch '3.5' into 3 2017-03-03 14:54:43 +00:00
Daniel Hensby
8aaa3e3a86
Merge branch '3.4' into 3.5 2017-03-03 14:54:29 +00:00
Daniel Hensby
7f194a917d
Merge pull request #6351 from steve-silverstripe/patch-2 2017-03-03 14:05:53 +00:00
Daniel Hensby
62e301bdba Merge pull request #6529 from timezoneone/3.5
Fix bug: In addOrderBy method, _SortColumn will only keep the last one if there are more than 1 multi-word columns
2017-03-03 12:45:05 +00:00
Daniel Hensby
e27a2b3dd4 Merge pull request #6669 from timkung/pulls/update-gridfield-sort-icon-direction
Updating GridField.scss to fix sort icon direction
2017-03-03 12:37:04 +00:00
Daniel Hensby
d01da57da1 Merge pull request #6674 from oilee80/master
Fix for APCu cache otherwise you get 'Cache key must be string, "bool…
2017-03-03 12:17:06 +00:00
Lee Bradley
263e747d07 Fix for APCu cache otherwise you get 'Cache key must be string, "boolean" given'
Also corrects parameter variable name
2017-03-03 10:35:01 +00:00
Daniel Hensby
e8eb2f0fb0
Merge pull request #6668' from timkung/pulls/modeladmin-content-template-fix 2017-03-03 10:18:31 +00:00
Damian Mooyman
58f336928a Merge pull request #6672 from andrewandante/FIX/apcu-cache-error
FIX/apcu cache errors
2017-03-03 15:37:50 +13:00
Shawn
72b6fb49b6 Fix bug: In addOrderBy method, _SortColumn will only keep the last one if there are more than 1 multi-word columns 2017-03-03 14:11:53 +13:00
Daniel Hensby
5edaea75e0 Merge pull request #6671 from open-sausages/pulls/4.0/mark-classloader-internal
BUG Mark $instance as internal to prevent being saved to config
2017-03-02 16:49:51 +00:00
Andrew Aitken-Fincham
abe967f235 FIX/pass arguments directly (not in array) 2017-03-02 11:12:06 +00:00
Damian Mooyman
b6d9b34ce4
BUG Mark $instance as internal to prevent being saved to config 2017-03-02 17:19:44 +13:00
Tim Kung
0b73039e6f switching the ascending and descending sprites for the grid field sort icon to be correct 2017-03-02 10:35:20 +13:00
Tim Kung
33054100ca updating title attribute on managed model tab list links to the actual title of each model 2017-03-01 16:32:30 +13:00
Damian Mooyman
53cad18fd7 Added 4.0.0-alpha5 changelog 2017-03-01 15:01:48 +13:00
Damian Mooyman
09f47789b7 Added 4.0.0-alpha5 changelog 2017-03-01 14:27:17 +13:00
Damian Mooyman
12d10df57a Update translations 2017-03-01 14:08:50 +13:00
Damian Mooyman
db6e4869b3
Add cow release metadata to release silverstripe/config 2017-03-01 12:17:30 +13:00
Ingo Schommer
1f3f645106 Merge pull request #6666 from open-sausages/pulls/4.0/soft-autoload
BUG Prevent obsolete class cache breaking autoload
2017-03-01 12:09:17 +13:00
Damian Mooyman
6ed98a3a94
BUG Prevent obsolete class cache breaking autoload
Remove hard-coded class paths
2017-03-01 10:06:15 +13:00
Loz Calver
b9da55c8ab Merge pull request #6659 from robbieaverill/bugfix/quote-constants-in-yaml
FIX Add quotes to constants in YAML to ensure syntax validity
2017-02-28 09:19:22 +00:00
Damian Mooyman
75d8e923fb Merge pull request #6664 from open-sausages/pulls/4.0/cms-view-fields
Add class to clear underline styling for fieldholders
2017-02-28 19:53:51 +13:00
Damian Mooyman
7f04a61cba Merge pull request #6656 from open-sausages/pulls/4.0/composite-field
Fix fieldgroups to flexbox the inner fields
2017-02-28 19:53:14 +13:00
Christopher Joe
fc54fa1600
Enhancement Add class to clear underline styling for fieldholders 2017-02-28 17:59:54 +13:00
Christopher Joe
cbc5aca26a Fix add fieldgroup specific flexbox styles to the inner fields 2017-02-28 17:26:43 +13:00
Sam Minnée
5388ff41ec Merge pull request #6641 from open-sausages/pulls/4.0/micmania-config
API Substitute silverstripe/config module for core config
2017-02-28 11:26:42 +11:00
Damian Mooyman
e74556b322 API Protect Director::get_environment_type() from invoking 2017-02-28 10:49:29 +13:00
Robbie Averill
badf7d3a73 FIX Add quotes to constants in YAML to ensure syntax validity 2017-02-27 21:48:42 +13:00
Damian Mooyman
ff47bc03d7 BUG Remove reference to $_SERVER within FakeController 2017-02-27 16:54:01 +13:00
Damian Mooyman
695194546d BUG Ensure test fixture uses test module manifest 2017-02-27 16:54:01 +13:00
Damian Mooyman
3983b4d1b1 Fix cache used in ModuleManifest 2017-02-27 16:54:01 +13:00
Damian Mooyman
c452d5f6cd API Rename CoreConfigCreator to CoreConfigFactory
Fix rebase regressions
2017-02-27 16:54:01 +13:00
Damian Mooyman
e2064b5cc8 Update config documentation 2017-02-27 16:54:01 +13:00
Damian Mooyman
8444a21cbf API Upgrade tests to use new Config API 2017-02-27 16:54:01 +13:00
Damian Mooyman
3362e15a29 API Upgrade code to use updated config 2017-02-27 16:54:01 +13:00
Damian Mooyman
3958788858 API Remove Director.environment_type config and replace with static methods 2017-02-27 16:54:01 +13:00
Damian Mooyman
a6e9a7111b API Substitute core config system with new silverstripe/config module 2017-02-27 16:54:01 +13:00
Damian Mooyman
72ddac2a56 API Implement ModuleLoader for module registration by composer name 2017-02-27 16:54:01 +13:00
Damian Mooyman
deca009811 Merge pull request #6654 from open-sausages/pulls/4.0/save-me
Prevent unsaved changes alert when clicking a save button
2017-02-27 16:21:17 +13:00
Damian Mooyman
eaf1aeda57 Merge pull request #6653 from open-sausages/pulls/4.0/fix-modeladmin-sizing
BUG Fix modeladmin scrollable height cropping pagination
2017-02-27 14:58:07 +13:00
Damian Mooyman
9da8413ad8 Merge pull request #6651 from zanderwar/patch-1
Added check for register_argc_argv
2017-02-27 14:44:53 +13:00
Damian Mooyman
423b1d4eee BUG Fix modeladmin scrollable height cropping pagination 2017-02-27 13:24:51 +13:00
Christopher Joe
b7123abf22 Fix prevent unsaved changes alert when clicking a save button 2017-02-27 12:22:49 +13:00
Damian Mooyman
eda4aae923 Merge pull request #6636 from open-sausages/pulls/4.0/filehandlefield-class
Change to use injector for file upload fields in framework
2017-02-27 12:03:16 +13:00
Damian Mooyman
b3fc11e594
API Move ssmedia plugin to asset-admin 2017-02-27 10:58:41 +13:00
Damian Mooyman
1d49c4afe9 API Remove non-asset-admin TinyMCE media dialog
API Split ssplugin into ssmedia and sslink plugins
2017-02-27 10:38:23 +13:00
Damian Mooyman
bab52e2403 Tweak dropdownfield 2017-02-27 10:38:23 +13:00
Christopher Joe
8b5fcd3336 Fix download file link works with the new TreeDropdown 2017-02-27 10:38:23 +13:00