Commit Graph

18016 Commits

Author SHA1 Message Date
Damian Mooyman
5e23dc8ce8 Update lock file 2017-03-14 10:22:45 +13:00
Damian Mooyman
810dcab748 Simplify config for admin removal 2017-03-14 10:22:45 +13:00
Damian Mooyman
5c96070038 Remove admin module dir 2017-03-14 10:22:45 +13:00
Damian Mooyman
f24d81af7b Merge pull request #6699 from sminnee/add-versioned-test
MINOR: Add a Versioned test for #6680
2017-03-14 10:17:08 +13:00
Sam Minnee
5ea238c58b MINOR: Add a Versioned test for #6680
It turns out that cascaded query params as described in #6680 were
already implemented; this test confirms that.
2017-03-14 09:39:26 +13:00
Chris Joe
966e98529c Merge pull request #6697 from open-sausages/pulls/4.0/fix-request-fortemplate
API Add FormRequestHandler::forTemplate() for backwards compatibility
2017-03-13 14:25:19 +13:00
Damian Mooyman
a07a9bffc4
API Add FormRequestHandler::forTemplate() for backwards compatibility 2017-03-13 12:51:37 +13:00
Daniel Hensby
bba86bb106 Merge pull request #6692 from open-sausages/pulls/4.0/form-refactor
API Refactor Form request handling into FormRequestHandler
2017-03-10 11:55:27 +00:00
Damian Mooyman
644ae60fac Merge pull request #6694 from open-sausages/pulls/4.0/yarn-patch
BUG work-around for form property on formfields not working
2017-03-10 16:43:26 +13:00
Damian Mooyman
d3177ef94c
BUG work-around for form property on formfields not working 2017-03-10 16:01:25 +13:00
Damian Mooyman
0c41a97a8b API Refactor Form request handling into FormRequestHandler
API Add HasRequestHandler interface
API Refactor Link() and url handling behaviour from Controller into RequestHandler
API RequestHandler classes now must define url_segment to have a default Link()
API Clean up redirectBack()
2017-03-10 15:04:33 +13:00
Sam Minnée
f520a846c5 Merge pull request #6679 from open-sausages/pulls/4.0/a-good-yarn
Upgrade to Node6 and yarn
2017-03-10 14:20:54 +13:00
Damian Mooyman
ca9979100f
Work around yarn travis issue
See https://github.com/yarnpkg/yarn/issues/2629
2017-03-10 13:51:04 +13:00
Damian Mooyman
23b92c8187
Documentation and linting updates 2017-03-10 11:59:38 +13:00
Damian Mooyman
dcaef006bd
Rebuild dist files 2017-03-10 11:47:09 +13:00
Christopher Joe
f2fb805331 update travis setup 2017-03-10 11:40:48 +13:00
Christopher Joe
c12fd48117 Move node_path variables to jest config
Fix webpack using the wrong url-loader
2017-03-10 11:40:48 +13:00
Christopher Joe
0925b3c578 Upgrade jest to v19 2017-03-10 11:38:40 +13:00
Christopher Joe
466c50b302 API Switch from npm4 and shrinkwrap to npm6 and yarn 2017-03-10 11:38:26 +13:00
Damian Mooyman
adf4834cf9 Merge pull request #6667 from open-sausages/pulls/4.0/upload-be-gone
Remove UploadField, AssetField and associated files
2017-03-09 14:51:36 +13:00
Damian Mooyman
bf3383731d Upgrading guide for uploadfield 2017-03-09 13:33:00 +13:00
Damian Mooyman
63e3fbdccb Remove default scaffold field for DBFile 2017-03-09 13:33:00 +13:00
Damian Mooyman
09d7493a4f Fix webpack location for font files 2017-03-09 13:32:59 +13:00
Christopher Joe
50deb17763 API remove UploadField, AssetField and associated files
Fixes #6481
2017-03-09 10:16:46 +13:00
Ingo Schommer
97a29c1ee2 Add Chris to core committers list 2017-03-08 14:50:24 +13:00
Ingo Schommer
06ec59b4f2 Sort core committers alphabetically 2017-03-08 14:50:24 +13:00
Loz Calver
736f473f43 Merge pull request #6684 from dhensby/pulls/4/fix-installer-recursion-yml
FIX Installer no longer causes recursion in yml config
2017-03-07 12:28:44 +00:00
Daniel Hensby
9c9443602d
FIX Installer no longer causes recursion in yml config 2017-03-07 11:39:11 +00:00
Damian Mooyman
f54884903f Merge pull request #6658 from robbieaverill/bugfix/confirm-delete-in-react-gridfield
FIX Confirm delete actions in React GridFields (e.g. Campaign admin)
2017-03-07 15:32:11 +13:00
Damian Mooyman
28de701213 Merge pull request #5567 from dhensby/classmanifest
Replace TokenizedRegularExpression with PHPParser
2017-03-07 10:16:09 +13:00
Christopher Joe
3e7be1d85e add line to disable eslint warning for now 2017-03-07 09:44:53 +13:00
Daniel Hensby
03a88124c2 Merge pull request #6657 from robbieaverill/bugfix/remove-double-active-state-in-security
FIX Remove duplicated tab "active" state in Security admin
2017-03-06 17:14:26 +00:00
Daniel Hensby
cdb4a86e1c
PHPParser optimisations and update 2017-03-06 10:35:25 +00:00
Loz Calver
f8e3443c89
Initial PHP Parser implementation 2017-03-06 10:19:00 +00:00
Robbie Averill
45a7fbd387 FIX Confirm delete actions in React GridFields (e.g. Campaign admin) 2017-03-06 19:04:16 +13:00
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