Commit Graph

709 Commits

Author SHA1 Message Date
Robbie Averill
ae3519eb7f NEW Increase minimum SilverStripe version to 3.7 and adjust PHP versions in Travis builds 2019-07-23 15:19:31 +02:00
Robbie Averill
90d3b082eb Merge branch '1.4' into 1 2019-06-25 16:43:29 +12:00
Robbie Averill
cd8b1872f5 Reduce to 3.6 in Travis for SS3 tests 2019-06-25 16:43:24 +12:00
Robbie Averill
d6d6059576 Merge branch '1.4' into 1 2019-06-25 16:04:04 +12:00
Robbie Averill
f6ee5af968 Remove 3 branch from Travis builds 2019-06-25 16:03:55 +12:00
Robbie Averill
800f09dd0d FIX LeftAndMainSubsites::canAccess() now accepts a Member argument and falls back to the session member 2019-06-25 15:41:13 +12:00
Robbie Averill
531a38e043 Merge branch '1.4' into 1 2018-05-04 13:44:30 +12:00
Dylan Wagstaff
6a8da1caaa
Merge pull request #359 from creative-commoners/pulls/1.4/default-page-on-creation
FIX Automatically create default SiteTree records for new subsites
2018-04-20 21:10:52 +12:00
Robbie Averill
b4943fb77c FIX Automatically create default SiteTree records for new subsites 2018-04-20 17:14:06 +12:00
Robbie Averill
24ee5a186e Merge branch '1.4' into 1 2018-02-22 11:37:26 +13:00
Robbie Averill
e04d04dc70 Merge branch '1.3' into 1.4 2018-02-22 11:35:52 +13:00
Robbie Averill
742c4a7fa3 Update branch alias for 1.5.x-dev 2018-02-22 10:22:58 +13:00
Robbie Averill
e4702dc132 Remove obsolete branch-alias 2018-02-22 09:25:11 +13:00
Robbie Averill
727efb0ea0
Merge pull request #328 from jyrkij/parent-calls
Add parent call to onAfterWrite
2017-12-14 09:44:41 +13:00
Jyrki Lilja
01d09695a9 Add parent call to onAfterWrite 2017-12-13 14:53:09 +02:00
Robbie Averill
bbf4b67e23 Merge branch '1.3' into 1 2017-09-08 14:58:21 +12:00
Robbie Averill
827f4f2fe9 Merge branch '1.2' into 1.3 2017-09-08 14:58:01 +12:00
Robbie Averill
f0b762cd0d Merge branch '1.1' into 1.2 2017-09-08 14:46:50 +12:00
Robbie Averill
c1bf1bcc21 Merge branch '1.0' into 1.1 2017-09-08 14:41:11 +12:00
Robbie Averill
2cbdeba69a BUG Remove Behat tests from Travis matrix for SS3 2017-09-08 14:31:02 +12:00
Robbie Averill
e84c4f5d7d Merge branch '1.3' into 1 2017-09-08 13:55:16 +12:00
Robbie Averill
4884bdde05 Merge branch '1.2' into 1.3 2017-09-08 13:54:28 +12:00
Robbie Averill
4328c20b45 Merge branch '1.1' into 1.2 2017-09-08 13:54:05 +12:00
Robbie Averill
669995d544 Use precise distro on Travis 2017-09-08 13:52:59 +12:00
Robbie Averill
20b81fc4b0 Merge branch '1.0' into 1.1 2017-09-08 13:52:05 +12:00
Damian Mooyman
bd26907abf Merge pull request #306 from creative-commoners/pulls/1.0/remove-transifex
SS3 translations are frozen. Please contribute translation fixes via pull requests to lang files.
2017-09-08 13:09:23 +12:00
Robbie Averill
df4f68be08 SS3 translations are frozen. Please contribute translation fixes via pull requests to lang files. 2017-09-07 16:47:42 +12:00
Robbie Averill
ffe0d61c4f Merge branch '1.3' into 1 2017-09-01 12:29:48 +12:00
Robbie Averill
c3471ece1c Merge pull request #288 from gregsmirnov/pulls/1.3/fix-subsite-page-language
Fix page rendering with proper subsite locale
2017-09-01 12:22:34 +12:00
Franco Springveldt
428a5f958e Update translations 2017-08-25 16:44:47 +12:00
Gregory Smirnov
ab81117c5e Fix page rendering with proper subsite locale 2017-08-10 20:14:59 +02: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
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
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
Damian Mooyman
6225b2d680 Merge pull request #278 from DarrenInwood/sql-update
Update SQL to remove ambiguity
2017-05-23 13:57:01 +12: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
Damian Mooyman
10302932a9 Update translations 2016-11-17 12:39:49 +13:00
Daniel Hensby
2cce5e1606 Merge pull request #266 from SomarDesignStudios/pulls/fix-copy-child-pages
Fix copying child pages to subsite
2016-11-11 10:55:07 +00:00
David Craig
ae6badf5c0
Fix copying child pages to subsite 2016-11-11 16:18:41 +13:00
Daniel Hensby
81c95c9f3e Merge pull request #259 from tractorcow/pulls/test-state
BUG Prevent translatable / subdirs interfering with test state
2016-08-31 17:38:00 +01:00
Ed
9f498616fd add license to composer.json (#260) 2016-08-31 11:09:47 +12:00