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,376 Commits 29 Branches 403 Tags 28 MiB
9f7262f99d
Commit Graph

6376 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Carlino
521d9504f5 Update translations 2019-06-10 17:14:04 +12:00
Aaron Carlino
8a44071ec6 Merge branch '4.4' into 4 2019-06-10 16:26:55 +12:00
Aaron Carlino
3bf78e05df Merge branch '4.3' into 4.4 2019-06-10 16:26:32 +12:00
Aaron Carlino
b7707f319c Merge branch '4.2' into 4.3 2019-06-10 16:26:08 +12:00
Ingo Schommer
91a147a315
Merge pull request #2437 from creative-commoners/pulls/4.5/php71 
Update minimum PHP version to 7.1 in Travis
 2019-06-07 14:24:11 +12:00
Loz Calver
29e449ebc8
Merge pull request #2443 from creative-commoners/pulls/4.4/bs4 
FIX Virtual page notice now uses Bootstrap 4 alerts
 2019-05-31 09:22:33 +01:00
Robbie Averill
325d227fe0 FIX Virtual page notice now uses Bootstrap 4 alerts 2019-05-31 14:50:46 +12:00
Robbie Averill
cd70aecf8d
Merge pull request #2421 from creative-commoners/pulls/4.4/adding-removing-overlapping-icons 
FIX Only add page font icon classes if there's no icon image defined
 2019-05-31 13:56:14 +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
Robbie Averill
2f90e139f9
Merge pull request #2441 from sminnee/fix-brittle-test 
FIX: Make test comparison less brittle in MigrateSiteTreeLinkingTaskTest
 2019-05-28 16:48:54 +12:00
Sam Minnee
469e7ca01b FIX: Make test comparison less brittle in MigrateSiteTreeLinkingTaskTest 
Comparing every single field is unnecessary and brittle, only the IDs
need to be compared.

Notably this tripped over a potential bug fix in
https://github.com/silverstripe/silverstripe-framework/pull/8591
but the change should be incorporated regardless.
 2019-05-28 12:51:23 +12:00
Robbie Averill
62c36245c2 Update minimum PHP version to 7.1 in Travis 2019-05-23 14:09:39 +12:00
Robbie Averill
60b2947519
Merge pull request #2362 from open-sausages/pulls/4/dont-assume-sitetree-table-name 
MINOR Do not assume SiteTree's table will always be call SiteTree.
 2019-05-17 14:04:14 +12:00
Maxime Rainville
46b77f3592 MINOR Do not assume SiteTree's table will always be call SiteTree. 2019-05-17 13:40:15 +12:00
Nic Horstmeier
1b3a4aea96 BUGFIX Page Type listed in Page Type dropdown when $can_be_root is false 
resolves #2430
 2019-05-16 19:53:59 -05:00
Guy Marriott
892a91ae3e
FIX Only add page font icon classes if there's no icon image defined 2019-05-08 16:13:33 +12:00
Aaron Carlino
d33e36c032 Merge branch '4.4' into 4 2019-05-06 16:05:25 +12:00
Aaron Carlino
00c9262eb7 Update translations 2019-05-06 14:57:48 +12:00
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