Commit Graph

687 Commits

Author SHA1 Message Date
Jyrki Lilja
01d09695a9 Add parent call to onAfterWrite 2017-12-13 14:53:09 +02: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
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
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
9b97f8af89 Use dist:precise for Travis builds to ensure PHP 5.3 works 2017-08-02 14:52:30 +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
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
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
Damian Mooyman
0e61dfc3f6 BUG Prevent translatable / subdirs interfering with test state 2016-08-23 12:36:12 +12:00
Damian Mooyman
7c97a8ae74 Update translations 2016-08-17 11:08:01 +12:00
Daniel Hensby
65bf5c732b Merge pull request #255 from dnadesign/copy_children_subsites
NEW: Add IncludeChildren option for copying pages between subsites.
2016-07-18 11:40:23 +01:00
Daniel Hensby
b8667fb933 Merge pull request #256 from madmatt/pulls/fix-null-dataquery
Fix error when dataQuery is a null object
2016-07-18 11:39:47 +01:00
madmatt
3962df53cd Fix error when dataQuery is a null object 2016-07-18 17:10:11 +12:00
Will Rossiter
c8f6f4a588 NEW: Add IncludeChildren option for copying pages between subsites. 2016-07-18 16:41:38 +12:00
Ingo Schommer
871e2bcefd Merge pull request #250 from open-sausages/pulls/fix-copy
BUG Fix copy to subsite breaking on sub-pages
2016-06-13 10:24:13 +12:00
Damian Mooyman
ff28ac1b1e BUG Fix copy to subsite breaking on sub-pages
Fixes #192

Signed-off-by: Damian Mooyman <damian@silverstripe.com>
Signed-off-by: Ingo Schommer <ingo@silverstripe.com>
2016-06-13 10:23:33 +12:00
Daniel Hensby
f7bab259b7 Merge pull request #249 from open-sausages/pulls/fix-xhr-canaccess
BUG Prevent SubsiteXHRController failing if there are no subsites available
2016-06-06 12:37:31 +01:00
Damian Mooyman
98636f8f58
BUG Prevent SubsiteXHRController failing if there are no subsites available
Fixes #200
2016-05-27 15:55:27 +12:00
Damian Mooyman
bdecbe9097 Update changelog for 1.2.3 2016-05-24 16:58:07 +12:00
Daniel Hensby
9e7142d229 Merge pull request #247 from tractorcow/pulls/1.2/fix-subsites-urlsegment
BUG Fix issue with urlsegment being renamed in subsites
2016-05-23 10:06:34 +01:00
Damian Mooyman
a98958fdf9
BUG Fix issue with urlsegment being renamed in subsites 2016-05-23 15:29:01 +12:00
Damian Mooyman
e556a57250 Update changelog for 1.2.2 2016-05-19 11:28:13 +12:00
Damian Mooyman
8572263cb6 Update translations 2016-05-18 16:58:44 +12:00
Daniel Hensby
50cc4f857a Merge pull request #246 from tractorcow/pulls/1.1/sudo-false
Set sudo:false to use new containerised structure
2016-05-16 10:07:25 +01:00
Damian Mooyman
6e91600507 Set sudo:false to use new containerised structure 2016-05-16 17:18:22 +12:00
Daniel Hensby
c7dbf44f11 DOCS Fixing broken link 2016-04-06 12:09:06 +01:00
Damian Mooyman
01f976aa28 Merge pull request #234 from gorriecoe/CMSMenu-attributes-fix
Added attributes to menu link
2016-02-10 09:28:34 +13:00
Gorrie
07d449fa2d Removed target attribute to match main template 2016-02-09 16:09:21 +13:00
Gorrie
cf642aae2f Added attributes to menu link
Fix for missing attributes defined in CMSMenu::add_link($id, $title,
$link, $priority, $attributes);
2016-02-05 11:20:51 +13:00
Damian Mooyman
504342b45e Add changelog for 1.2.1 release 2016-02-04 17:34:48 +13:00