tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
4,868 Commits 29 Branches 403 Tags 28 MiB
a24a3af1b1
Commit Graph

4868 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Hensby
a24a3af1b1
Merge branch '3.4' into 3.5 2017-05-31 00:08:11 +01:00
Daniel Hensby
a8e343b85b
Merge tag '3.5.4' into 3.5 
Release 3.5.4
 2017-05-31 00:08:11 +01:00
Daniel Hensby
df95066e50
Merge tag '3.4.6' into 3.4 
Release 3.4.6
 2017-05-31 00:07:35 +01:00
Daniel Hensby
11e2175ec8
Merge remote-tracking branch 'security/3.4.6' into 3.5.4 2017-05-29 01:02:55 +01:00
Daniel Hensby
02b5e6ea92
Merge pull request #5 from silverstripe-security/patch/3.4/SS-2017-003 
[SS-2017-003] Only allow HTTP(S) links for external redirector pages
 2017-05-28 21:36:33 +00:00
Daniel Hensby
911e491236 Merge pull request #4 from silverstripe-security/patch/3.4/SS-2017-004 
[SS-2017-004] FIX Unescaped fields in CMSPageHistroyController::compare()
 2017-05-28 22:18:35 +01:00
Daniel Hensby
61cf72c08d
[SS-2017-004] FIX Unescaped fields in CMSPageHistroyController::compare() 2017-05-25 17:22:04 +01:00
Daniel Hensby
41270fcf99
[SS-2017-003] Only allow HTTP(S) links for external redirector pages 2017-05-24 23:02:41 +01:00
Sam Minnee
14540729ca FIX: Use framework 3.5 to test cms 3.5 2017-05-09 11:41:55 +12:00
Sam Minnee
18171f8875 Merge branch '3.4' into 3.5 2017-04-24 15:59:38 +12:00
Uncle Cheese
cfef458a00 Remove .tx folder 2017-04-24 15:57:45 +12:00
Daniel Hensby
7ac2be0802
Merge tag '3.5.3' into 3.5 
Release 3.5.3
 2017-02-23 15:11:46 +00:00
Dan Hensby
80099f24b7 Update translations 2017-02-20 17:01:15 +00:00
Damian Mooyman
12377fcc9b Merge 3.5 into 3 2017-02-08 11:56:39 +13:00
Damian Mooyman
f35e62afc5 Merge 3.4 into 3.5 2017-02-08 11:55:10 +13:00
Damian Mooyman
db2b55c3da Merge 3.4.5 into 3.4 2017-02-08 11:52:41 +13:00
Damian Mooyman
ba43d120cd Update translations 2017-02-08 11:05:29 +13:00
Damian Mooyman
6fec151f2b Update translations 2017-02-08 10:29:07 +13:00
Daniel Hensby
68b49921f9
Merge branch '3.5' into 3 2017-02-07 17:41:18 +00:00
Daniel Hensby
c088ee5332
Merge branch '3.4' into 3.5 2017-02-07 17:39:58 +00:00
Daniel Hensby
75115bc490
Merge tag 'refs/tags/3.4.4' into 3.4 
Release 3.4.4
 2017-02-07 17:39:01 +00:00
Daniel Hensby
27f8acf373 Merge pull request #1705 from dhensby/pulls/3/cleanup 
Remove redundant label
 2017-02-03 11:20:37 +00:00
Daniel Hensby
aa2d0fb247
Merge branch '3.4' into 3.5 2017-01-31 20:09:00 +00:00
Daniel Hensby
1f3802d48d
Merge remote-tracking branch 'upstream/3.4.4' into 3.4 2017-01-31 20:06:54 +00:00
Dan Hensby
9917cee7bd Update translations 2017-01-31 11:39:08 +00:00
Damian Mooyman
ac6083c9a2 Merge pull request #1731 from trewq/asset-upload-directory-fix 
Fix error when uploading file and ASSETS_DIR is a subdirectory
 2017-01-31 15:47:16 +13:00
Brendan Halley
10d9f9080b Fix to allow ASSETS_DIR to be a subdirectory 2017-01-31 09:46:14 +11:00
Dan Hensby
ce9b05d21d Update translations 2017-01-26 21:02:38 +00:00
Dan Hensby
94cdea8e65 Update translations 2017-01-26 18:30:10 +00:00
Dan Hensby
47b6b2cd0e Update translations 2017-01-25 16:46:33 +00:00
Daniel Hensby
6f05242e3b
Merge branch '3.5' into 3 2017-01-17 12:33:03 +00:00
Daniel Hensby
cb3008956f
Merge branch '3.4' into 3.5 2017-01-17 12:31:18 +00:00
Loz Calver
f26ecb2a9c Merge pull request #1711 from dhensby/pulls/3.4/allowed-children-fix2 
FIX Dont attempt to iterate over null in SiteTree::allowedChildren
 2017-01-10 16:46:48 +00:00
Daniel Hensby
5bba7264c6
FIX Dont attempt to iterate over null in SiteTree::allowedChildren 2017-01-10 16:20:22 +00:00
Daniel Hensby
577a024109
Remove redundant label 2017-01-04 15:55:32 +00:00
Damian Mooyman
a26607ca56 Merge 3.5 into 3 
# Conflicts:
#	lang/en.yml
#	lang/fa_IR.yml
#	lang/fi.yml
#	lang/hr.yml
#	lang/it.yml
 2016-12-22 13:24:17 +13:00
Damian Mooyman
6060af45c1 Merge 3.4 into 3.5 2016-12-22 13:18:30 +13:00
Damian Mooyman
e4ff310a62 Merge 3.5.1 into 3.5 2016-12-22 13:17:16 +13: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
0b952e277e
Merge branch '3.5' into 3 2016-12-19 11:56:55 +00:00
Dan Hensby
36287b09d0 Update translations 2016-12-16 20:49:04 +00:00
Daniel Hensby
f833bb53c3
Merge branch '3.4' into 3.5 2016-12-16 16:46:28 +00:00
Daniel Hensby
e90715d6c6
Merge branch '3.4' into 3.5 2016-12-07 13:43:34 +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