Commit Graph

16046 Commits

Author SHA1 Message Date
Damian Mooyman
1b8e0691c3 Merge pull request #6867 from gregsmirnov/pulls/3.4/fix-class-name-reference-consistency
Fix class name reference consistency
2017-05-04 10:07:23 +12:00
Gregory Smirnov
2d138b0ef0 Fix class name reference consistency 2017-05-03 09:34:25 +02:00
Daniel Hensby
bceae57208 Merge pull request #6845 from gregsmirnov/pulls/3.4/6838-fix-image-class-substitution
#6838 fix image class substitution
2017-04-26 16:53:12 +01:00
Gregory Smirnov
1d36f354e8 FIX Create Image_Cached with Injector. 2017-04-26 10:40:10 +02:00
Ingo Schommer
22cdf4c786 Merge pull request #6814 from open-sausages/pulls/3.4/remove-tx
Remove .tx folder
2017-04-21 11:42:38 +12:00
Uncle Cheese
37d6cee83c Remove .tx folder 2017-04-20 11:50:45 +12:00
Daniel Hensby
7f194a917d
Merge pull request #6351 from steve-silverstripe/patch-2 2017-03-03 14:05:53 +00:00
Daniel Hensby
8ca70b5b20
Merge tag '3.4.5' into 3.4
Release 3.4.5
2017-02-20 21:27:53 +00:00
Dan Hensby
9cd480e47a Added 3.4.5 changelog 2017-02-20 16:41:59 +00:00
Dan Hensby
249b143edd Update translations 2017-02-20 16:41:56 +00:00
Juan van den Anker
30725916db FIX Array to string conversion message after CSV export (#6622)
* FIX Array to string conversion message after CSV export

* Removed invalid line endings
2017-02-15 22:20:00 +00:00
Daniel Hensby
7122e1fde7 FIX Comments ignored by classmanifest (#6619) 2017-02-15 10:46:04 +13:00
Damian Mooyman
6fc0d3986e Merge pull request #6610 from dhensby/pulls/3.4/6606-fix
FIX JS Tree is whitespace sensitive
2017-02-09 11:22:44 +13:00
Daniel Hensby
1f3d46b832
FIX #6606 the JS SiteTree lib depends on whitespace 2017-02-08 21:56:52 +00:00
Damian Mooyman
86a590fc9d Merge 3.4.5 into 3.4 2017-02-08 11:52:45 +13:00
Damian Mooyman
b06ac1708b Add in changelog line 2017-02-08 10:49:08 +13:00
Damian Mooyman
e01a5f4523 Added 3.4.5-rc1 changelog 2017-02-08 10:44:18 +13:00
Damian Mooyman
60aa4bcfb9 Update translations 2017-02-08 10:29:07 +13:00
Damian Mooyman
5b200d92f6 Merge pull request #6605 from dhensby/pulls/3.4/revert-treenode-fix
Partial revert of LeftAndMain_TreeNode::forTemplate()
2017-02-08 09:03:55 +13:00
Daniel Hensby
0fe4ec4537
Partial revert of c6c6c13fc2 2017-02-07 15:33:20 +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
73a83954ea
Merge branch '3.4.4' into 3.4 2017-01-31 13:32:31 +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
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
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
3Dgoo
08fbb451d3 Updating help link to 3.4 from 3.3 2017-01-23 09:53:49 +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
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
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
Chris Lock
11bc05de96
Altering error message to show the exception 2016-12-28 11:39:12 +00: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
f314b86ad8 BUG Temp disable shortcode SPLIT behaviour due to crash (#6436)
Fixes #5987
2016-12-22 10:08:46 +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
Daniel Hensby
c794c29ddb
Merge branch '3.4' into 3.4.3 2016-12-19 16:17:44 +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
Dan Hensby
98b8fefad8 Added 3.4.3-rc1 changelog 2016-12-19 12:21:39 +00:00
Dan Hensby
bf3c129ec1 Update translations 2016-12-19 12:21:38 +00:00