Commit Graph

6239 Commits

Author SHA1 Message Date
Robbie Averill
f092583225
Merge pull request #2506 from silverstripe/dependabot/npm_and_yarn/npm-6.13.4
Bump npm from 6.12.1 to 6.13.4
2019-12-13 11:49:08 -08:00
dependabot[bot]
e0530e7d20
Bump npm from 6.12.1 to 6.13.4
Bumps [npm](https://github.com/npm/cli) from 6.12.1 to 6.13.4.
- [Release notes](https://github.com/npm/cli/releases)
- [Changelog](https://github.com/npm/cli/blob/latest/CHANGELOG.md)
- [Commits](https://github.com/npm/cli/compare/v6.12.1...v6.13.4)

Signed-off-by: dependabot[bot] <support@github.com>
2019-12-13 18:40:52 +00:00
Andre Kiste
6176cd2bb7
Merge pull request #2505 from creative-commoners/pulls/4/rfc-9344
RFC-9344 Remove branch aliases
2019-12-10 13:52:17 +13:00
Serge Latyntcev
56c1799f88 RFC-9344 Remove branch aliases 2019-12-09 13:52:10 +13:00
Serge Latyntsev
c127b30bcf
Merge pull request #2504 from amolswnz/hotfix/2502
FIX: If no parent in RelativeLink() return null
2019-12-05 10:18:59 +13:00
Amol Wankhede
de96188c8a FIX: If no parent in RelativeLink() return null 2019-12-04 17:08:49 +13:00
Guy Marriott
3a028ac1ec
Negotiator amends: Make it possible to disable Preview links in… (#2492)
Negotiator amends: Make it possible to disable Preview links in the CMS
2019-11-28 09:18:32 -08:00
Serge Latyntcev
71c4b9d5f8 Update branch alias and travis 2019-11-21 14:14:08 +13:00
Maxime Rainville
d29d0333c5
Merge pull request #2500 from rawbitt/patch-1
Fixed 5 links in Contributing doc
2019-11-19 10:12:12 +13:00
Rob Mac Neil
5e6113414f
Fixed 404s in Contributing doc 2019-11-18 15:30:41 -04:00
Serge Latyntcev
251ebb658c Update translations 2019-11-14 01:35:58 +00:00
Serge Latyntcev
5b7d07afd2 Remove obsolete branch-alias 2019-11-14 01:24:44 +00:00
Adrian Humphreys
7045082a06 BUG Cache page icons (#2493) 2019-11-13 10:21:52 +13:00
Andre Kiste
84bea03cc2
Merge pull request #2495 from open-sausages/pulls/1/upgrde-dependencies
Upgrade dependencies
2019-11-08 11:09:11 +13:00
Maxime Rainville
5b15e3b70a Upgrade dependencies 2019-11-05 16:50:41 +13:00
Lee Bradley
c8ccd6a8c4 Amends made requested during Pull Request
Requested by @andrewandante & @ScopeyNZ
2019-10-30 09:02:18 +00:00
Lee Bradley
31f99445bd Negotiator amends: Make it possible to disable Preview links in the CMS
Existing functionality is limited to `RedirectorPage`

Another option would be to use the HiddenClass methodology
2019-10-29 17:43:17 +00:00
Serge Latyntcev
c1159c849f Merge branch '4.4' into 4 2019-10-18 13:20:01 +13:00
Aaron Carlino
3a44c3f9cc Update translations 2019-09-24 17:09:27 +12:00
Serge Latyntcev
06c481bb8d Merge branch '4.3' into 4.4 2019-09-24 14:55:57 +12:00
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
ac123ee700 Merge branch '4.4' into 4 2019-09-23 16:34:24 +12:00
Serge Latyntcev
4fdcb8180a Merge branch '4.3' into 4.4 2019-09-23 16:22:29 +12:00
Serge Latyntcev
80bcc70d38 Merge branch '4.2' into 4.3 2019-09-23 16:21:50 +12:00
Robbie Averill
6d7cc4f5c0
Merge pull request #2431 from muskie9/pull/pageTypeDropdown#2430
BUGFIX Page Type listed in Page Type dropdown when $can_be_root is false
2019-09-16 18:04:23 -07:00
Robbie Averill
ac786d5328
Merge pull request #2478 from elabuwa/fix/use-static-for-extensibility-in-oldPageRedirector
Change self:: to static:: for better extensibility
2019-09-10 17:23:12 -07:00
Dileep Ratnayake
075c98ed8e
Change self:: to static:: for better extensibility 2019-09-11 11:09:14 +12:00
Guy Marriott
bdf2cccb80
Keep a more shared understanding of Archived (#2476)
Keep a more shared understanding of Archived
2019-09-10 11:33:32 +12:00
Adrian Humphreys
0872a23aa8
Keep a more shared understanding of Archived 2019-09-09 07:50:10 +12:00
Andre Kiste
cd55772cf1
Merge pull request #2470 from open-sausages/pulls/4/homepage-warning
Add warnings when trying to remove the homepage
2019-09-05 15:12:36 +12:00
Robbie Averill
d2b35632ec
Merge pull request #2475 from christopherdarling/patch-1
DOCS PHP5 no longer supported - change to PHP
2019-09-04 08:50:13 -07:00
Christopher Darling
daec28589c
DOCS PHP5 no longer supported - change to PHP 2019-09-04 14:26:23 +01:00
bergice
644376272c Add warnings when trying to remove the homepage
Warnings are triggered when:
* Changing the URL Segment
* Unpublishing
* Unpublishing & Archiving
* Moving the homepage to another parent in the tree view

Also add `SiteTree->isHomePage()`
2019-08-29 17:38:56 +12:00
Robbie Averill
abf026c500
Merge pull request #2471 from creative-commoners/pulls/4.4/no-caching-on-previews-or-drafts
FIX Disable caching on page previews (CMSPreviews or stage=Stage)
2019-08-22 14:09:11 +12:00
Garion Herman
8e3072922f FIX Disable caching on page previews (CMSPreviews or stage=Stage) 2019-08-22 13:52:54 +12:00
Robbie Averill
3990fb163c
Merge pull request #2464 from open-sausages/pulls/4/better-link-order
FIX Set better order for insert link menu
2019-08-21 10:24:45 +12:00
Maxime Rainville
4960cc3542 FIX Set better order for insert link menu 2019-08-21 09:29:20 +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
Guy Marriott
658f54005b
Merge branch '4.4' into 4 2019-08-19 16:02:22 +12:00
Guy Marriott
d7e64199a7
Update translations 2019-08-19 15:10:42 +12:00
Dylan Wagstaff
8606f9455d
Merge pull request #2468 from creative-commoners/pulls/4/ie-editor-layout-issues
FIX IE 11 rendering issues in Page Editor UI
2019-08-16 12:01:01 +12:00
Robbie Averill
517a719b71
Merge pull request #2469 from creative-commoners/pulls/4.4/weigh-anchor
FIX pull up anchors that have been added for linking to
2019-08-16 10:01:47 +12:00
Garion Herman
65f4ec5e37 FIX IE 11 rendering issues in Page Editor UI
Internet Explorer needs a little extra help with its math to avoid the
entire UI collapsing in on itself.
2019-08-16 09:44:25 +12:00
Dylan
8ba444332a FIX pull up anchors that have been added for linking to
When editing a page an author may insert anchors into their content (via
TinyMCE), and wish to link to those anchors from another point in that
page. E.g. creating a table of contents, a "jump to top" link at the
base of the content, etc.

Previously this required the page to first be saved as a draft, then
reloaded before the anchors would show in the list to link to. Now they
are dynamically pulled from the content entered for a more fluid editing
experience.
2019-08-15 19:26:37 +12:00
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