16262 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robbie Averill	d47a4ef63f	DOCS Swap legacy code block syntax for GFM ... This page (currently) for example breaks the code block whenever you mix spaces and tabs for indentation (which is currently part of the 3.x style guideline) - it makes updating existing code examples in the docs quite difficult: https://docs.silverstripe.org/en/3/developer_guides/templates/requirements/ GFM isn't as picky - this PR replaces with it.	2017-02-27 16:54:43 +13:00
Daniel Hensby	0ddf3b4186	Merge branch '3.5' into 3	2017-02-20 21:33:31 +00:00
Daniel Hensby	5a6f784e42	Merge branch '3.4' into 3.5	2017-02-20 21:31:09 +00:00
Daniel Hensby	34f408aaba	Merge tag '3.5.3' into 3.5 ... Release 3.5.3	2017-02-20 21:31:05 +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	a2580456bd	Added 3.5.3 changelog	2017-02-20 17:01:16 +00:00
Dan Hensby	4d48548d89	Update translations	2017-02-20 17:01:16 +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
Daniel Hensby	24e4d91b88	Merge pull request #6620 from gregsmirnov/pulls/3/greek-transliteration ... Added Greek transliteration	2017-02-14 18:23:00 +00:00
Gregory Smirnov	837ca480e4	Added Greek transliteration	2017-02-14 17:50:24 +01:00
Daniel Hensby	982ffeaf13	Merge pull request #6616 from flamytwista/patch-1 ... Cyrillic Transliteration	2017-02-14 13:32:55 +00:00
Taras Yemtsov	da7465d96a	Cyrillic Transliteration	2017-02-13 14:19:12 +00:00
Daniel Hensby	f3691eb2b3	Merge branch '3.4.5' into 3.5.3	2017-02-08 22:24:18 +00: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
Daniel Hensby	4d3cd9d9a2	Merge branch '3.5' into 3	2017-02-08 10:40:40 +00:00
Daniel Hensby	6808e88d9c	Merge branch '3.4' into 3.5	2017-02-08 10:40:05 +00:00
Damian Mooyman	c25c443d95	BUG Fix minor mysql 5.7 warning in SQLQueryTest (#6608) ... Fixes #5451	2017-02-08 15:44:55 +13:00
Damian Mooyman	bd3f21d32b	Add changelog note	2017-02-08 13:33:57 +13:00
Damian Mooyman	043e9d538c	Merge 3.5 into 3	2017-02-08 11:56:47 +13:00
Damian Mooyman	7633040646	Merge 3.4 into 3.5	2017-02-08 11:55:17 +13:00
Damian Mooyman	86a590fc9d	Merge 3.4.5 into 3.4	2017-02-08 11:52:45 +13:00
Damian Mooyman	acf3c0aeaa	Added 3.5.3-rc1 changelog	2017-02-08 11:20:44 +13:00
Damian Mooyman	9c040e10c4	Update translations	2017-02-08 11:05:29 +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	971fd5fcbb	Merge branch '3.5' into 3	2017-02-08 10:15:09 +13:00
Damian Mooyman	89a927d152	Merge 3.4 into 3.5	2017-02-08 10:01:14 +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	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