tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-29 07:59:37 +02:00
Code Issues Projects Releases Wiki Activity
4,698 Commits 30 Branches 398 Tags 25 MiB
a6a9cd729f
Commit Graph

4698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
a6a9cd729f BUG Fix regression in FormField casting 2016-08-15 15:34:29 +12:00
Damian Mooyman
f8c2945c22 Update translations 2016-08-15 15:00:58 +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
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
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
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
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
Damian Mooyman
03c628345b Update translations 2016-05-11 10:58:24 +12:00
Daniel Hensby
4207e9bae9
Update translations 2016-05-05 12:47:36 +01:00
Daniel Hensby
228c406e64
Merge remote-tracking branch '3.2.4' into 3.3.2 2016-05-05 12:33:08 +01: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
06d882b49c
Merge 3.2 into 3.3 2016-04-26 01:50:03 +01:00
Daniel Hensby
6cd1837f0c
Merge 3.1 into 3.2 
Conflicts:
	code/reports/SideReport.php
 2016-04-26 00:09:19 +01:00
Damian Mooyman
9c21bd1d70 Merge pull request #1448 from patricknelson/1447-errorpage-write-static-check 
FIX for #1447 to ensure proper type-safe checking of file_put_contents() in ErrorPage->writeStaticPage()
 2016-04-12 12:25:49 +12:00
Patrick Nelson
000bf09354 FIX for #1447 to ensure proper type-safe checking of file_put_contents() in ErrorPage->writeStaticPage() 2016-04-06 17:34:55 -07: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