Daniel Hensby
0fe4ec4537
Partial revert of c6c6c13fc2
2017-02-07 15:33:20 +00:00
Daniel Hensby
c753d820fe
Merge pull request #6592 from adover/patch-2
...
Update 01_Syntax.md
2017-02-02 12:59:53 +00:00
Andrew Dover
0574cce1c6
Update 01_Syntax.md
...
Fixed spelling mistake
2017-02-02 12:26:30 +13:00
Daniel Hensby
305bcac971
Merge branch '3.5' into 3
2017-02-01 01:02:09 +00:00
Daniel Hensby
9bd85ac773
Merge branch '3.4' into 3.5
2017-02-01 00:55:35 +00:00
Daniel Hensby
d54f2b35c5
Merge tag '3.5.2' into 3.5
...
Release 3.5.2
2017-02-01 00:55:31 +00:00
Daniel Hensby
8b1af9f0c0
Merge tag '3.4.4' into 3.4
...
Release 3.4.4
2017-02-01 00:54:02 +00:00
Daniel Hensby
669f6a3d41
Merge branch '3.5' into 3
2017-01-31 13:33:26 +00:00
Daniel Hensby
56b887f578
Merge branch '3.4' into 3.5
2017-01-31 13:33:00 +00:00
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
Daniel Hensby
c3cd8f4344
Merge pull request #6526 from open-sausages/pulls/3/remove-webpi
...
Remove WebPI references
2017-01-29 23:24:16 +00: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
Damian Mooyman
8ce8be99bd
Merge pull request #6570 from sunnysideup/patch-50
...
MINOR: stop Aggregate clear cache on DataObject::write()
2017-01-27 10:31:54 +13: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
Nicolaas
f027b5eaf5
MINOR: stop Aggregate clear cache on DataObject::write()
...
see: https://github.com/silverstripe/silverstripe-framework/issues/6383 for details
2017-01-27 07:51:42 +13: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
c8525c026c
Merge branch '3.5' into 3
2017-01-25 13:46:49 +00:00
Daniel Hensby
7c79374704
Merge pull request #6566 from andrewandante/feat/backport_buildtask_segment_config
...
add segment config var to buildtask
2017-01-25 11:27:02 +00:00
Andrew Aitken-Fincham
2e1eb4afad
add segment config var to buildtask
2017-01-25 09:22:20 +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
d9cffe5f53
Merge pull request #6551 from robbieaverill/feature/json-context
...
API Convert::raw2json can be passed an optional bitmask of JSON constants as options
2017-01-24 12:18:40 +00:00
Robbie Averill
3583f1f79e
API Convert::raw2json can be passed an optional bitmask of JSON constants as options
2017-01-24 13:27:16 +13:00
Daniel Hensby
de8b5d6623
Merge branch '3.5' into 3
2017-01-23 16:25:14 +00: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
Ingo Schommer
d9e8b37ac4
Remove WebPI references
...
SQL Server is still community supported, and we have IIS 7+ in our “server requirements”, which won’t change.
But the WebPI installer is rarely used in practice, and doesn’t provide the best user experience for Windows users
compared to other installation options. Given it sucks up time on every release process. this should be removed.
2017-01-18 11:37:11 +13:00
Daniel Hensby
c082f778c5
Merge branch '3.5' into 3
2017-01-17 11:59:17 +00: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
2ce80e448d
Merge branch '3.5' into 3
2017-01-16 21:00:14 +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
