Daniel Hensby
73a83954ea
Merge branch '3.4.4' into 3.4
2017-01-31 13:32:31 +00:00
Dan Hensby
00cdc33845
Added 3.5.2 changelog
2017-01-31 12:07:13 +00:00
Dan Hensby
2e61655715
Update translations
2017-01-31 12:07:13 +00:00
Dan Hensby
02a87d4ed1
Added 3.4.4 changelog
2017-01-31 11:39:09 +00:00
Dan Hensby
56653cb5e2
Update translations
2017-01-31 11:39:08 +00:00
Damian Mooyman
609b0a612c
Merge pull request #6512 from silverstripe/pulls/3.4/ensure-string-return
...
Test fixes - reorder assertions and ensure string returned
2017-01-31 17:25:34 +13:00
Dan Hensby
578f12204d
Added 3.5.2-rc1 changelog
2017-01-26 21:47:37 +00:00
Dan Hensby
247ddd5d46
Update translations
2017-01-26 21:47:36 +00:00
Daniel Hensby
3a6d41042f
Merge branch '3.4' into 3.5
2017-01-26 21:25:14 +00:00
Dan Hensby
c5a8963d32
Added 3.4.4-rc1 changelog
2017-01-26 18:57:28 +00:00
Dan Hensby
393ad5b8a2
Update translations
2017-01-26 18:57:27 +00:00
Daniel Hensby
9574d627f9
Merge pull request #39 from silverstripe-security/patch/3.4/SS-2017-001
...
[SS-2017-001] FIX Unescaped title attribute in LeftAndMain_TreeNode::…
2017-01-26 18:10:36 +00:00
Daniel Hensby
c6c6c13fc2
[SS-2017-001] FIX Unescaped title attribute in LeftAndMain_TreeNode::forTemplate
2017-01-26 12:56:31 +00:00
Daniel Hensby
74422a1a95
Merge pull request #6563 from roed/3.5
...
Fixed iframe postmessage breaking non-string messages
2017-01-24 14:09:00 +00:00
Ruud Arentsen
c640ade911
Fixed iframe postmessage breaking non-string messages
...
See issue: https://github.com/silverstripe/silverstripe-framework/issues/6562
This is a fix for that, which was already implemented in the code for version 4.0.
2017-01-24 14:15:34 +01:00
Daniel Hensby
e7e5d42865
Merge branch '3.4' into 3.5
2017-01-23 16:22:53 +00:00
Daniel Hensby
e1ee921ce7
Merge pull request #6555 from 3Dgoo/patch-2
...
Updating help link to 3.4 from 3.3
2017-01-23 15:31:10 +00:00
Aaron Carlino
0402e9e47f
Merge pull request #6554 from 3Dgoo/patch-1
...
Updating help link to 3.5 from 3.3
2017-01-23 20:56:44 +13:00
3Dgoo
08fbb451d3
Updating help link to 3.4 from 3.3
2017-01-23 09:53:49 +10:30
3Dgoo
b05930356d
Updating help link to 3.5 from 3.3
2017-01-23 09:27:15 +10:30
Ingo Schommer
61201edf81
Merge pull request #6391 from catharsisjelly/3.4-improving-csvbulk-error-message
...
Altering error message to show the exception
2017-01-19 14:00:07 +13:00
Ingo Schommer
3987600bc9
Merge branch '3.4' into 3.4-improving-csvbulk-error-message
2017-01-18 22:15:18 +13:00
Daniel Hensby
20e486690c
Merge branch '3.4' into 3.5
2017-01-17 11:58:56 +00:00
Daniel Hensby
6ff9874203
Merge pull request #6522 from catharsisjelly/3.4-email-phpdocs
...
Adding some PHPDoc
2017-01-17 11:20:35 +00:00
Chris Lock
6057df3202
Adding lots of PHPDoc
2017-01-17 09:54:18 +00:00
Daniel Hensby
72444dde94
Merge branch '3.4' into 3.5
2017-01-16 20:59:52 +00:00
Daniel Hensby
f1edbed53f
Merge pull request #6513 from sb-relaxt-at/3.4-backport-6467-ConfigManifest-validate-existence-of-cache-files
...
BUG Ensure correct regeneration of ConfigManifest if only one of the …
2017-01-16 20:58:11 +00:00
Stephan Bauer
17d123a3be
BUG Ensure correct regeneration of ConfigManifest if only one of the cache files is missing
2017-01-16 21:24:34 +01:00
Daniel Hensby
de7372ad3b
Test fixes - reorder assertions and ensure string returned
2017-01-16 14:46:22 +00:00
Loz Calver
900e5ee32c
Merge pull request #6505 from sb-relaxt-at/6467-ConfigManifest-validate-existence-of-cache-files
...
BUG Ensure correct regeneration of ConfigManifest if only one of the …
2017-01-16 09:48:12 +00:00
Stephan Bauer
1f1fffe734
BUG Ensure correct regeneration of ConfigManifest if only one of the cache files is missing ( fixes #6467 )
2017-01-14 23:13:47 +01:00
Daniel Hensby
c8a40605ec
Merge pull request #6413 from volkerloew/1400-text-contextsummary
...
search term highlighting without altering case (fixes #1400 )
2016-12-28 13:36:08 +00:00
Volker Löw
5e581eace7
search term highlighting without altering case ( fixes #1400 )
2016-12-28 13:03:35 +00:00
Chris Lock
11bc05de96
Altering error message to show the exception
2016-12-28 11:39:12 +00:00
Damian Mooyman
b1b3a6ee13
Merge 3.4 into 3.5
2016-12-22 13:18:37 +13:00
Damian Mooyman
0bcd40545d
Merge 3.5.1 into 3.5
2016-12-22 13:17:18 +13:00
Damian Mooyman
94c3bc9fa1
Merge 3.4.3 into 3.4
2016-12-22 13:16:12 +13:00
Damian Mooyman
28d065c587
Added 3.4.3 changelog
2016-12-22 12:02:45 +13:00
Damian Mooyman
9de539fdab
Added 3.5.1 changelog
2016-12-22 10:43:34 +13:00
Damian Mooyman
f314b86ad8
BUG Temp disable shortcode SPLIT behaviour due to crash ( #6436 )
...
Fixes #5987
2016-12-22 10:08:46 +13:00
Damian Mooyman
ffdb99e78d
BUG Temp disable shortcode SPLIT behaviour due to crash ( #6436 )
...
Fixes #5987
2016-12-21 18:55:00 +13:00
Damian Mooyman
fd9b872cb5
Merge pull request #6425 from andrewandante/bugfix/duplicating-copies-created-dbfield
...
remove Created field on duplicate
2016-12-21 09:43:53 +13:00
Dan Hensby
26cd99de22
Added 3.5.1-rc2 changelog
2016-12-19 16:28:18 +00:00
Daniel Hensby
c794c29ddb
Merge branch '3.4' into 3.4.3
2016-12-19 16:17:44 +00:00
Daniel Hensby
2d8ac831ad
Merge branch '3.5' into 3.5.1
2016-12-19 16:16:26 +00:00
Daniel Hensby
8dc250455e
Merge branch '3.4' into 3.5
2016-12-19 16:15:46 +00:00
Daniel Hensby
6455430658
Merge pull request #6414 from PingMetal/patch-1
...
Fixed a pagination bug
2016-12-19 15:24:35 +00:00
PingMetal
222ee6bde2
Fixed a pagination bug
...
Depending on the current page, a page not supposed to show up in the pagination summary can be skipped without returning a null value. It makes it difficult to know it is existent, but just skipped.
2016-12-19 14:54:06 +00:00
Daniel Hensby
273a06d47d
TEST Duplicated DataObjects dont keep Created date value
2016-12-19 14:23:39 +00:00
Andrew Aitken-Fincham
eecdf56b36
remove Created field on duplicate
2016-12-19 13:50:48 +00:00
