tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
4,647 Commits 29 Branches 403 Tags 28 MiB
859fd5562f
Commit Graph

4647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
scott1702
459ba5676c Add no-text class to search icon 2016-02-04 10:40:11 +13: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
23daa2fbe5 Merge remote-tracking branch 'origin/3.3.0' into 3.3 2016-01-25 15:48:17 +13:00
Damian Mooyman
0cc49cb27a Update translations 2016-01-25 15:06:55 +13:00
Daniel Hensby
1582f13096 Merge pull request #1372 from tractorcow/pulls/3.3/fix-treeview-refresh 
BUG Don't keep stale treeview data when refreshing Content area
 2016-01-22 15:10:15 +00:00
Damian Mooyman
b54d2f1f7f Merge pull request #1353 from sb-relaxt-at/1334-sitetree-classdropdown-bugfix 
Adding context parameter to canCreate-check in getClassDropdown
 2016-01-22 17:41:27 +13:00
Damian Mooyman
f80467a748 BUG Don't keep stale treeview data when refreshing Content area 
Fixes https://github.com/silverstripe/silverstripe-framework/issues/4945
 2016-01-22 16:56:18 +13:00
Daniel Hensby
0c0c46b465 Merge pull request #1371 from tractorcow/pulls/3.3/fix-addpage-parent 
BUG Fix incorrect "Add Page" button selector
 2016-01-21 22:38:09 +00:00
Damian Mooyman
e364fdb794 BUG Fix incorrect "Add Page" button selector 
Fixes https://github.com/silverstripe/silverstripe-framework/issues/4540
 2016-01-22 11:13:21 +13:00
Loz Calver
dbb8b5852f Merge pull request #1369 from tractorcow/pulls/3.3/fix-default-home 
BUG prevent "Home page" being selected when no selection was made
 2016-01-20 09:11:17 +00:00
Damian Mooyman
abc5556520 BUG Fix legacy breadcrumbs appearing on page save 
Fixes #1358
 2016-01-20 15:29:51 +13:00
Damian Mooyman
7c4e6f4b60 BUG prevent "Home page" being selected when no selection was made 
Fixes #1351
 2016-01-20 14:44:11 +13:00
Damian Mooyman
e706b147cc Merge remote-tracking branch 'origin/3.2' into 3.3 2016-01-19 15:08:33 +13:00
Daniel Hensby
e9e6a9cca4 Merge pull request #1361 from kinglozzer/behat-coverage-file-link 
Add behat coverage to check that file field is reset when adding links
 2016-01-12 00:37:22 +00:00
Damian Mooyman
b1387641bf Merge pull request #1360 from kinglozzer/1359-link-tracking-regex 
FIX: preg_quote() anchors in SiteTreeLinkTracking (fixes #1359)
 2016-01-12 11:03:32 +13:00
Loz Calver
e19dfd628b Add behat coverage to check that file field is reset when adding links 2016-01-11 17:08:28 +00:00
Loz Calver
d637141487 FIX: preg_quote() anchors in SiteTreeLinkTracking (fixes #1359) 2016-01-11 16:44:55 +00:00
Stephan Bauer
b30d33585f BUG Adding context parameter to canCreate-check in getClassDropdown of SiteTree (fixes #1334) 2016-01-05 11:00:43 +01:00
Damian Mooyman
d387d4f311 Update translations 2015-12-23 13:22:38 +13:00