tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,283 Commits 28 Branches 397 Tags 24 MiB
Commit Graph

6283 Commits

Author SHA1 Message Date
Al Twohill dcfb502e5c Addresses #2401 
Note, I've got no idea behind the logic of should_be_on_root - the change is a best guess based on the fact that `Translatable` doesn't exist in SS4 yet
 2019-03-28 20:40:33 +13:00
Robbie Averill 023248f867
Merge pull request #2390 from creative-commoners/pulls/4.4/style-updates 
NEW BrokenLinksReport now uses injector for fields, uses short array syntax and single quotes
 2019-03-22 13:55:57 +13:00
Aaron Carlino 9c880f121b Update translations 2019-03-19 14:36:49 +13:00
Maxime Rainville c7b3b30728 BUG Bump JS dependencies for merge and bootstrap 2019-03-14 11:35:34 +13:00
Sacha Judd a0aaf050d4 FIX Deprecate creatableChildren and add new function to support font-icon classes for allowedChildren 2019-02-25 17:00:47 +13:00
Robbie Averill 12512e84b1 NEW BrokenLinksReport now uses injector for fields, uses short array syntax and single quotes 2019-02-22 16:11:15 +07:00
Aaron Carlino e277293cf4 Update translations 2019-02-12 16:49:53 +13:00
Aaron Carlino 38bccd63f8 Update translations 2019-02-12 16:49:43 +13:00
Aaron Carlino 6b588a9bf5 Update translations 2019-02-12 16:09:07 +13:00
Guy Marriott 543307adfe
Merge pull request #2387 from creative-commoners/pulls/4.3/versioning-test-update 
SiteTreeTest::testReadArchiveDate() now tests ORM results rather than underlying sql arguments
 2019-02-12 08:41:44 +13:00
Robbie Averill abd661bfab SiteTreeTest::testReadArchiveDate() now tests ORM results rather than underlying sql arguments 2019-02-11 14:30:25 +03:00
Robbie Averill 614db45bc5
Merge pull request #2385 from creative-commoners/pulls/4.3/php-73 
Add PHP 7.2 and 7.3 to Travis builds
 2019-02-10 08:35:28 +03:00
Robbie Averill 816db609ab Add PHP 7.2 and 7.3 to Travis builds 2019-02-06 23:24:02 +03:00
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