Commit Graph

6345 Commits

Author SHA1 Message Date
Robbie Averill
94db6240a0
Merge pull request #2467 from purplespider/sentence-case
Updated “URL Segment” & “Main Content” to sentence case
2019-08-15 08:23:00 +12:00
James Cocker
1316245b37 Updated “URL Segment” & “Main Content” to sentence case 2019-08-14 17:38:36 +01:00
Aaron Carlino
b460dfd188 Merge branch '4.4' into 4 2019-08-13 12:15:56 +12:00
Aaron Carlino
dabc0a471f Update translations 2019-08-12 16:06:56 +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
a378248fe7
Merge pull request #2463 from MadeHQ/4
Changing to protected to match the rest of the changes
2019-08-05 09:15:25 +12:00
hirenpatel
9bcb395387 Changing to protected to match the rest of the changes 2019-08-02 15:08:05 +01:00
Robbie Averill
a083fc5d5b Merge branch '4.4' into 4 2019-07-19 11:50:38 +02:00
Robbie Averill
6a788ca9ed Merge branch '4.3' into 4.4 2019-07-19 11:50:29 +02:00
Robbie Averill
8ccd7f2b6f Merge branch '4.2' into 4.3 2019-07-19 11:47:25 +02:00
Guy Marriott
00d4f18ed2
FIX display recognisable names for dependent content with no ti… (#2458)
FIX display recognisable names for dependent content with no title
2019-07-17 16:38:21 +12:00
Dylan Wagstaff
68f6eaa663 FIX display recognisable names for dependent content with no title
Content blocks and other DataObjects that contain HTMLText fields are
also used in the 'Dependent pages' report for each page in the CMS,
however these objects may have neither a Title field, nor a name to
describe them. Instead of showing an empty field in the Title column for
this table, we can instead show "Untitled " with the localised singular
name appended.
2019-07-17 15:30:07 +12:00
Aaron Carlino
b6c5cb0470 Merge branch '4.3' into 4.4 2019-07-12 16:10:45 +12:00
Robbie Averill
ee35e2a176
Merge pull request #2444 from creative-commoners/pulls/4.4/keep-it-selected-silverstripe
FIX Keep New Page type selection if still allowed when changing parent
2019-06-28 11:32:55 +12: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
Garion Herman
5759950ade FIX Keep New Page type selection if still allowed when changing parent 2019-06-14 11:18:38 +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
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