Commit Graph

6005 Commits

Author SHA1 Message Date
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
Robbie Averill
0bb22732c9 FIX Unsaved SiteTree records now return an empty list for DependentPages 2018-11-28 13:44:52 +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
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
Guy Marriott
84510f1869
Merge pull request #2334 from creative-commoners/pulls/4.0/search-input-placeholder
FIX 'Search' text in default search form should be a placeholder
2018-11-17 15:52:35 +13:00
Robbie Averill
35c3a8c68d FIX 'Search' text in default search form should be a placeholder 2018-11-16 17:18:12 +02:00
Maxime Rainville
ab4c156948
Merge pull request #2330 from open-sausages/pulls/4.3/speed-boost-for-dependent-pages
MINOR Speed up DependentPages by shifting existence check to table join
2018-11-16 16:08:34 +13:00
micmania1
4896004b50 BUGFIX reverting to publish still shows draft changees 2018-11-16 14:12:01 +13:00
Loz Calver
e30612d290
Merge pull request #2332 from creative-commoners/pulls/4.3/tighten-dependencies
Update dependencies to have a minimum of SilverStripe 4.3
2018-11-15 15:40:30 +01:00
Robbie Averill
8977e4e79e Update dependencies to have a minimum of SilverStripe 4.3 2018-11-15 15:02:41 +02:00
Robbie Averill
03869b1627 Remove undefined variable, should use the baseTable() from the $parentClass 2018-11-15 13:30:33 +02:00
Maxime Rainville
b138eb06ff Revert BackLinkTracking to return Parent Object of the SiteTreeLink rather than SiteTreeLink itself 2018-11-15 15:57:17 +13:00
Maxime Rainville
0bff8728b1 MINOR Speed up DependentPages by shifting existence check to table join 2018-11-14 18:01:29 +13:00
Guy Marriott
d748566054
Merge pull request #2262 from creative-commoners/pulls/4.2/title-corners
FIX SiteTree Title field should have rounded corners before Update URL button is shown
2018-11-13 09:55:29 +13:00
Aaron Carlino
cc938ee26c Update translations 2018-11-08 16:25:42 +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
Maxime Rainville
f08be7217a MINOR Update CMS test to explicitetly register the CMSPageHistoryController (#2300) 2018-10-24 15:16:54 +13: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