Commit Graph

6320 Commits

Author SHA1 Message Date
Robbie Averill
c1c9d7706a Merge branch '4.3' into 4 2019-02-06 22:25:40 +03:00
Robbie Averill
23ae682b35 Merge branch '4.2' into 4.3 2019-02-06 22:24:53 +03:00
Robbie Averill
976bbc1014 Merge branch '4.1' into 4.2 2019-02-06 22:24:32 +03:00
Robbie Averill
668670b5a1 Merge branch '4.0' into 4.1 2019-02-06 22:24:14 +03:00
Maxime Rainville
8b77226a73
Merge pull request #2384 from creative-commoners/pulls/4.0/backport-2365
FIX Multibyte URL routing (backport)
2019-02-06 21:15:11 +13:00
Ingo Schommer
f8a8b38a0a Consistent check of allow_multibyte
It uses an injected instance everywhere else.
See https://github.com/silverstripe/silverstripe-cms/pull/2365#discussion_r247383809
2019-02-05 16:45:28 +03:00
Ingo Schommer
5c3b95ac89 FIX Multibyte URL routing
Was double url encoding (once in database value, then again in request)
Fixes https://github.com/silverstripe/silverstripe-framework/issues/8723
2019-02-05 16:45:28 +03:00
Robbie Averill
ff458810ea Automated phpcs linting updates 2019-02-05 16:45:11 +03:00
Maxime Rainville
8ccc9aed39
Merge pull request #2365 from open-sausages/pulls/4/8723-multibyte-routing
FIX Multibyte URL routing
2019-02-05 10:54:00 +13:00
Guy Marriott
97ee18d463
Merge pull request #2382 from creative-commoners/pulls/4.4/remove-add-to-campaign-button
FIX Remove coupling from SiteTree to campaign admin module
2019-02-04 22:20:35 +13:00
Ingo Schommer
12274fb6ec Consistent check of allow_multibyte
It uses an injected instance everywhere else.
See https://github.com/silverstripe/silverstripe-cms/pull/2365#discussion_r247383809
2019-02-04 22:04:48 +13:00
Ingo Schommer
c61ba88d82 FIX Multibyte URL routing
Was double url encoding (once in database value, then again in request)
Fixes https://github.com/silverstripe/silverstripe-framework/issues/8723
2019-02-04 22:02:15 +13:00
Ingo Schommer
1b2d417ed5
Merge pull request #2383 from creative-commoners/pulls/4.4/resources-dir-url-tests
FIX URL segment generation tests for resources dir are now accurate
2019-02-04 09:00:56 +13:00
Robbie Averill
1a7b23a21f FIX URL segment generation tests for resources dir are now accurate 2019-02-02 13:27:24 +03:00
Robbie Averill
d2310852da
Merge pull request #2215 from jonom/keyed-metatags
NEW meta tag array
2019-02-01 19:29:02 +02:00
Robbie Averill
3dbca48d29 Remove assertions for addtocampaign action 2019-02-01 20:20:40 +03:00
Maxime Rainville
ed0680a264 MINOR Add unit test for MetaComponents 2019-02-01 19:48:47 +03:00
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