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 |
|
Jake Bentvelzen
|
68694c01b7
|
Added readonly version of SiteTreeURLSegmentFiled, small quality of life thing when a user is looking at readonly data and wants to easily view the frontend of that page.
|
2016-03-15 10:48:46 +11: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
|
a8d48b51b1
|
Merge pull request #1414 from Andrew-Mc-Cormack/patch-1
Fix decide typo in comment
|
2016-03-08 10:00:04 +13:00 |
|
Andrew Mc Cormack
|
e6078be52e
|
Update SiteTree.php
Minor type fix
|
2016-03-07 20:37:29 +00:00 |
|
Damian Mooyman
|
774920363c
|
Merge pull request #1411 from micmania1/translatable-dependency
Removed dependency for translatable module
|
2016-03-07 15:34:26 +13:00 |
|
Ingo Schommer
|
a3ee8b92be
|
Merge remote-tracking branch 'origin/3.3' into 3
|
2016-03-07 08:49:47 +13:00 |
|
Ingo Schommer
|
859fd5562f
|
Behat "insert link" regression
See 361c9a03fe62431ea9f3fda200df80470334835f
|
2016-03-07 08:48:02 +13:00 |
|
Ingo Schommer
|
397f9670b5
|
Fixed core release constraint in travis.yml
|
2016-03-04 16:57:49 +13:00 |
|
Ingo Schommer
|
fa8f5b3f2b
|
Merge remote-tracking branch 'origin/3.3' into 3
|
2016-03-04 14:35:06 +13:00 |
|
micmania1
|
7c5f29ce19
|
Removed dependency for translatable module
|
2016-03-03 23:11:49 +00:00 |
|
Damian Mooyman
|
ffdfac6af4
|
Merge branch '3.2' into 3.3
# Conflicts:
# lang/en.yml
# lang/sk.yml
|
2016-02-29 16:47:11 +13:00 |
|
Damian Mooyman
|
2406881d3e
|
Merge remote-tracking branch 'origin/3.3.1' into 3.3
# Conflicts:
# lang/cs.yml
|
2016-02-29 16:44:01 +13:00 |
|
Damian Mooyman
|
1eed3608ad
|
Merge branch '3.1' into 3.2
# Conflicts:
# code/controllers/CMSMain.php
|
2016-02-29 16:41:01 +13:00 |
|