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,802 Commits 29 Branches 403 Tags 28 MiB
de19c643fb
Commit Graph

4802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
5f07e193fa Update translations 2016-08-05 17:57:46 +12:00
Damian Mooyman
afc9bb0dc6 Merge 3.3 into 3.4 
# Conflicts:
#	code/controllers/CMSPageHistoryController.php
#	code/controllers/SilverStripeNavigator.php
#	lang/bg.yml
#	lang/cs.yml
#	lang/it.yml
#	lang/sk.yml
 2016-08-05 16:46:35 +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
Daniel Hensby
95bb134e64 Merge pull request #1566 from jonom/fix-direct-edit 
FIX Direct edit file by URL
 2016-08-01 00:58:29 +01:00
Jonathon Menz
c965133da0 FIX Direct edit file by URL 
Trying to navigate directly to the edit view of a file by URL would fail if a folder other than the file’s parent was held in session data. Removed reliance on current ID in session and added folder detection for edit view.
 2016-07-29 16:53:31 -07: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
3959508463
Merge branch '3.4' into 3 2016-07-25 14:12:49 +01:00
Daniel Hensby
4f99ced5df
Merge branch '3.3' into 3.4 2016-07-25 14:12:31 +01:00
Robbie Averill
82e54314bf FIX do not show HiddenClass pages in allowed children (#1555) 
* FIX do not show HiddenClass pages in allowed children

* Resolves #1553

* * Update SiteTreeTest to include HiddenClass checks
* Refactor testAllowedChildren to use a data provider
 2016-07-22 09:45:14 +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
dc4a02087b
Merge branch '3.4' into 3 2016-07-14 12:24:31 +01:00
Daniel Hensby
c7b1a4ded8
Merge branch '3.3' into 3.4 2016-07-14 12:24:04 +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
00d16ec276
Merge branch '3.4' into 3 2016-07-12 01:12:07 +01:00
Daniel Hensby
a2657b519a
Merge branch '3.3' into 3.4 2016-07-12 01:08:54 +01: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
Daniel Hensby
3c0011074c
Merge branch '3.4' into 3 2016-06-13 14:36:59 +01:00
Daniel Hensby
ea81389a18
Merge branch '3.3' into 3.4 2016-06-13 14:35:40 +01:00
Daniel Hensby
19047d1577
Merge branch '3.2' into 3.3 2016-06-13 14:34:12 +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
7794bc8af0 Merge 3.4.0 into 3.4 2016-06-03 11:33:41 +12:00
Damian Mooyman
1ea9444be9 Update translations 2016-06-02 17:07:41 +12: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
Daniel Hensby
329eaaaf1e Merge pull request #1500 from chillu/pulls/3.3/remove-branch-alias 
Removed branch alias which should only apply to latest release branch
 2016-05-19 09:54:40 +01:00
Ingo Schommer
0106e11722 Removed branch alias which should only apply to latest release branch 
See 070ae2555b
for similar commit when going from 3.1 to 3.2.
 2016-05-19 19:03:06 +12:00
Damian Mooyman
d92a76cab2 Alias 3 as 3.5 2016-05-19 16:10:15 +12:00
Damian Mooyman
a096efa8f6 Merge 3.4.0 into 3 2016-05-19 15:48:00 +12:00
Damian Mooyman
f5b00786d6 Update translations 2016-05-19 14:48:39 +12:00
Damian Mooyman
7d9ca4fac5 Merge 3.3 into 3 
# Conflicts:
#	javascript/lang/src/ar.js
#	javascript/lang/src/cs.js
#	javascript/lang/src/de.js
#	javascript/lang/src/en.js
#	javascript/lang/src/eo.js
#	javascript/lang/src/es.js
#	javascript/lang/src/fa_IR.js
#	javascript/lang/src/fr.js
#	javascript/lang/src/hu.js
#	javascript/lang/src/id.js
#	javascript/lang/src/is.js
#	javascript/lang/src/it.js
#	javascript/lang/src/ja.js
#	javascript/lang/src/ko.js
#	javascript/lang/src/lt.js
#	javascript/lang/src/mi.js
#	javascript/lang/src/nb.js
#	javascript/lang/src/nl.js
#	javascript/lang/src/pl.js
#	javascript/lang/src/ro.js
#	javascript/lang/src/ru.js
#	javascript/lang/src/sk.js
#	javascript/lang/src/sl.js
#	javascript/lang/src/sr.js
#	javascript/lang/src/sr_RS@latin.js
#	javascript/lang/src/sv.js
#	javascript/lang/src/zh.js
 2016-05-11 14:03:59 +12:00
Damian Mooyman
1f2c0aaaa0 Merge 3.2 into 3.3 2016-05-11 13:59:56 +12: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
0de5f525ef Merge 3.3.2 into 3.3 2016-05-11 13:33:15 +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
4571779213 Update translations 2016-05-11 11:05:57 +12:00
Damian Mooyman
dd0163ae00 Update translations 2016-05-11 11:05:37 +12:00