Commit Graph

6059 Commits

Author SHA1 Message Date
Serge Latyntsev
c7e44f85aa
Merge pull request #7 from silverstripe-security/pulls/4.3/joseph-installin
[CVE-2019-12204]: install.php warning does not account for public dir
2019-09-24 11:25:49 +12:00
Serge Latyntcev
80bcc70d38 Merge branch '4.2' into 4.3 2019-09-23 16:21:50 +12:00
Aaron Carlino
f98a59deb5 [CVE-2019-12204]: install.php warning does not account for public dir 2019-08-20 21:45:29 +12:00
Robbie Averill
59b9a0d664
Merge pull request #2411 from kinglozzer/virtualpage-definemethods
FIX: VirtualPage missing methods from target page (fixes #2408)
2019-08-05 13:16:08 +12:00
Robbie Averill
8ccd7f2b6f Merge branch '4.2' into 4.3 2019-07-19 11:47:25 +02:00
Guy Marriott
b9dcf07040
FIX: Change sitetree new page column class naming to avoid conf… (#2449)
FIX: Change sitetree new page column class naming to avoid conflicts with bootstrap
2019-06-28 10:27:16 +12:00
Mikaela Young
73f4e8c860 FIX: Change sitetree new page column class naming to avoid conflicts with bootstrap 2019-06-19 16:57:22 +12:00
Aaron Carlino
c5cfeda416 Update translations 2019-06-10 22:48:03 +12:00
Aaron Carlino
7c144b45c6 Update translations 2019-06-10 22:47:34 +12:00
Aaron Carlino
b7707f319c Merge branch '4.2' into 4.3 2019-06-10 16:26:08 +12:00
Robbie Averill
7775abb078
Merge pull request #2442 from creative-commoners/pulls/4.2/extensible-sitetree-hints-cache-key
NEW Add updateHintsCacheKey extension point to fix invalid caching
2019-05-31 13:35:39 +12:00
Garion Herman
c569cec4ea NEW Add updateHintsCacheKey extension point to fix invalid caching
If a module augments the allowed pagetypes based on external conditions,
the Hints Cache Key will not cover these conditions and may cause
incorrect output. An example of this is Subsites, which allows each
Subsite to have a different set of allowed pagetypes.
2019-05-31 10:21:07 +12:00
Loz Calver
7592db918f FIX: VirtualPage missing methods from target page (fixes #2408) 2019-04-18 14:01:26 +01:00
Will Rossiter
4fbe0fd6b9 Fix linking anchor on the same page (#2388)
To reproduce this issue open a page, add an anchor, save the page, go to link to newly created anchor on the same page.

Incorrect result will be the new anchor does not appear. This patch ensures that the page anchors are reloaded.
2019-04-15 14:34:25 +12:00
Robbie Averill
3b0e6b5a38 Merge branch '4.2' into 4.3
# Conflicts:
 #	lang/da.yml
 #	lang/de.yml
 #	lang/nl.yml
2019-04-11 11:46:00 +12:00
Robbie Averill
4e70a6bc70 Update translations 2019-04-11 11:43:22 +12:00
Robbie Averill
cd64d27ab5 Merge branch '4.1' into 4.2 2019-04-11 11:39:23 +12:00
Robbie Averill
f112e04f57 Merge branch '4.0' into 4.1 2019-04-11 11:38:03 +12:00
Aaron Carlino
9c880f121b Update translations 2019-03-19 14:36:49 +13: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
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
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
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
Robbie Averill
287f17b848 Merge branch '4.2' into 4.3 2019-01-29 14:03:47 +02: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
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
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
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