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,043 Commits 29 Branches 403 Tags 28 MiB
6689db1ba9
Commit Graph

6043 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guy Marriott
814922747a
Merge pull request #2274 from creative-commoners/pulls/4.3/factory-extensibility 
NEW Add update extension hooks for LinkFormFactory subclasses
 2018-11-11 23:09:24 +13:00
Robbie Averill
12907271ff NEW Add update extension hooks for LinkFormFactory subclasses 2018-11-10 14:58:51 +02:00
Guy Marriott
26e196de31
Merge pull request #2320 from sminnee/fix-1452 
MINOR: Add tests for some search-form fixes
 2018-11-10 15:45:11 +13:00
Sam Minnee
5e3068ba13 MINOR: Add tests for some search-form fixes 
These 2 tests validate that the following bugs have been fixed.

https://github.com/silverstripe/silverstripe-framework/issues/3212
https://github.com/silverstripe/silverstripe-cms/issues/1452
 2018-11-10 12:07:49 +13:00
Robbie Averill
1f7406f691
Merge pull request #2263 from creative-commoners/pulls/4.3/bootstrap-alerts 
NEW Use Bootstrap alerts throughout the CMS
 2018-11-09 14:29:38 +02:00
Aaron Carlino
cc938ee26c Update translations 2018-11-08 16:25:42 +13:00
Luke Edwards
fd76620dc7 Merge branch '4.3' into 4 2018-11-08 15:35:01 +13:00
Vagrant Default User
066f9633a5 Update translations 2018-11-07 21:37:37 +13:00
Aaron Carlino
1510658131 Update translations 2018-11-07 17:57:46 +13:00
Aaron Carlino
32c0b57de0 Update translations 2018-11-07 16:31:27 +13:00
Luke Edwards
40c421b8db
Merge pull request #2304 from open-sausages/pulls/4.3/caches-and-pains 
BUGFIX: Bypass apollo cache for versions list
 2018-11-05 13:29:16 +13:00
Aaron Carlino
e6c9df03bf Rebase and build 2018-11-05 10:10:24 +13:00
Aaron Carlino
3f4d5ae03e BUGFIX: Bypass cached versions to prevent stale state 2018-11-05 09:55:51 +13:00
Luke Edwards
d9b1721ac3 BUG: Fix duplicate plugins on HTML editor fields (#2307) 2018-11-02 13:41:57 +13:00
Maxime Rainville
86a043c5c4
Merge pull request #2306 from open-sausages/pulls/4.3/ie-relocation 
FIX IE11+Edge17 Pages tree List View button
 2018-11-01 14:34:26 +13:00
Serge Latyntcev
14bcb5c7f7 Groom the CMSMain.Tree.js formatting 2018-11-01 14:15:57 +13:00
Serge Latyntcev
6e104df9ac Add the same fix for "Too many pages (show as list)" 2018-11-01 11:49:59 +13:00
Serge Latyntcev
2ef7bd2975 FIX IE11+Edge17 Pages tree List View button 2018-10-31 16:12:03 +13:00
Loz Calver
45b092c121
Merge pull request #2302 from creative-commoners/pulls/4.4/replace-json-use 
FIX Replace usage of Convert JSON methods with json_encode and json_decode
 2018-10-29 17:50:10 +01:00
Robbie Averill
ab739c7fb0 FIX Replace usage of Convert JSON methods with json_encode and json_decode 2018-10-28 21:21:19 +00:00
Maxime Rainville
f08be7217a MINOR Update CMS test to explicitetly register the CMSPageHistoryController (#2300) 2018-10-24 15:16:54 +13:00
Maxime Rainville
9abd721a56 MINOR Update CMS test to explicitetly register the CMSPageHistoryController (#2300) 2018-10-24 15:13:59 +13:00
Maxime Rainville
2773e9c075 API Deprecate CMSPageHistoryController (#2298) 2018-10-24 11:52:39 +13:00
Robbie Averill
3cc37e40f9 Bump branch alias and Travis version for 4.4.x-dev 2018-10-15 14:05:06 +02:00
Robbie Averill
bbc9918f03 Merge branch '4.3' into 4 2018-10-15 14:04:19 +02:00
Aaron Carlino
d44e761835 Remove obsolete branch-alias 2018-10-15 16:31:38 +13:00
Aaron Carlino
d8f19bd8c2 Merge branch '4.2' into '4' 2018-10-15 13:40:43 +13:00
Aaron Carlino
2f16da936d Merge branch '4.1' into 4.2 2018-10-15 13:32:33 +13:00
Robbie Averill
d1c3a96653
Merge pull request #2290 from open-sausages/pulls/4/lazy-load-gridfield 
MINOR Enable the lazy loading for DependentPages GridField
 2018-10-11 14:00:27 +02:00
Maxime Rainville
974ea3b29d MINOR Remove AbsoluteURL column from DependentPage (#2290) 2018-10-11 14:42:16 +13:00
Luke Edwards
a7a4b1e56a
Merge pull request #2288 from creative-commoners/pulls/4.3/upgrade-bootstrap 
MINOR Upgrade Bootstrap to 4.1.2
 2018-10-10 10:06:38 +13:00
Maxime Rainville
790733fc78
Merge pull request #2289 from creative-commoners/pulls/4.3/can-create-to-duplicate 
FIX CMSMain::duplicate() now checks canCreate() but not canEdit()
 2018-10-09 17:06:51 +13:00
Maxime Rainville
7f0d4c8634 MINOR Enable the lazy loading for DependentPages GridField 2018-10-09 14:16:43 +13:00
Robbie Averill
6e649b570d FIX CMSMain::duplicate() now checks canCreate() but not canEdit() 2018-10-08 13:55:59 +02:00
Robbie Averill
c215e0a198 MINOR Upgrade Bootstrap to 4.1.2 2018-10-08 13:19:27 +02:00
Stephan Bauer
c498aa0337 Fixing wrong Live-Preview-Link in SilverStripeNavigatorItem_LiveLink (fixes #865). 2018-10-06 21:32:58 +02:00
Ingo Schommer
1e497d523f
Merge pull request #2244 from creative-commoners/pulls/5.0/snoisrev-history-viewer 
FIX Sort history viewer versions in descending order
 2018-10-05 11:37:16 +13:00
Robbie Averill
0b9bcf382d
Merge pull request #2283 from open-sausages/pulls/4/remove-member-link-tracking 
Member should not have link tracking enabled by default
 2018-10-03 13:32:11 +02:00
bergice
0ecdba3960 Member should not have link tracking enabled by default 2018-10-03 11:01:58 +13:00
Robbie Averill
3b3ce70378
Merge pull request #2279 from creative-commoners/pulls/4.3/searching-for-sugarman 
FIX Update field names in Behat tests for new search form namespacing
 2018-10-02 15:12:33 +02:00
Robbie Averill
f28f70c8af Linting issue 2018-10-02 10:55:34 +02:00
Robbie Averill
b3013a98c4 Update testSearchField to expect namespaced search fields 2018-10-01 12:50:20 +02:00
Guy Marriott
b0c4c5a177
FIX Updating SiteTree search fields to work with new search namespacing 2018-10-01 17:07:51 +13:00
Robbie Averill
5a017c0be8
Merge pull request #2281 from sminnee/disable-archive-message 
NEW: Add CMSMain.enable_archive_warning_message config
 2018-09-28 10:22:50 +02:00
Sam Minnee
bd37b90a3a NEW: Add CMSMain.enable_archive_warning_message config 
This lets you disable this expensive message generation on larger sites
where that is a problem. Speeding it up is obviously a preferred
solution (or removing this feature until that is possible), but this
config option is a simpler solution to the problem in the short term.
 2018-09-28 15:02:40 +12:00
Robbie Averill
44b92c90bc FIX Update field names in Behat tests for new search form namespacing 2018-09-27 11:39:42 +02:00
Robbie Averill
d1951c946f FIX Sort history viewer versions in descending order 2018-09-25 18:18:40 +02:00
Sam Minnée
5bfc37ff4b FIX: Use Hierarchy::prepopulateTreeDataCache() in CMS (#2266) 
* FIX: Use Hierarchy::prepopulate_numchildren_cache in tree-generation

Only relevant if https://github.com/silverstripe/silverstripe-framework/pull/8380 is avialable,
however coded defensively so it can be merged before that PR if needs 
be.

See https://github.com/silverstripe/silverstripe-framework/issues/8379

* FIX: Use Hierarchy::prepopulateTreeDataCache() in CMS.

Requires https://github.com/silverstripe/silverstripe-framework/pull/8395

* Cache tree_class instead of assuming it will always be SiteTree.
 2018-09-25 15:14:16 +12:00
Andre Kiste
6e7bc38aad
Merge pull request #2258 from open-sausages/pulls/4/image-inary-edit 
Fix 'Insert links into a page' test
 2018-09-21 16:43:56 +12:00
Luke Edwards
13947244c5
Merge pull request #2264 from open-sausages/pulls/4/proppa-pig 
All proptypes replaced with external lib
 2018-09-19 13:13:35 +12:00