1731 Commits

Author	SHA1	Message	Date
Daniel Hensby	5f17c7fb58	Merge branch '3.5' into 3.6	2017-07-03 16:44:06 +01:00
Daniel Hensby	79a7b1016e	FIX add missing $rootCall param from LeftAndMain	2017-06-29 11:24:09 +01:00
Daniel Hensby	1e5592a3d9	Merge branch '3.5' into 3.6	2017-06-27 13:14:39 +01:00
Ingo Schommer	a51eb46735	Revert "Update translations" ... This reverts commit f9e890176d. It pulled updates from transifex *after* we switched translations to 4.x only mode - which resulted in a lot of translation keys being moved around. For example, asset-related translations went from framework to the asset-admin module. The removal of these translations in 3.x caused translations to go partially missing, since these new modules are 4.x only. See https://github.com/silverstripe/silverstripe-framework/issues/7002	2017-06-15 14:48:35 +12:00
Robbie Averill	fd57bd9100	FIX Update help link from 3.5 to 3.6	2017-06-14 15:29:28 +12:00
Brian Cairns	53c84d93da	Fix changetracker checkbox bugs ... 1) Use quoted name attribute selector, to work with CheckboxsetField bracketed[] field names 2) Initialize unchecked boxes original values to 0 instead of undefined, as this is the value onchange() expects for unchecked boxes (see line 67)	2017-06-12 16:16:55 -06:00
Daniel Hensby	becb769167	Merge branch '3.5' into 3.6	2017-05-31 00:11:48 +01:00
Robbie Averill	b4368196d1	FIX Use plural name for ModelAdmin tab name	2017-05-29 14:02:58 +12:00
root	f9e890176d	Update translations	2017-04-21 11:49:39 +01:00
Loz Calver	a7920b1f98	Fix regression from #6668 - ModelAdmin form widths	2017-04-05 15:13:09 +01:00
Daniel Hensby	e8eb2f0fb0	Merge pull request #6668' from timkung/pulls/modeladmin-content-template-fix	2017-03-03 10:18:31 +00:00
Tim Kung	33054100ca	updating title attribute on managed model tab list links to the actual title of each model	2017-03-01 16:32:30 +13:00
Daniel Hensby	f3691eb2b3	Merge branch '3.4.5' into 3.5.3	2017-02-08 22:24:18 +00:00
Daniel Hensby	1f3d46b832	FIX #6606 the JS SiteTree lib depends on whitespace	2017-02-08 21:56:52 +00:00
Damian Mooyman	9c040e10c4	Update translations	2017-02-08 11:05:29 +13:00
Damian Mooyman	60aa4bcfb9	Update translations	2017-02-08 10:29:07 +13:00
Damian Mooyman	89a927d152	Merge 3.4 into 3.5	2017-02-08 10:01:14 +13:00
Daniel Hensby	0fe4ec4537	Partial revert of c6c6c13fc2	2017-02-07 15:33:20 +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
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	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	393ad5b8a2	Update translations	2017-01-26 18:57:27 +00:00
Daniel Hensby	c6c6c13fc2	[SS-2017-001] FIX Unescaped title attribute in LeftAndMain_TreeNode::forTemplate	2017-01-26 12:56:31 +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
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
Daniel Hensby	de7372ad3b	Test fixes - reorder assertions and ensure string returned	2017-01-16 14:46:22 +00:00
Dan Hensby	bf3c129ec1	Update translations	2016-12-19 12:21:38 +00:00
Dan Hensby	e57d7a30bd	Update translations	2016-12-16 20:49:05 +00:00
Daniel Hensby	4bb6765392	Merge branch '3.4' into 3.5	2016-11-28 13:36:06 +00:00
Daniel Hensby	17690ff6bc	Merge branch '3.3' into 3.4	2016-11-28 13:30:29 +00:00
Daniel Hensby	6552dce70e	Merge branch '3.2' into 3.3	2016-11-28 13:26:31 +00:00
Dan Hensby	ee11b12e7a	Update translations	2016-11-22 14:53:02 +00:00
Dan Hensby	50f456eed8	Update translations	2016-11-21 13:27:57 +00:00
Dan Hensby	0d2710c31b	Update translations	2016-11-21 12:37:07 +00:00
Dan Hensby	5890f6f7e2	Update translations	2016-11-18 15:14:40 +00:00
Daniel Hensby	f311ef4ca5	Merge pull request #6309 from Zauberfisch/modeladmin-showImportForm-2 ... Added $showSearchForm to ModelAdmin	2016-11-10 14:22:49 +00:00
zauberfisch	6697327a98	Added $showSearchForm to ModelAdmin	2016-11-10 13:50:44 +00:00
Dan Hensby	662bc688e5	Update translations	2016-11-09 11:32:20 +00:00
Daniel Hensby	955e02ab90	Merge branch '3.4' into 3	2016-11-08 17:03:10 +00:00
Martijn	1ec56a1202	Prevent undefined index notices	2016-11-07 15:09:35 +00:00
Daniel Hensby	27206c9240	Revert "Added $showSearchForm to ModelAdmin"	2016-11-07 13:42:47 +00:00
zauberfisch	c4aed0c081	Added $showSearchForm to ModelAdmin	2016-10-26 11:35:52 +00:00
Daniel Hensby	5e9d16646d	Merge branch '3.4' into 3	2016-10-03 10:24:32 +01:00
Daniel Hensby	f2d3026e93	Merge pull request #3628 from JeremyRoundill/3.1	2016-09-30 17:16:47 +01:00
Daniel Hensby	cb2352548d	Merge branch '3.4' into 3	2016-09-16 14:22:31 +01:00
Daniel Hensby	71cc5d83e6	Revert "Merge remote-tracking branch '3Dgoo/patch-1' into 3.4" ... This reverts commit e617042422, reversing changes made to 995d07756d.	2016-09-16 14:21:16 +01:00
Daniel Hensby	beeed8155a	Merge branch '3.4' into 3	2016-09-16 11:56:01 +01:00