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,732 Commits 29 Branches 403 Tags 28 MiB
5355831de9
Commit Graph

4732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
7751a6cee7 Behat test cases for site tree duplication (#995) 2016-09-16 11:44:07 +12: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
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
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
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
a6a9cd729f BUG Fix regression in FormField casting 2016-08-15 15:34:29 +12:00
Damian Mooyman
5ad8157655 BUG Fix regression in FormField casting 2016-08-15 15:32:22 +12:00
Damian Mooyman
95c640ae6b BUG Fix regression in FormField casting 2016-08-15 15:26:39 +12:00
Damian Mooyman
f8c2945c22 Update translations 2016-08-15 15:00:58 +12:00
Damian Mooyman
a5017e598c Update translations 2016-08-15 14:01:09 +12:00
Daniel Hensby
5f73d3454e [SS-2016-012] FIX Missing ACL check on ReportAdmin 
This issue exposed reports to users able to guess the URL of a Report that they were not allowed to view the report
 2016-08-15 13:26:14 +12:00
Damian Mooyman
4d17dcc799 Update translations 2016-08-15 13:12:49 +12:00
Damian Mooyman
2831fc6077 Merge 3.3.3 into 3.3 2016-08-05 16:41:07 +12:00
Damian Mooyman
8284fdc4ca Update translations 2016-08-05 16:13:13 +12:00
Damian Mooyman
99b3346316 Merge 3.2 into 3.3 2016-08-05 14:36:30 +12:00
Damian Mooyman
8c9a7042be Merge 3.2.5 into 3.2 2016-08-05 14:33:04 +12:00
Damian Mooyman
c449ad3f18 Update translations 2016-08-05 13:03:00 +12:00
Damian Mooyman
795ece3352 Merge 3.1 into 3.2 
# Conflicts:
#	javascript/lang/fa_IR.js
#	javascript/lang/ru.js
#	javascript/lang/src/fa_IR.js
#	javascript/lang/src/ru.js
#	lang/fa_IR.yml
 2016-08-05 11:37:29 +12:00
Damian Mooyman
f0e380689e Merge 3.1.20 into 3.1 2016-08-05 11:31:44 +12:00
Damian Mooyman
6477e24219 Update translations 2016-08-05 11:06:51 +12:00
Damian Mooyman
3306deb69b BUG Fix link concatenation in SilverStripeNavigator (#1560) 
Fixes #1557
Fixes https://github.com/tractorcow/silverstripe-fluent/issues/219
 2016-07-25 14:34:45 +01:00
Daniel Hensby
a8cf17b008 Merge pull request #1551 from phptek/issue/1054 
FIX: Fixes #1054 By preventing errors in the CMS _only_.
 2016-07-21 12:18:33 +01:00
Russell Michell
10e06dce50 FIX: Fixes #1054 By preventing errors in the CMS _only_. 
MINOR Boyscouting: Addition of missing braces, default return and missing types in @return annotation.
 2016-07-21 20:07:30 +12:00
Daniel Hensby
04b4453e04
[SS-2016-012] FIX Missing ACL check on ReportAdmin 
This issue exposed reports to users able to guess the URL of a Report that they were not allowed to view the report
 2016-07-14 16:25:22 +01:00
Daniel Hensby
1cc39a9c0b Merge pull request #1542 from tractorcow/pulls/3.3/fix-live-link 
BUG Fix getAbsoluteLiveLink() concatenation
 2016-07-12 13:52:57 +01:00
Damian Mooyman
8123c433f0 BUG Fix getAbsoluteLiveLink() concatenation 
Fixes #1183
 2016-07-12 15:57:52 +12:00
Daniel Hensby
118a09afff
Merge branch '3.2' into 3.3 2016-07-12 01:07:12 +01:00
micmania1
5f2d8cae0d
Merge pull request #1522 from micmania1/fix-sitetree-rading-stage 2016-07-05 16:13:23 +01:00