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 |
|
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
|
2734f1a18e
|
Merge remote-tracking branch 'origin/3.3' into 3
|
2016-02-24 17:35:46 +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 |
|