Garion Herman
9a289a2e17
Merge branch 'master' into fix-ss-4-master
2017-08-28 21:52:32 +12: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
9b09eb94e0
Merge remote-tracking branch 'origin/1.3' into 1
2017-08-02 15:10:09 +12:00
Robbie Averill
4d38452435
Update branch alias for 1.4.x-dev
2017-08-02 14:55:15 +12:00
Robbie Averill
9b97f8af89
Use dist:precise for Travis builds to ensure PHP 5.3 works
2017-08-02 14:52:30 +12:00
Robbie Averill
a4f647c9ed
Merge remote-tracking branch 'origin/1.3' into 1
2017-08-02 14:49:52 +12:00
Robbie Averill
43d128d520
Merge remote-tracking branch 'origin/1.2' into 1.3
2017-08-02 14:48:26 +12:00
Robbie Averill
6eed988317
Merge remote-tracking branch 'origin/1.1' into 1.2
2017-08-02 14:47:53 +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
438836bfcc
Shift LeftAndMain_Menu template to force override.
2017-07-21 12:30:59 +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
Daniel Hensby
83b0afe4d4
Merge pull request #282 from creative-commoners/pulls/1.3/travis-php7
...
Add PHP7 + SS3.6 build to Travis configuration
2017-06-15 17:00:11 +01:00
Robbie Averill
5be5f1c3b3
Add PHP7 + SS3.6 build to Travis configuration
2017-06-15 11:41:17 +12:00
Werner M. Krauß
2b7c3d1f85
Updating README
2017-06-08 08:35:06 +02: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ß
fea1684f5c
fixing code analysis: use static::assertContains
2017-06-01 15:44:32 +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ß
849c0061e8
fixing code analysis: phpunit: use assertInstanceOf
2017-06-01 15:32:46 +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ß
212e4797b0
marking some tests as skipped that need more refactoring
2017-05-31 06:41:45 +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ß
709cbfa2c8
fix SubsiteAdminTest
2017-05-30 21:21:15 +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ß
492f437589
fixing FileSubsitesTest
...
call extension directly in test, as Versioned now is also applied to File
and has this method
2017-05-30 15:15:54 +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
Tim Kung
d8e72f3ac9
updating spacing and adding autoload key
...
(cherry picked from commit e201462)
2017-05-30 14:04:42 +02:00
Tim Kung
8586749318
Updating editorconfig
...
(cherry picked from commit 2f99e51)
2017-05-30 14:03:24 +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
Robbie Averill
4126a0a1fa
Merge pull request #273 from danaenz/1.3
...
Conditionally add Theme dropdown (if there are any themes available)…
2017-05-25 11:49:36 +12:00
Werner M. Krauß
d1e829697f
adjusting test fixtures yml file
2017-05-24 15:40:58 +02:00
