tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-26 14:39:27 +02:00
Code Issues Projects Releases Wiki Activity
4,807 Commits 30 Branches 398 Tags 25 MiB
5bba7264c6
Commit Graph

4807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Hensby
5bba7264c6
FIX Dont attempt to iterate over null in SiteTree::allowedChildren 2017-01-10 16:20:22 +00:00
Damian Mooyman
483cda95a6 Merge 3.4.3 into 3.4 2016-12-22 13:16:07 +13:00
Dan Hensby
9db49bfd62 Update translations 2016-12-19 12:21:38 +00:00
Daniel Hensby
b3e79239aa Merge pull request #1692 from tractorcow/pulls/3.4/fix-localisation-strings 
BUG Fix localisation issues in CMS
 2016-12-06 23:27:31 +00:00
Damian Mooyman
224b2a4cba BUG Fix localisation issues in CMS 2016-12-07 12:15:54 +13:00
Damian Mooyman
d018d2ca2e Merge pull request #1694 from dhensby/pulls/3.4/travis-simplification 
Move travis env vars out of .travis.yml and into travis CI dashboard
 2016-12-07 12:08:21 +13:00
Daniel Hensby
95995adc98
Move travis env vars out of .travis.yml and into travis CI dashboard 2016-12-06 22:29:48 +00:00
Daniel Hensby
203756f94d Merge pull request #1274 from kinglozzer/pulls/1273-cancreate-can-select 
Ensure we have a ParentID before trying to limit children by page type (fixes #1273)
 2016-11-30 12:38:51 +00:00
Loz Calver
94697e1281 Ensure we have a ParentID before trying to limit children by page type (fixes #1273) 2016-11-30 11:49:13 +00:00
Daniel Hensby
21d9b7cdf1
Merge branch '3.3' into 3.4 2016-11-28 13:57:38 +00:00
Daniel Hensby
5d3519976e
Merge tag '3.4.2' into 3.4 
Release 3.4.2
 2016-11-28 13:57:34 +00:00
Daniel Hensby
5355831de9
Merge branch '3.2' into 3.3 2016-11-28 13:56:51 +00:00
Daniel Hensby
5d4d6ffc96
Merge tag '3.3.4' into 3.3 
Release 3.3.4
 2016-11-28 13:46:42 +00:00
Daniel Hensby
4a439ad6a9
Merge tag '3.2.6' into 3.2 
Release 3.2.6
 2016-11-28 13:45:41 +00:00
Daniel Hensby
73b854ca72 Merge pull request #1687 from kinglozzer/1685-cancreate-top-level 
FIX: content authors unable to duplicate top-level pages (fixes #1685)
 2016-11-22 16:54:47 +00:00
Loz Calver
b2503ac004 FIX: content authors unable to duplicate top-level pages (fixes #1685) 2016-11-22 15:55:28 +00:00
Dan Hensby
aab7d30ab0 Update translations 2016-11-21 13:27:57 +00:00
Dan Hensby
f66e154a02 Update translations 2016-11-21 12:37:05 +00:00
Dan Hensby
34b0cdb124 Update translations 2016-11-18 15:14:39 +00:00
Daniel Hensby
bb91353e65
Merge branch '3.3' into 3.4 2016-11-15 12:01:37 +00:00
Daniel Hensby
b7bf426780
Merge branch '3.2' into 3.3 2016-11-15 12:01:17 +00:00
Daniel Hensby
7a45957d59
Merge branch '3.1' into 3.2 2016-11-15 11:58:30 +00:00
Daniel Hensby
c857017019 Merge pull request #2 from silverstripe-security/patch/3.1/SS-2016-012 
[SS-2016-012] FIX Missing ACL check on ReportAdmin
 2016-11-15 11:56:10 +00:00
Daniel Hensby
147181e96f
Merge branch '3.3' into 3.4 2016-10-16 22:42:40 +01:00
Daniel Hensby
bc71f2de01
Merge branch '3.2' into 3.3 2016-10-16 22:42:26 +01:00
Daniel Hensby
12c0f3c1c7
Merge branch '3.1' into 3.2 2016-10-16 22:40:56 +01:00
Damian Mooyman
17a471a47a Merge pull request #1640 from dhensby/pulls/3.4/fix-history-versions 
FIX History controller now shows right comparison versions
 2016-10-12 09:11:45 +13:00
Daniel Hensby
ae83b7b5ef
FIX History controller now shows right comparison versions 2016-10-07 16:33:03 +01:00
Damian Mooyman
f9697f75cd Merge pull request #1636 from dhensby/pulls/3.4/fix-sort-duplicate-children 
FIX Sort order for duplicated child pages is now retained
 2016-10-04 10:34:56 +13:00
Daniel Hensby
98d95cd707
FIX Sort order for duplicated child pages is now retained 2016-10-03 22:08:05 +01:00
Damian Mooyman
7751a6cee7 Behat test cases for site tree duplication (#995) 2016-09-16 11:44:07 +12:00
Daniel Hensby
c754882e0a
Merge branch '3.3' into 3.4 2016-08-23 10:58:24 +01:00
Daniel Hensby
ba5e51c422
Merge branch '3.2' into 3.3 2016-08-23 10:55:13 +01:00
Daniel Hensby
3820a26abd
Simplifying ModelAsControllerTest setUp 2016-08-22 19:41:11 +01:00
Daniel Hensby
59be597004
FIX #1052 2016-08-22 19:41:10 +01:00
Daniel Hensby
4aca9ac145
Merge pull request #1052 from @dmeeking 2016-08-22 17:46:43 +01:00
Dan Meeking
26f5fc2853
Issue #1051: fix so that OldPageRedirector::find_old_page uses ORM call 2016-08-22 17:44:43 +01:00
Damian Mooyman
56512647ab Merge 3.3 into 3.4 
# Conflicts:
#	lang/cs.yml
#	lang/sk.yml
 2016-08-15 19:02:14 +12:00
Damian Mooyman
fa0c56e582 Merge 3.2 into 3.3 2016-08-15 18:50:59 +12:00
Damian Mooyman
629a849c79 Merge 3.2 into 3.3 
# Conflicts:
#	lang/cs.yml
#	lang/sk.yml
 2016-08-15 18:48:40 +12:00
Damian Mooyman
a6562dd574 Merge 3.1 into 3.2 
# Conflicts:
#	code/controllers/ReportAdmin.php
 2016-08-15 18:46:50 +12:00
Damian Mooyman
c2f21d0008 Merge 3.4.1 into 3.4 2016-08-15 18:37:50 +12:00
Damian Mooyman
0ffe5fa560 Merge 3.3.3 into 3.3 2016-08-15 18:36:11 +12:00
Damian Mooyman
49ccb10c9b Merge 3.2.5 into 3.2 2016-08-15 18:34:55 +12:00
Damian Mooyman
c58d358e50 Merge 3.1.20 into 3.1 2016-08-15 18:33:40 +12:00
Damian Mooyman
bffab11a54 Update translations 2016-08-15 18:27:31 +12:00
Damian Mooyman
2f78f43273 Update translations 2016-08-15 17:44:52 +12:00
Damian Mooyman
1b50d59aba Update translations 2016-08-15 17:02:07 +12:00
Damian Mooyman
312cfca3ca Update translations 2016-08-15 16:31:55 +12:00
Damian Mooyman
ef856185ab BUG Fix regression in FormField casting 2016-08-15 15:55:06 +12:00