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,507 Commits 29 Branches 403 Tags 28 MiB
8b574c81c7
Commit Graph

6507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guy Marriott
a6bef876c0
Merge pull request #2416 from creative-commoners/pulls/4.4/bootstrap-alert 
FIX Use Bootstrap 4 alert for page type restriction message when adding a page
 2019-05-06 10:50:16 +12:00
Robbie Averill
7cfa771681 FIX Use Bootstrap 4 alert for page type restriction message when adding a page 
Bootstrap 4 alerts are the default in SilverStripe 4.4, this one is custom so was missed during the update
 2019-05-03 15:35:08 +12:00
Robbie Averill
7ccf37a467 Update branch alias to 4.5.x-dev 2019-04-21 11:03:23 +12:00
Robbie Averill
9ab7ae16ac Remove obsolete branch alias 2019-04-21 11:02:51 +12:00
Loz Calver
7592db918f FIX: VirtualPage missing methods from target page (fixes #2408) 2019-04-18 14:01:26 +01:00
Aaron Carlino
37f0994b25 Merge branch '4.3' into 4 2019-04-18 11:54:02 +12:00
Robbie Averill
79e1b06d17
Merge pull request #2373 from sminnee/search-or-choose-page 
MINOR: Change “Choose Page” to “Search or choose Page”
 2019-04-17 12:30:46 +12: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
ttunua
0b56a563c0 FIX: Fixes #2110 added default Title value for saved pages. (#2366) 
* FIX: Fixes #2110 added default Title value for saved pages.

* FIX: Fixes #2110 fixed linting and unit test failure

* BUG Rename default wording for untitled page
 2019-04-15 14:33:15 +12:00
Robbie Averill
d4571d927d Merge branch '4.3' into 4 2019-04-11 11:46:19 +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
Loz Calver
fdfd6c7bb0
Merge pull request #2407 from open-sausages/pulls/4/docs-publishall 
API Deprecated CMSMain->publishall()
 2019-04-10 09:20:48 +01:00
Ingo Schommer
ab01ac99e3 API Deprecated CMSMain->publishall() 
The current implementation doesn't scale,
and due to the proliferation of versioned objects
no longer fully works (e.g. doesn't publish all files).

Fixes https://github.com/silverstripe/silverstripe-cms/issues/2406
 2019-04-10 10:44:14 +12:00
Guy Marriott
432266dcd2
Merge pull request #2391 from sachajudd/pulls/4.4/add-new-page 
FIX Deprecate creatableChildren and add new function to support font-icon classes for allowedChildren
 2019-04-08 14:08:14 +12:00
Guy Marriott
d2236f0954
Update code/Model/SiteTree.php 
Co-Authored-By: sachajudd <sjudd@silverstripe.com>
 2019-04-08 11:45:52 +12:00
Guy Marriott
10ff962ece
Update code/Model/SiteTree.php 
Co-Authored-By: sachajudd <sjudd@silverstripe.com>
 2019-04-08 11:45:44 +12:00
Guy Marriott
4685523b9b
Update code/Model/SiteTree.php 
Co-Authored-By: sachajudd <sjudd@silverstripe.com>
 2019-04-08 11:10:07 +12:00
Robbie Averill
a4f86605f4
Merge pull request #2404 from open-sausages/pulls/4/flushing-tests 
Remove flush from CMSPageHistoryControllerTest
 2019-04-01 11:26:31 +13:00
Serge Latyntcev
de5fc49917 Remove flush from CMSPageHistoryControllerTest 
flushing in tests is futile
 2019-04-01 10:58:53 +13:00
Andre Kiste
4cf0d29c3c
Merge pull request #2400 from open-sausages/pulls/4/bump-js-dependencies 
BUG Bump JS dependencies for merge and bootstrap
 2019-03-29 19:22:24 +13:00
Robbie Averill
fb7f6e0ffe
Merge pull request #2403 from altwohill/issue/2401 
Remove core reference to HomePageForDomainExtension
 2019-03-29 10:06:31 +13:00
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