Daniel Hensby
8e2695f140
Merge branch '3.5' into 3.6
2017-07-18 15:44:13 +01:00
Loz Calver
be0c0ef5b5
Merge pull request #1899 from dhensby/pulls/3.5/vp-render-fix
...
FIX Make sure VirtualPage renders correct templates
2017-07-18 11:10:37 +01:00
Daniel Hensby
515a7cb569
FIX Make sure VirtualPage renders correct templates
2017-07-17 20:13:13 +01:00
Daniel Hensby
b499e077b1
Merge pull request #1810 from dnadesign/fix_silverstripenavigator_versioned_subclasses
...
using static function so that subclasses of Versioned will be picked up
2017-07-17 16:16:33 +01:00
Daniel Hensby
28269e3b28
Merge branch '3.5' into 3.6
2017-07-15 16:16:24 +01:00
Daniel Hensby
f511c262fd
Merge pull request #1884 from kinglozzer/archive-validation
...
Add archive to list of validation-exempt actions
2017-07-05 12:21:32 +01:00
Loz Calver
5caef27577
Add archive to list of validation-exempt actions
2017-07-05 11:42:42 +01:00
Daniel Hensby
aff9b7fb32
Merge tag '3.6.1' into 3.6
...
Release 3.6.1
2017-06-27 12:57:51 +01:00
Daniel Hensby
05bb2fef1b
Merge pull request #1851 from open-sausages/pulls/3.6/revert-lang-update
2017-06-15 12:50:49 +01:00
Ingo Schommer
a5a8982af6
Revert "Update translations"
...
This reverts commit 475b733579https://github.com/silverstripe/silverstripe-framework/issues/7002
2017-06-15 14:50:56 +12:00
Daniel Hensby
54e438fb9e
Merge branch '3.5' into 3.6
2017-06-14 12:14:02 +01:00
Damian Mooyman
1c195230bd
Merge pull request #1845 from mfendeksilverstripe/3.5
...
Count children time / memory issues fix
2017-06-08 14:59:57 +12:00
Mojmir Fendek
b442bad767
Children of the site tree are no longer listed only for the purpose of counting them. count($this->Children()) creates an array list of children which has serious performance consequences if there are lot of children present. On the other hand $this->numChildren() runs a count query which is much faster and eat’s less memory.
2017-06-08 12:19:27 +12:00
Daniel Hensby
729b388d22
Merge branch '3.5' into 3.6
2017-05-31 00:08:33 +01:00
Daniel Hensby
79aadf7ae3
Merge tag '3.6.0' into 3.6
...
Release 3.6.0
2017-05-31 00:08:32 +01:00
Daniel Hensby
a24a3af1b1
Merge branch '3.4' into 3.5
2017-05-31 00:08:11 +01:00
Daniel Hensby
a8e343b85b
Merge tag '3.5.4' into 3.5
...
Release 3.5.4
2017-05-31 00:08:11 +01:00
Daniel Hensby
df95066e50
Merge tag '3.4.6' into 3.4
...
Release 3.4.6
2017-05-31 00:07:35 +01:00
Daniel Hensby
08093ea308
Merge pull request #1838 from dhensby/pulls/3.6.0/fix-mobius-hierachy
2017-05-30 22:52:22 +01:00
Daniel Hensby
5116476875
FIX Issue where CMS SiteTree can result in infinite recursion if parent and child relation is swapped
2017-05-30 22:23:55 +01:00
Daniel Hensby
eaee3b6a8b
Merge remote-tracking branch 'security/3.5.4' into 3.6.0
2017-05-29 01:21:22 +01:00
Daniel Hensby
11e2175ec8
Merge remote-tracking branch 'security/3.4.6' into 3.5.4
2017-05-29 01:02:55 +01:00
Daniel Hensby
02b5e6ea92
Merge pull request #5 from silverstripe-security/patch/3.4/SS-2017-003
...
[SS-2017-003] Only allow HTTP(S) links for external redirector pages
2017-05-28 21:36:33 +00:00
Daniel Hensby
911e491236
Merge pull request #4 from silverstripe-security/patch/3.4/SS-2017-004
...
[SS-2017-004] FIX Unescaped fields in CMSPageHistroyController::compare()
2017-05-28 22:18:35 +01:00
Daniel Hensby
779a20de02
Merge branch '3.6.0' into 3.6
2017-05-26 14:56:03 +01:00
Daniel Hensby
9d76c15eb5
Merge branch '3.5' into 3.6
2017-05-26 14:55:06 +01:00
Daniel Hensby
14a855ed97
Merge pull request #1804 from dnadesign/doArchiveFix
...
fixing doArchive
2017-05-25 23:13:14 +01:00
Daniel Hensby
61cf72c08d
[SS-2017-004] FIX Unescaped fields in CMSPageHistroyController::compare()
2017-05-25 17:22:04 +01:00
Daniel Hensby
41270fcf99
[SS-2017-003] Only allow HTTP(S) links for external redirector pages
2017-05-24 23:02:41 +01:00
Sam Minnee
14540729ca
FIX: Use framework 3.5 to test cms 3.5
2017-05-09 11:41:55 +12:00
Daniel Hensby
db7b1b9bd6
Merge branch '3.6.0' into 3.6
2017-05-08 16:24:04 +01:00
Daniel Hensby
aedbc83517
Merge branch '3.5' into 3.6
2017-05-08 16:23:51 +01:00
John Milmine
618c7f126d
changed to static function so that subclasses of Versioned will be picked up
2017-05-04 15:05:25 +12:00
Damian Mooyman
d1e3bcc14e
Remove .tx file to freeze localisations
2017-05-01 16:23:11 +12:00
Damian Mooyman
0ef3844dd4
Remove .tx file to freeze localisations
2017-05-01 16:22:39 +12:00
John Milmine
1ff6f3f1b0
fixing doArchive
...
for users who can delete, but not unpublish, they should be able to delete draft pages that they’ve created.
Old code used to unpublish even if the page wasn’t published, which meant users who couldn’t publish, also could delete draft pages. They could create draft pages, but not delete them.
2017-04-27 08:48:19 +12:00
Daniel Hensby
48a3152ee2
Merge pull request #1803 from open-sausages/pulls/3.6/fix-settings-history
...
BUG Fix page history / settings forms
2017-04-26 10:00:01 +01:00
Daniel Hensby
eeaec7a876
Merge pull request #1800 from dhensby/pulls/3.6.0/test-fix
...
FIX intl test
2017-04-26 09:59:18 +01:00
Damian Mooyman
000a5f7209
BUG Fix page history / settings forms
2017-04-26 18:13:48 +12:00
Sam Minnee
18171f8875
Merge branch '3.4' into 3.5
2017-04-24 15:59:38 +12:00
Uncle Cheese
cfef458a00
Remove .tx folder
2017-04-24 15:57:45 +12:00
Daniel Hensby
7e77753274
FIX intl test
2017-04-21 15:17:47 +01:00
root
475b733579
Update translations
2017-04-21 11:49:37 +01:00
Damian Mooyman
1a6518803b
ENHANCEMENT Make page urls bookmarkable
2017-04-12 13:00:21 +12:00
Tim Kung
bb3c09c359
- making form actions on edit forms safer
...
- re-adding removed methods
2017-04-12 11:42:21 +12:00
Tim Kung
41eddfcc8e
fixing cms page history controller to use new page id param
2017-04-07 15:58:35 +12:00
Tim Kung
487235f991
adding page id into cmsmain
2017-04-07 14:41:15 +12:00
Damian Mooyman
af1002194d
Merge pull request #1781 from silverstripe/pulls/3/ss3-php7
...
Fixing VirtualPage for php7 patch
2017-04-05 13:09:50 +12:00
Daniel Hensby
2ddb616829
FIX Correct case of CopyContentFrom method
2017-04-05 10:49:17 +10:00
Sam Minnee
80e8967308
FIX: Fix VirtualPage::init() content-modification check.
...
This check had never worked but PHP 5 silently ignored it and PHP 7
raised it as an error.
2017-04-05 10:49:16 +10:00
