Commit Graph

6307 Commits

Author SHA1 Message Date
Robbie Averill
e81659344c
Merge pull request #2536 from mattclegg/1585990198
ENHANCEMENT: Remove unused $controller from lambda function
2020-04-05 19:16:44 -07:00
mattclegg
2bbc280ce6
ENHANCEMENT: Remove unused $controller from lambda function 2020-04-04 16:20:24 +05:45
Garion Herman
1185d7d3c8 Merge branch '4.5' into 4 2020-02-28 13:49:24 +13:00
Robbie Averill
e3b318a9e7
Merge pull request #2528 from creative-commoners/pulls/4.5/php-7.4-builds
Update Travis config to include PHP 7.4 build, upgrade to Xenial
2020-02-26 11:33:56 +11:00
Garion Herman
1b3bf47bbc Update Travis config to include PHP 7.4 build, upgrade to Xenial 2020-02-26 11:54:27 +13:00
Maxime Rainville
9cb96bfc52 Update translations 2020-02-17 02:29:19 +00:00
Maxime Rainville
e279a06f0b Merge remote-tracking branch 'origin/4.4' into 4.5 2020-02-17 14:45:16 +13:00
Maxime Rainville
7b50a5c0b6 Update translations 2020-02-17 00:42:58 +00:00
Steve Boyd
6f0217aa70
Merge pull request #2524 from creative-commoners/pulls/4.5/update-core-requirement
FIX Update core requirements to 4.5 series
2020-02-17 11:09:21 +13:00
Garion Herman
06a58c5cbc
Merge pull request #2523 from t3hn0/4
Fixing issue #2522
2020-02-13 10:52:38 +13:00
Klemen Dolinšek
ed41f15799 BUG Prioritise same-level pages in OldPageRedirector
Added option to pass integer ParentID=0 to OldPageRedirector::find_old_page to ensure search through nested pages from the root of SiteTree structure. Added new call of function and still offering fallback to old behaviour if first call returns false (fixed #2522)
2020-02-11 22:30:42 +01:00
Garion Herman
664e6c99c0 FIX Update core requirements to 4.5 series 2020-02-11 11:35:06 +13:00
Guy Marriott
82387cb444
NEW Add extension hook updateRedirectionLink() (#2518)
NEW Add extension hook updateRedirectionLink()
2020-01-24 09:56:45 -08:00
Guy Marriott
6dfc27f6a5
Merge pull request #2517 from creative-commoners/pulls/4.5/update-urlsegment-field-not-page
FIX Update URLSegment field on enter key, rather than saving page
2020-01-24 09:55:08 -08:00
Will Rossiter
6ee17a83e3
NEW Add extension hook updateRedirectionLink() 2020-01-24 22:13:03 +13:00
Garion Herman
9750538a5a FIX Update URLSegment field on enter key, rather than saving page 2020-01-24 12:35:21 +13:00
Steve Boyd
ee18bcf57b
Merge pull request #2515 from creative-commoners/pulls/4/fix-unrelated-alert
Fix alert showing for unrelated elements
2020-01-23 13:24:16 +13:00
bergice
82a76b9300 Fix alert showing for unrelated elements
Resolves https://github.com/silverstripe/silverstripe-userforms/issues/920
2020-01-22 13:15:16 +13:00
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