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,968 Commits 29 Branches 403 Tags 28 MiB
095ae30a3e
Commit Graph

4968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
beba0f2551 BUG Fix behat tests for asset abstraction 
Requires https://github.com/silverstripe-labs/silverstripe-behat-extension/pull/111
 2016-02-24 15:01:40 +13:00
Ingo Schommer
94fcfa48ed Merge pull request #1381 from open-sausages/pulls/4.0/versioned-asset-control 
API Support versioned File management
 2016-02-23 14:15:13 +13:00
Ingo Schommer
4acc256095 Merge pull request #1394 from open-sausages/pulls/4.0/tinymce 
Upgrade TinyMCE to 4.x
 2016-02-23 10:39:00 +13:00
Damian Mooyman
1c907dd227 API Support versioned File management 
API Decouple File and ErrorPage
API Link tracking is now only performed on stage (in lieu of versioned relationships)
API Refactor versioned API methods out of SiteTree and into Versioned
 2016-02-22 12:25:25 +13:00
Daniel Hensby
c8748f58f3 Merge pull request #1395 from tractorcow/pulls/4.0/cleanup-object 
API Remove references to class aliases; Use correct classname
 2016-02-19 23:30:26 +00: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
5a4ef9b408 Merge pull request #1397 from scott1702/fix-lang 
Correctly require CMS lang files
 2016-02-19 09:39:38 +13:00
scott1702
26613dc39e Correctly require CMS lang files 2016-02-18 12:05:27 +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
99394a84d0 API Remove references to class aliases; Use correct classname 2016-02-17 10:18:33 +13:00
Damian Mooyman
377af292be Upgrade TinyMCE to 4.x 2016-02-15 14:58:24 +13:00
Damian Mooyman
3cefb2edad Merge remote-tracking branch 'origin/3' 2016-02-12 15:42:33 +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
Damian Mooyman
3d99ee07b7 Merge pull request #1383 from open-sausages/pulls/4.0/module-loader 
Correctly require thirdparty JavaScript modules
 2016-02-02 15:05:41 +13:00
scott1702
204fde89d9 Correctly require thirdparty JavaScript modules 2016-02-01 09:39:10 +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
c9cf833ad6 Merge pull request #1375 from open-sausages/pulls/4.0/module-loader 
Implement RFC-7 JavaScript module loader in CMS
 2016-01-27 16:57:43 +13:00
Damian Mooyman
3d0178ebc0 BUG Use correct formaction for doRollback exemption 2016-01-27 15:38:48 +13:00
scott1702
66f6ecc57e Implement RFC-7 JavaScript module loader in CMS 2016-01-27 14:56:47 +13:00
Daniel Hensby
92546b481e Merge pull request #1377 from tractorcow/pulls/4.0/virtualpage-permissions 
API VirtualPage permissions now can be set independently of the mirrored page
 2016-01-26 22:58:50 +00:00
Damian Mooyman
17ee318d06 API VirtualPage permissions now can be set independently of the mirrored page 2016-01-27 10:01:14 +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
Ingo Schommer
ddd6111755 Merge pull request #1367 from open-sausages/pulls/4.0/module-loader 
Implement RFC-7 JavaScript module loader
 2016-01-26 16:45:08 +13:00
David Craig
ebe3d24a56 Removed requirements to non-existant file 
- CMSMain.GridField.js was moved to LeftAndMain.js in a317b6
 2016-01-26 16:14:50 +13:00
scott1702
31e7832875 Update paths in AssetAdmin.php 2016-01-26 16:14:40 +13: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
0a2456e71e Merge remote-tracking branch 'origin/3' 2016-01-25 16:16:53 +13:00
Damian Mooyman
19c24bb2df Merge remote-tracking branch 'origin/3.3' into 3 2016-01-25 15:58:35 +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
0a0ac86f5b Merge pull request #1370 from tractorcow/pulls/4.0/defaultclass 
API Refactor out Page default classname hack
 2016-01-21 22:40:33 +00:00