Robbie Averill
314f218306
Merge branch '1'
2017-09-01 12:30:43 +12:00
Robbie Averill
ffe0d61c4f
Merge branch '1.3' into 1
2017-09-01 12:29:48 +12:00
Robbie Averill
e129cafa94
NEW Add SubsiteState and initialisation middleware, replace Subsite::currentSubsiteID use
2017-08-30 11:47:11 +12:00
Robbie Averill
8d8ee14cc2
FIX Run SS standard PHP linter, separate SiteTree test mock classes
2017-08-29 17:43:28 +12:00
Garion Herman
af6f499cac
Add non-blank default to ThemeFieldEmptyString translation.
2017-08-28 22:05:01 +12:00
Garion Herman
9a289a2e17
Merge branch 'master' into fix-ss-4-master
2017-08-28 21:52:32 +12:00
Gregory Smirnov
ab81117c5e
Fix page rendering with proper subsite locale
2017-08-10 20:14:59 +02:00
Robbie Averill
a13bf10184
Merge remote-tracking branch 'origin/1'
2017-08-02 16:39:32 +12:00
Robbie Averill
03e52101bb
Revert "SS4 namespaces compatibility"
...
This reverts commit e8f5f58bb0
2017-08-02 15:51:37 +12:00
Robbie Averill
a4f647c9ed
Merge remote-tracking branch 'origin/1.3' into 1
2017-08-02 14:49:52 +12:00
Garion Herman
5ec1c94410
Bring session / validation calls in line with SS4b1 API, replace icon.
2017-07-25 14:25:58 +12:00
Garion Herman
32c45d0856
Merge branch 'fix-ss-4-alpha-7' into fix-ss-4-master
2017-07-21 12:27:57 +12:00
Robbie Averill
8bc9728104
Merge pull request #287 from timkung/hotfix/default-subsite-query
...
Adjusting query used in getSubsiteIDForDomain
2017-07-19 18:22:16 +12:00
Tim Kung
24ebd1c9f9
adjusting query used in getSubsiteIDForDomain to prevent new DB fields being added to the SQL call if they are not yet added to the DB
2017-07-19 17:57:23 +12:00
Werner M. Krauß
877f4f5f9d
Add Subsite theme as main theme; allow cascading of themes
2017-06-07 12:18:35 +02:00
Garion Herman
1975861aec
Fix Duplicate to Subsite functionality.
2017-06-04 15:05:59 +12:00
Garion Herman
c2484365cf
Fix misc. Subsite docblocks, remove DataObject::get_by_id call.
2017-06-04 14:34:38 +12:00
Garion Herman
49fbfcb459
Adapt to Permission::reset, DataObject::duplicate API changes.
2017-06-04 14:33:04 +12:00
Garion Herman
21a8c56217
Adapt SubsiteXHRController to LeftAndMain API changes.
2017-06-04 14:30:51 +12:00
Werner M. Krauß
a4a1ab6a78
formatting code
2017-06-01 15:57:53 +02:00
Werner M. Krauß
55c7240425
fixing code analysis: simplify if statements
2017-06-01 15:56:28 +02:00
Werner M. Krauß
9673c881c1
fixing code analysis: simplify if-return statements
2017-06-01 15:48:01 +02:00
Werner M. Krauß
9d3c4506af
fixing code analysis: fix parameter in method call
2017-06-01 15:43:30 +02:00
Werner M. Krauß
25754e1158
fixing code analysis: updating phpdoc
2017-06-01 15:32:45 +02:00
Werner M. Krauß
17010f39a3
fixing code analysis: removing unneeded else statements
2017-06-01 15:32:44 +02:00
Werner M. Krauß
abe1ac9fe6
fixing code analysis: replacing deprecated methods
2017-06-01 15:32:38 +02:00
Werner M. Krauß
4fc13b19f7
fixing code analysis: removing unnecessary parenthesis
2017-06-01 15:32:36 +02:00
Werner M. Krauß
e7ad086641
fixing code analysis: safely use single quotes
2017-06-01 15:32:30 +02:00
Werner M. Krauß
76852594a8
fixing code analysis: public method and case mismatch
2017-06-01 15:31:30 +02:00
Werner M. Krauß
e86cc55ba6
fixing a PHP7 only statement to be 5.6 compatible
2017-06-01 14:43:25 +02:00
Werner M. Krauß
e03e7d9ce9
fixing a namespaced ORM call
2017-06-01 14:42:56 +02:00
Werner M. Krauß
6f1e1ab953
SubsiteVirtualPage: SubsiteID should not be a virtual field
2017-05-30 21:43:37 +02:00
Werner M. Krauß
f348f5fa97
fix SiteConfigSubsites AugmentSQL: get the right table name to filter
2017-05-30 20:50:52 +02:00
Werner M. Krauß
997459caf3
Get some more tests working
...
Updating config and i18n calls
2017-05-30 20:50:22 +02:00
Werner M. Krauß
e2bdd5ca41
fixing tests: adjusting yml file, update Config::modify usage
2017-05-30 15:14:28 +02:00
Tim Kung
5d3af16aaf
- namespacing all classes
...
- moving all phpunit tests into tests/php
- moving all extensions from _config.php into config.yml and removing obsolete _config.php
- moving GridFieldSubsiteDetailForm_ItemRequest into own file
(cherry picked from commit ee02828)
2017-05-30 15:13:40 +02:00
Werner M. Krauß
b8f98323ae
merge #2
2017-05-30 11:14:51 +02:00
Werner M. Krauß
9862cf5ea6
merge ss4 fixes by cheddam
2017-05-29 13:42:42 +02:00
Werner M. Krauß
c5f507b3f9
reformat code and tests
2017-05-24 15:26:28 +02:00
Werner M. Krauß
ef602abe47
replace config::inst()->update() with config::modify->set()
2017-05-24 15:20:51 +02:00
Werner M. Krauß
a49189ef58
fix removed i18n::get_common_locales()
2017-05-24 15:09:13 +02:00
Werner M. Krauß
a7ef6472ee
db query fixes
2017-05-24 14:55:03 +02:00
Werner M. Krauß
b71e544820
adding table names config
2017-05-24 14:31:56 +02:00
Werner M. Krauß
fe6d93eaac
fixing double use declarations of Subsite class
2017-05-24 14:31:36 +02:00
Werner M. Krauß
2c3b5bf5af
remove VirtualPageController usage
2017-05-24 13:42:53 +02:00
Werner M. Krauß
e33a5b4cae
upgrader: upgrade code
2017-05-24 13:36:04 +02:00
Werner M. Krauß
2c84e627db
upgrader: namespacing classes
2017-05-24 12:32:05 +02:00
Darren Inwood
0fc3490219
Update SQL to remove ambiguity
2017-05-22 12:29:03 +12:00
Danae Miller-Clendon
8705a46b98
Conditionally add Theme dropdown (if there are any themese available) for #261 . Replace field instantiatiors in getCMSFields() with ::create() to support injection.
...
Add empty string / lang entry to Theme dropdown
2017-04-24 15:41:31 +12:00
David Craig
ae6badf5c0
Fix copying child pages to subsite
2016-11-11 16:18:41 +13:00
