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,636 Commits 29 Branches 403 Tags 28 MiB
73b854ca72
Commit Graph

4636 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
a6562dd574 Merge 3.1 into 3.2 
# Conflicts:
#	code/controllers/ReportAdmin.php
 2016-08-15 18:46:50 +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
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
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
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
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
micmania1
5f2d8cae0d
Merge pull request #1522 from micmania1/fix-sitetree-rading-stage 2016-07-05 16:13:23 +01:00
Daniel Hensby
c8976a9d64
Merge branch '3.1' into 3.2 2016-06-13 14:33:35 +01:00
Daniel Hensby
039f6c198f Merge pull request #1160 from dhensby/pulls/inherited-allowed-children-test 
Pulls/inherited allowed children test
 2016-06-04 23:23:54 +01:00
Daniel Hensby
d6a57eb507
Amending redundant test 2016-06-04 23:03:06 +01:00
Damian Mooyman
aca12d1de5 Merge pull request #1515 from dhensby/pulls/3.2/fix-infinite-404-redirect 
Prevent OldPageRedirector looping infinitely
 2016-06-01 10:32:07 +12:00
Daniel Hensby
eba89b9520
FIX OldPageRedirector no longer loops infinitely if 404 thrown on existing page 2016-05-31 15:46:17 +01:00
Damian Mooyman
ef12e8f42b Merge 3.1 into 3.2 
# Conflicts:
#	javascript/lang/ar.js
#	javascript/lang/cs.js
#	javascript/lang/de.js
#	javascript/lang/eo.js
#	javascript/lang/es.js
#	javascript/lang/fa_IR.js
#	javascript/lang/fi.js
#	javascript/lang/fr.js
#	javascript/lang/hu.js
#	javascript/lang/id.js
#	javascript/lang/is.js
#	javascript/lang/it.js
#	javascript/lang/ja.js
#	javascript/lang/ko.js
#	javascript/lang/lt.js
#	javascript/lang/mi.js
#	javascript/lang/nb.js
#	javascript/lang/nl.js
#	javascript/lang/pl.js
#	javascript/lang/ro.js
#	javascript/lang/ru.js
#	javascript/lang/sk.js
#	javascript/lang/sl.js
#	javascript/lang/sr.js
#	javascript/lang/sr_RS@latin.js
#	javascript/lang/sv.js
#	javascript/lang/zh.js
#	lang/cs.yml
#	lang/fa_IR.yml
 2016-05-11 13:49:03 +12:00
Damian Mooyman
cf3d01a3c1 Merge 3.2.4 into 3.2 2016-05-11 13:29:18 +12:00
Damian Mooyman
61d37fc084 Merge 3.1.19 into 3.1 2016-05-11 13:14:26 +12:00
Damian Mooyman
dd0163ae00 Update translations 2016-05-11 11:05:37 +12:00
Damian Mooyman
03c628345b Update translations 2016-05-11 10:58:24 +12:00
Daniel Hensby
ce3575e362
Update translations 2016-05-05 12:25:44 +01:00
Daniel Hensby
5cbfad4aea
Merge remote-tracking branch 'origin/3.1.19' into 3.2.4 2016-05-05 12:25:13 +01:00
Daniel Hensby
2d10c94049
Update translations 2016-05-05 10:24:15 +01:00
Daniel Hensby
6cd1837f0c
Merge 3.1 into 3.2 
Conflicts:
	code/reports/SideReport.php
 2016-04-26 00:09:19 +01:00
Ingo Schommer
491d532dfa Merge pull request #1413 from chillu/pulls/3.2/disable-xdebug-travis 
Disable xdebug on Travis runs
 2016-03-30 07:49:43 +13:00
Ingo Schommer
5f9077242a Disable xdebug on Travis runs 
We're not using it for code coverage,
and it's slowing down both composer and phpunit builds.

Recommended by Travis:
https://docs.travis-ci.com/user/speeding-up-the-build/#PHP-optimisations
 2016-03-29 17:22:02 +13:00
Damian Mooyman
cf0a19e5a6 Merge pull request #1431 from dhensby/pulls/3.2/link-tracking-fix 
FIX Link tracking not escaping `#`
 2016-03-22 17:57:56 +13:00
Daniel Hensby
9d62d9d381 FIX Link tracking not escaping # Fixes #1409 2016-03-21 15:22:00 +00:00
Loz Calver
b05892e377 Merge pull request #1425 from tractorcow/revert-1416-pulls/title-attr 
Revert "FIX: Incorrect title attribute on CMS tabs"
 2016-03-14 09:09:05 +00:00
Damian Mooyman
d247a99769 Revert "FIX: Incorrect title attribute on CMS tabs" 2016-03-14 10:32:12 +13:00
Damian Mooyman
5dc30bc79b Merge pull request #1422 from dhensby/pulls/report-links 
FIX Use `Controller::join_links()` in Reports
 2016-03-14 09:23:28 +13:00
Daniel Hensby
bc31d9ca9c FIX Use Controller::join_links() in Reports 2016-03-10 16:39:00 +00:00
Daniel Hensby
11aadbe1d0 Merge pull request #1416 from kinglozzer/pulls/title-attr 
FIX: Incorrect title attribute on CMS tabs
 2016-03-08 16:07:42 +00:00
Loz Calver
036420470d FIX: Incorrect title attribute on CMS tabs 2016-03-08 15:00:29 +00:00
Damian Mooyman
1eed3608ad Merge branch '3.1' into 3.2 
# Conflicts:
#	code/controllers/CMSMain.php
 2016-02-29 16:41:01 +13:00
Damian Mooyman
ba9c3378e2 Merge remote-tracking branch 'origin/3.2.3' into 3.2 2016-02-29 16:38:38 +13:00