Damian Mooyman
|
4571779213
|
Update translations
|
2016-05-11 11:05:57 +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 |
|
Loz Calver
|
036420470d
|
FIX: Incorrect title attribute on CMS tabs
|
2016-03-08 15:00:29 +00: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 |
|
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 |
|
Damian Mooyman
|
ba9c3378e2
|
Merge remote-tracking branch 'origin/3.2.3' into 3.2
|
2016-02-29 16:38:38 +13:00 |
|
Damian Mooyman
|
d6292b9b55
|
Merge remote-tracking branch 'origin/3.1.18' into 3.1
|
2016-02-29 16:34:26 +13:00 |
|
Damian Mooyman
|
77d506547c
|
Update translations
|
2016-02-29 15:01:55 +13:00 |
|
Damian Mooyman
|
80959dc441
|
Update translations
|
2016-02-29 15:01:10 +13:00 |
|
Damian Mooyman
|
e6f9e71a0f
|
Update translations
|
2016-02-29 14:57:30 +13:00 |
|
Damian Mooyman
|
05a9c760f8
|
Update translations
|
2016-02-27 20:38:29 +13:00 |
|
Damian Mooyman
|
a89debb962
|
Update translations
|
2016-02-27 20:38:19 +13:00 |
|
Damian Mooyman
|
be980a50fc
|
Update translations
|
2016-02-27 20:35:10 +13:00 |
|
Damian Mooyman
|
208497ea42
|
Merge remote-tracking branch 'origin/3.2' into 3.3
# Conflicts:
# lang/en.yml
# lang/lt.yml
|
2016-02-24 17:32:58 +13:00 |
|
Damian Mooyman
|
65aa5bccae
|
Merge remote-tracking branch 'origin/3.3.0' into 3.3
|
2016-02-24 17:31:47 +13:00 |
|
Damian Mooyman
|
a5e1a93948
|
Merge remote-tracking branch 'origin/3.2.2' into 3.2
|
2016-02-24 17:04:32 +13:00 |
|
Damian Mooyman
|
af02352c8c
|
Merge remote-tracking branch 'origin/3.1.17' into 3.1
|
2016-02-24 16:55:12 +13:00 |
|
Damian Mooyman
|
a5444c3eeb
|
Update translations
|
2016-02-24 16:06:03 +13:00 |
|
Damian Mooyman
|
4c3761f42c
|
Update translations
|
2016-02-24 15:20:40 +13:00 |
|
Damian Mooyman
|
4849aa828e
|
Update translations
|
2016-02-24 15:14:58 +13:00 |
|
Damian Mooyman
|
aeea8b55a2
|
Merge remote-tracking branch 'origin/3.2.2' into 3.2
|
2016-02-19 12:52:11 +13:00 |
|
Damian Mooyman
|
2ac0a555ea
|
Merge remote-tracking branch 'origin/3.1.17' into 3.1
|
2016-02-19 12:49:10 +13:00 |
|
Damian Mooyman
|
33bf5f9519
|
Update translations
|
2016-02-19 10:54:36 +13:00 |
|
Damian Mooyman
|
42cedb70b9
|
Update translations
|
2016-02-19 10:21:02 +13:00 |
|
Damian Mooyman
|
13f21231d6
|
Merge pull request #1396 from andrewandante/3.1-rollback-exemption
BUG Use correct formaction for doRollback exemption #1378
|
2016-02-17 16:29:58 +13:00 |
|
Andrew Aitken-Fincham
|
644c807031
|
BUG Use correct formaction for doRollback exemption #1378
|
2016-02-17 10:20:38 +13:00 |
|
Damian Mooyman
|
c43b84573b
|
Update translations
|
2016-02-09 17:45:20 +13:00 |
|
Ingo Schommer
|
ae017f2f4a
|
Merge pull request #1392 from tractorcow/pulls/3.3.0/fix-folder-edit
BUG Prevent folders deleted on the filesystem from breaking asset interface
|
2016-02-09 16:19:23 +13:00 |
|
Damian Mooyman
|
2ad490c3e2
|
BUG Prevent folders deleted on the filesystem from breaking asset interface
|
2016-02-09 13:03:40 +13:00 |
|
Damian Mooyman
|
cf51e46093
|
Merge pull request #1389 from scott1702/no-text
Add no-text class to search icon
|
2016-02-04 11:51:24 +13:00 |
|