1842 Commits

Author	SHA1	Message	Date
Daniel Hensby	399c46579a	Merge branch '3.6' into 3	2017-06-27 13:15:14 +01:00
Daniel Hensby	ddff7c5dad	Added 3.6.1 changelog	2017-06-27 12:48:16 +01:00
Daniel Hensby	f62cba2cd8	Added 3.6.1-alpha2 changelog	2017-06-27 12:22:26 +01:00
Daniel Hensby	61fc53a556	Added 3.6.1-alpha1 changelog	2017-06-27 12:21:10 +01:00
Daniel Hensby	215ff8ab55	Added 3.6.1-alpha1 changelog	2017-06-14 14:33:35 +01:00
Daniel Hensby	6f2b08b962	Merge branch '3.6' into 3	2017-06-14 12:02:27 +01:00
3Dgoo	f0c00bfb78	Fixing language typo in docs	2017-06-13 05:37:07 +09:30
Damian Mooyman	9b965ed5fa	Add in missing changelog notes	2017-06-06 11:08:05 +12:00
Justin Brown	ac08e16720	Update to 00_CSV_Import.md ... Adding further explanation for using a custom CsvBulkLoader in ModelAdmin instead of the default one. I think some people might be able to guess at this, but others (like me) might benefit from making things a bit more explicit. This a follow up from my [question on StackOverflow](https://stackoverflow.com/questions/44271755/adding-custom-csvbulkuploader-to-modeladmin-in-silverstripe).	2017-05-31 09:05:05 -06:00
Daniel Hensby	21d2e5cad1	Merge branch '3.6' into 3	2017-05-31 00:12:14 +01:00
Daniel Hensby	becb769167	Merge branch '3.5' into 3.6	2017-05-31 00:11:48 +01:00
Daniel Hensby	294df1320f	Merge branch '3.4' into 3.5	2017-05-31 00:11:18 +01:00
Daniel Hensby	143c4a63cf	Added 3.6.0 changelog	2017-05-30 22:11:03 +00:00
Daniel Hensby	2f7f761a9c	Added 3.5.4 changelog	2017-05-30 22:03:17 +00:00
Daniel Hensby	deca99a5fe	Added 3.4.6 changelog	2017-05-30 21:58:52 +00:00
Daniel Hensby	659053a256	Added 3.6.0-rc1 changelog	2017-05-29 00:36:04 +00:00
Daniel Hensby	cda7e8dc39	Merge remote-tracking branch 'security/3.5.4' into 3.6.0	2017-05-29 01:29:05 +01:00
Daniel Hensby	9a38bedd18	Added 3.5.4-rc1 changelog	2017-05-29 00:08:27 +00:00
Daniel Hensby	24166700e8	Merge remote-tracking branch 'security/3.4.6' into 3.5.4	2017-05-29 01:02:35 +01:00
Daniel Hensby	b5ad4bdcc6	Added 3.4.6-rc2 changelog	2017-05-28 23:49:04 +00:00
Daniel Hensby	eeb549faf3	Added 3.4.6-rc1 changelog	2017-05-28 21:34:38 +00:00
Daniel Hensby	283e3279be	Merge branch '3.6' into 3	2017-05-18 13:55:07 +01:00
Daniel Hensby	9bdce9790d	Added 3.6.0-beta2 changelog	2017-05-10 21:55:25 +01:00
Loz Calver	7ae203908f	Merge pull request #6882 from robbieaverill/patch-6 ... DOCS Fix broken markdown rendering in 03_Template_debugging.md	2017-05-09 09:38:28 +01:00
Jake Bentvelzen	ecefcc8f0e	DOC Add documentation for how to use alternate ConfigStaticManifest	2017-05-08 17:52:13 +12:00
Robbie Averill	f2b21fb828	DOCS Fix broken markdown rendering in 03_Template_debugging.md	2017-05-08 17:40:02 +12:00
root	96d323fba1	Added 3.6.0-beta1 changelog	2017-04-21 11:49:44 +01:00
Sam Minnee	061b71328b	Update docs.	2017-04-05 11:06:10 +10:00
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
Dan Hensby	a2580456bd	Added 3.5.3 changelog	2017-02-20 17:01:16 +00:00
Dan Hensby	9cd480e47a	Added 3.4.5 changelog	2017-02-20 16:41:59 +00: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	acf3c0aeaa	Added 3.5.3-rc1 changelog	2017-02-08 11:20:44 +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
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	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
Dan Hensby	00cdc33845	Added 3.5.2 changelog	2017-01-31 12:07:13 +00:00
Dan Hensby	02a87d4ed1	Added 3.4.4 changelog	2017-01-31 11:39:09 +00: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	c5a8963d32	Added 3.4.4-rc1 changelog	2017-01-26 18:57:28 +00:00