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
6,553 Commits 29 Branches 403 Tags 28 MiB
6bc1171323
Commit Graph

6553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robbie Averill
f9aeeb1d6c FIX Remove coupling from SiteTree to campaign admin module 
Add to Campaign button is now in an extension in the campaign-admin module
 2019-02-01 19:36:13 +03:00
Maxime Rainville
53374d617e
Merge pull request #2280 from creative-commoners/pulls/4.2/subsites-namespace 
FIX Use correct subsites namespace in SiteTree and test classes
 2019-02-01 17:27:35 +13:00
Jonathon Menz
e20be9293f NEW Meta tag components 
Meta tags can now be individually accessed and modified by key, prior to being rendered and flattened in to a single string.
 2019-02-01 14:49:01 +13:00
Robbie Averill
2533e729fc Merge branch '4.3' into 4 2019-01-29 14:03:59 +02:00
Robbie Averill
287f17b848 Merge branch '4.2' into 4.3 2019-01-29 14:03:47 +02:00
Maxime Rainville
bb659019cf
Merge pull request #2367 from sachajudd/pulls/4.4/font-icons-site-tree 
NEW Convert drag handle and dropdown caret to use font-icons in site tree
 2019-01-29 13:29:31 +13:00
Sam Minnee
dd06178167 MINOR: Change “Choose Page” to “Search or choose Page” 
Based on discussions with James Ford, it wasn’t clear that you could
search.

Companion to https://github.com/silverstripe/silverstripe-framework/pull/8766
 2019-01-29 12:15:38 +13:00
Robbie Averill
eb62e11d75
Merge pull request #2370 from tractorcow/pulls/4.2/published-filter-page 
BUG Don't convert datalist to arraylist when filtering pages
 2019-01-18 08:29:45 +01:00
Damian Mooyman
9ced23473f
BUG Don't convert datalist to arraylist when filtering pages 
Fixes #2354
 2019-01-18 10:35:34 +13:00
Sacha Judd
6689db1ba9 NEW Convert drag handle and dropdown caret to use font-icons in site tree 2019-01-16 17:22:24 +13:00
Robbie Averill
ba897af221
Merge pull request #2364 from sachajudd/pulls/4.4/font-icon-support 
NEW Add font-icon support for site tree
 2019-01-14 09:06:40 +01:00
Sacha Judd
1f1f44969a NEW Add font-icon support for site tree 2019-01-14 13:16:30 +13:00
Robbie Averill
097d221150
Merge pull request #2363 from open-sausages/pulls/4/CanOrganiseSitetree-clean-up 
MINOR Clean up CMSMain::CanOrganiseSitetree
 2019-01-11 12:37:09 +01:00
Maxime Rainville
bbffe05541 Fixing linting error. 2019-01-12 00:16:04 +13:00
Robbie Averill
08502fb4dc
MINOR Typo fix 
Co-Authored-By: maxime-rainville <maxime@rainville.me>
 2019-01-12 00:12:35 +13:00
Maxime Rainville
3a1329f61b MINOR Clean up CMSMain::CanOrganiseSitetree 2019-01-11 23:56:40 +13:00
Aaron Carlino
75f41b56d5 Merge branch '4.3' into 4 2019-01-10 14:57:01 +13:00
Aaron Carlino
0e8b87087d Merge branch '4.2' into 4.3 2019-01-10 14:56:15 +13:00
Aaron Carlino
9ccba1b0bb Merge branch '4.1' into 4.2 2019-01-10 14:49:25 +13:00
Aaron Carlino
06b982f8dc MINOR: Fix linting error 2019-01-10 14:10:47 +13:00
Aaron Carlino
6beb682cfa Merge branch '4.3' into 4 2019-01-10 12:06:36 +13:00
Aaron Carlino
bf095956a5 Merge branch '4.2' into 4.3 2019-01-10 12:06:01 +13:00
Aaron Carlino
3f33a5dabd Merge branch '4.1' into 4.2 2019-01-10 12:02:58 +13:00
Aaron Carlino
4dcfcc073c Merge branch '4.0' into 4.1 2019-01-10 12:02:41 +13:00
Maxime Rainville
345f6fcef8 MINOR Update CMS test to work with configurable resource dir (#2353) 2019-01-09 15:35:59 +13:00
Aaron Carlino
c4a0d5f083 BUGFIX: Publish button text merge regression 2018-12-13 15:21:49 +13:00
Aaron Carlino
34a5ff9eca BUGFIX: Publish button text merge regression 2018-12-13 15:19:23 +13:00
Guy Marriott
5269036e93
Merge pull request #2346 from open-sausages/pulls/4.3/fix-form-clearing 
Add test to make sure you can create a page under another page
 2018-12-12 18:11:22 +13:00
Aaron Carlino
721884206e Update translations 2018-12-12 12:50:48 +13:00
Aaron Carlino
79273cf7ae Update translations 2018-12-12 12:34:52 +13:00
Aaron Carlino
ad56961150 Update translations 2018-12-12 12:21:18 +13:00
Aaron Carlino
b83d818e0a Merge branch '4.2' into 4.3 2018-12-11 17:07:55 +13:00
Aaron Carlino
acc7f46b02 Merge branch '4.1' into 4.2 2018-12-11 11:42:35 +13:00
Aaron Carlino
a4b78c4041 Merge branch '4.0' into 4.1 2018-12-11 11:42:11 +13:00
Guy Marriott
c0f1d0a6ed
Merge pull request #2351 from creative-commoners/pulls/4.3/cms-action-loading-indicators 
FIX Show loading indicator when performing secondary CMS actions
 2018-12-10 13:17:30 +13:00
Robbie Averill
6a716b1906 FIX Show loading indicator when performing secondary CMS actions 
E.g. rollback, archive, cancel draft changes. This adds a loading indicator after
clicking on one of these actions in the CMS.
 2018-12-07 16:44:02 +00:00
Guy Marriott
c1b1572752
Merge pull request #2344 from creative-commoners/pulls/4.3/unsaved-dependent-relations 
FIX Unsaved SiteTree records now return an empty list for DependentPages
 2018-12-03 11:48:54 +13:00
Guy Marriott
33914b49d7
Merge pull request #2348 from creative-commoners/pulls/4.3/test-fix 
FIX CMSPageHistoryControllerTest now uses a stub controller to avoid URL conflicts with versioned-admin
 2018-12-03 11:35:16 +13:00
Robbie Averill
84db517bfe Merge branch 'pr-2105' into 4.0 2018-12-02 18:21:40 +00:00
Robbie Averill
7554b61325 Update meta generator tests to use isolated configuration and better assertions 2018-12-02 18:20:44 +00:00
Robbie Averill
602597b900 FIX CMSPageHistoryControllerTest now uses a stub controller to avoid URL conflicts with versioned-admin 2018-12-02 18:07:56 +00:00
Robbie Averill
29a22bcb52
Set history controller priority in tests to ensure it is loaded 2018-12-02 15:57:26 +00:00
bergice
53cd9dcf1c Add test to make sure you can create a page under another page 2018-11-30 13:28:04 +13:00
Robbie Averill
0bb22732c9 FIX Unsaved SiteTree records now return an empty list for DependentPages 2018-11-28 13:44:52 +01:00
Robbie Averill
60aadf8f28 Merge branch '4.3' into 4 2018-11-26 15:09:38 +01:00
Guy Marriott
309dc97a32 FIX Pages should use rollback recursive to revert to previous versions (#2329) 2018-11-23 13:07:01 +13:00
Maxime Rainville
44b600814a
Merge pull request #2287 from sb-relaxt-at/4.2 
Fixing wrong Live-Preview-Link in SilverStripeNavigatorItem_LiveLink
 2018-11-23 10:05:05 +13:00
Robbie Averill
ce3a1ce913 FIX Use correct subsites namespace in SiteTree and test classes 2018-11-20 13:34:38 +01:00
Guy Marriott
203ecdb210
Merge pull request #2333 from micmania1/bugfix/revert-to-publish-shows-draft 
BUGFIX reverting to publish still shows draft changes
 2018-11-20 09:22:48 +13:00
Luke Edwards
038cd8f20d Upgrade to React 16 and latest node.js version (#2319) 
* Bump to React v16

* FIX Adding prop-types to NPM dependencies

* Upgrade webpack-config
 2018-11-19 14:45:03 +13:00