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 |
|
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
|
af4b546050
|
Merge branch '3.3' into 3
|
2016-04-26 01:59:56 +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 |
|
Ingo Schommer
|
38d828b3db
|
Merge pull request #1457 from open-sausages/pulls/3/fix-dependencies
BUG Correct framework/module dependencies for cms
|
2016-04-22 13:52:16 +12:00 |
|
Damian Mooyman
|
b4f466f5e1
|
BUG Correct framework/module dependencies for cms
|
2016-04-21 18:45:56 +12: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 |
|
Damian Mooyman
|
be1a16a357
|
Merge pull request #1437 from camfindlay/patch-2
License moved to own file
|
2016-04-04 18:25:30 +12:00 |
|
Damian Mooyman
|
6be57343f9
|
Merge pull request #1436 from camfindlay/patch-1
Add license file
|
2016-04-04 18:25:24 +12:00 |
|
Cam Findlay
|
4c419ae4ae
|
License moved to own file
|
2016-04-04 16:34:04 +12:00 |
|
Cam Findlay
|
1755714210
|
Add license file
While this is in the README it's common to have a separate license file to make it clear this is FOSS.
|
2016-04-04 16:33:01 +12: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 |
|
Daniel Hensby
|
19cc7037c9
|
Merge pull request #1429 from jonom/file-icons
Remove redundant CSS
|
2016-03-20 07:48:25 +00:00 |
|
Daniel Hensby
|
e4a198401a
|
Merge pull request #1426 from SilbinaryWolf/created-readonly-sitetreeurlsegmentfield
NEW: Added readonly version of SiteTreeURLSegmentField
|
2016-03-19 10:16:35 +00:00 |
|
Jonathon Menz
|
0e47583c9a
|
Remove redundant CSS
StripThumbnail now provides icon for all file types
|
2016-03-15 12:07:20 -07:00 |
|