279 Commits

Author	SHA1	Message	Date
Daniel Hensby	228c406e64	Merge remote-tracking branch '3.2.4' into 3.3.2	2016-05-05 12:33:08 +01:00
Daniel Hensby	ce3575e362	Update translations	2016-05-05 12:25:44 +01:00
Daniel Hensby	5cbfad4aea	Merge remote-tracking branch 'origin/3.1.19' into 3.2.4	2016-05-05 12:25:13 +01:00
Daniel Hensby	2d10c94049	Update translations	2016-05-05 10:24:15 +01:00
Damian Mooyman	ffdfac6af4	Merge branch '3.2' into 3.3 ... # Conflicts: # lang/en.yml # lang/sk.yml	2016-02-29 16:47:11 +13:00
Damian Mooyman	2406881d3e	Merge remote-tracking branch 'origin/3.3.1' into 3.3 ... # Conflicts: # lang/cs.yml	2016-02-29 16:44:01 +13:00
Damian Mooyman	1eed3608ad	Merge branch '3.1' into 3.2 ... # Conflicts: # code/controllers/CMSMain.php	2016-02-29 16:41:01 +13:00
Damian Mooyman	77d506547c	Update translations	2016-02-29 15:01:55 +13:00
Damian Mooyman	80959dc441	Update translations	2016-02-29 15:01:10 +13:00
Damian Mooyman	e6f9e71a0f	Update translations	2016-02-29 14:57:30 +13:00
Damian Mooyman	05a9c760f8	Update translations	2016-02-27 20:38:29 +13:00
Damian Mooyman	a89debb962	Update translations	2016-02-27 20:38:19 +13:00
Damian Mooyman	be980a50fc	Update translations	2016-02-27 20:35:10 +13:00
Damian Mooyman	208497ea42	Merge remote-tracking branch 'origin/3.2' into 3.3 ... # Conflicts: # lang/en.yml # lang/lt.yml	2016-02-24 17:32:58 +13:00
Damian Mooyman	a5444c3eeb	Update translations	2016-02-24 16:06:03 +13:00
Damian Mooyman	4c3761f42c	Update translations	2016-02-24 15:20:40 +13:00
Damian Mooyman	4849aa828e	Update translations	2016-02-24 15:14:58 +13:00
Damian Mooyman	33bf5f9519	Update translations	2016-02-19 10:54:36 +13:00
Damian Mooyman	42cedb70b9	Update translations	2016-02-19 10:21:02 +13:00
Damian Mooyman	c43b84573b	Update translations	2016-02-09 17:45:20 +13:00
Damian Mooyman	0cc49cb27a	Update translations	2016-01-25 15:06:55 +13:00
Damian Mooyman	d387d4f311	Update translations	2015-12-23 13:22:38 +13:00
Damian Mooyman	15685d85ab	Merge remote-tracking branch 'origin/3.2' into 3	2015-12-22 14:10:52 +13:00
Damian Mooyman	a40c8e034a	Update translations	2015-11-16 16:01:51 +13:00
Damian Mooyman	5925883330	Update translations	2015-11-16 15:08:39 +13:00
Damian Mooyman	73377a7a92	Update translations	2015-11-11 17:06:44 +13:00
Damian Mooyman	ebed1d22e5	Update translations	2015-11-11 16:07:20 +13:00
Damian Mooyman	748866ec0f	Merge remote-tracking branch 'origin/3.2' into 3 ... Conflicts: code/controllers/CMSMain.php code/model/ErrorPage.php	2015-11-03 13:11:26 +13:00
Damian Mooyman	54b8389b8a	Merge remote-tracking branch 'origin/3.1' into 3.2 ... Conflicts: code/model/ErrorPage.php lang/fa_IR.yml	2015-11-03 11:11:29 +13:00
Damian Mooyman	d8915115f8	Update translations	2015-10-06 18:33:16 +13:00
Damian Mooyman	0df0f35278	Update translations	2015-09-18 14:21:19 +12:00
Damian Mooyman	6e72bd2cf8	Update translations	2015-09-15 10:51:27 +12:00
Damian Mooyman	ce212972c8	Update translations	2015-09-15 10:42:32 +12:00
Damian Mooyman	105b3c60d1	Update translations	2015-09-15 10:33:25 +12:00
Damian Mooyman	b7ad568644	Merge remote-tracking branch 'origin/3.2' into 3	2015-09-09 14:50:28 +12:00
Damian Mooyman	353e5938de	Update translations	2015-09-02 11:15:52 +12:00
Damian Mooyman	b26b6c3eca	Update translations	2015-08-26 13:56:19 +12:00
scott1702	4f05c4c4f8	Update the filtered tree styling	2015-08-25 13:02:20 +12:00
Damian Mooyman	a3f789c2b5	Update translations	2015-08-24 16:29:40 +12:00
Daniel Hensby	39ee2ec634	Merge branch '3.2' into 3 ... Conflicts: lang/en.yml	2015-08-17 14:23:16 +01:00
Damian Mooyman	a1b9e99342	Update localisation	2015-08-04 13:02:52 +12:00
David Craig	cc3385b9f8	Move filters from panel to header ... - The filters panel has been removed in favour of a search panel in the header - Multi-select updated - Renamed to Bulk actions - Styles updated - Added placeholder text / removed redundant option - Now appears in SiteTree view too	2015-06-24 09:58:48 +12:00
Damian Mooyman	12bcf382ad	Update translations	2015-06-19 18:25:53 +12:00
Damian Mooyman	b169823a00	API Deprecate delete in favour of archive ... Remove "delete from live" duplicate action in favour of existing "unpublish" which is more consistent with current terminology Add pop-up verification to destructive actions Fix bug preventing side-by-side preview of archived pages Fix bug in reporting publishing of error pages Restoring a page without an available parent will restore to root	2015-06-03 14:46:16 +12:00
Damian Mooyman	1f9fc33349	Merge remote-tracking branch 'origin/3.1' into 3 ... Conflicts: code/model/SiteTree.php code/model/SiteTreeLinkTracking.php tests/controller/CMSMainTest.php	2015-06-02 19:23:48 +12:00
Damian Mooyman	0557c0d47b	Update translations	2015-05-14 13:52:21 +12:00
Damian Mooyman	9d7a640205	Merge remote-tracking branch 'origin/3.1' into 3	2015-03-11 11:43:56 +13:00
Damian Mooyman	c238e1e15b	Update translations	2015-03-09 17:11:50 +13:00
Damian Mooyman	21e2bc7258	Merge remote-tracking branch 'origin/3.1' into 3 ... Conflicts: code/reports/Report.php	2015-02-20 10:16:37 +13:00
Damian Mooyman	c7814cffc9	Update translations	2015-02-16 11:54:06 +13:00