Commit Graph

4672 Commits

Author SHA1 Message Date
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
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
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
Damian Mooyman
531e7d4c3b Merge pull request #1384 from dhensby/pulls/modeladmin-reading-mode
Removing stage reading mode as it will be set in LeftAndMain
2016-02-04 11:16:34 +13:00
scott1702
459ba5676c Add no-text class to search icon 2016-02-04 10:40:11 +13:00
Damian Mooyman
4c7a240726 Merge pull request #1385 from AppChecker/3
Fix typo
2016-02-03 09:58:04 +13:00
appchecker
8e40b41460 Fix typo 2016-02-02 20:19:23 +03:00
Daniel Hensby
5f10d66e71 Removing stage reading mode as it will be set in LeftAndMain 2016-02-02 13:43:56 +00:00
Daniel Hensby
4ab8bfe859 Merge pull request #1378 from tractorcow/pulls/3.2/rollback-exemption
BUG Use correct formaction for doRollback exemption
2016-01-27 12:02:57 +00:00
Damian Mooyman
3d0178ebc0 BUG Use correct formaction for doRollback exemption 2016-01-27 15:38:48 +13:00
Damian Mooyman
d8bf0ab327 Merge pull request #1376 from dhensby/pulls/3/fix-action-alignment
FIX Borders on CMS Actions
2016-01-27 09:48:03 +13:00
Daniel Hensby
b1b403cd08 FIX Borders on CMS Actions 2016-01-26 14:42:41 +00:00
Daniel Hensby
0eb4b8e256 Merge pull request #1314 from kinglozzer/hide_ancestor
FIX: Setting hide_ancestor=true causes a random page type to be hidden
2016-01-25 11:57:04 +00:00
Loz Calver
fb43e59b00 FIX: Setting hide_ancestor=true causes a random page type to be hidden 2016-01-25 09:18:35 +00:00
Damian Mooyman
19c24bb2df Merge remote-tracking branch 'origin/3.3' into 3 2016-01-25 15:58:35 +13:00