4796 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Damian Mooyman	682e6070e5	BUG Correct response code generated from error pages	2016-11-21 17:58:53 +13:00
Nathan	a5b33ab916	Correcting an issue where page controller methods ... would end up with the error page response code, causing them to not work. This code only looks to be causing issues from what I can see. An example is an autocomplete that is populated using a method on page controller. The moment you end up on a 404 error page, the autocomplete will attempt to populate and end up with a 404 response.	2016-11-21 15:43:37 +11:00
Damian Mooyman	02b9de93c3	Increment 3 alias to 3.6	2016-11-14 10:05:34 +13:00
Daniel Hensby	ad2b2a044e	Merge branch '3.4' into 3	2016-10-16 22:43:01 +01:00
Daniel Hensby	147181e96f	Merge branch '3.3' into 3.4	2016-10-16 22:42:40 +01:00
Daniel Hensby	bc71f2de01	Merge branch '3.2' into 3.3	2016-10-16 22:42:26 +01:00
Daniel Hensby	12c0f3c1c7	Merge branch '3.1' into 3.2	2016-10-16 22:40:56 +01:00
Damian Mooyman	17a471a47a	Merge pull request #1640 from dhensby/pulls/3.4/fix-history-versions ... FIX History controller now shows right comparison versions	2016-10-12 09:11:45 +13:00
Daniel Hensby	ae83b7b5ef	FIX History controller now shows right comparison versions	2016-10-07 16:33:03 +01:00
Damian Mooyman	f9697f75cd	Merge pull request #1636 from dhensby/pulls/3.4/fix-sort-duplicate-children ... FIX Sort order for duplicated child pages is now retained	2016-10-04 10:34:56 +13:00
Daniel Hensby	98d95cd707	FIX Sort order for duplicated child pages is now retained	2016-10-03 22:08:05 +01:00
Damian Mooyman	7751a6cee7	Behat test cases for site tree duplication (#995)	2016-09-16 11:44:07 +12:00
Daniel Hensby	6d9b4415f1	Merge branch '3.4' into 3	2016-08-23 10:58:50 +01:00
Daniel Hensby	c754882e0a	Merge branch '3.3' into 3.4	2016-08-23 10:58:24 +01:00
Daniel Hensby	ba5e51c422	Merge branch '3.2' into 3.3	2016-08-23 10:55:13 +01:00
Daniel Hensby	3820a26abd	Simplifying ModelAsControllerTest setUp	2016-08-22 19:41:11 +01:00
Daniel Hensby	59be597004	FIX #1052	2016-08-22 19:41:10 +01:00
Daniel Hensby	4aca9ac145	Merge pull request #1052 from @dmeeking	2016-08-22 17:46:43 +01:00
Dan Meeking	26f5fc2853	Issue #1051: fix so that OldPageRedirector::find_old_page uses ORM call	2016-08-22 17:44:43 +01:00
Damian Mooyman	e414fdb325	Merge 3.4 into 3	2016-08-15 19:05:12 +12:00
Damian Mooyman	56512647ab	Merge 3.3 into 3.4 ... # Conflicts: # lang/cs.yml # lang/sk.yml	2016-08-15 19:02:14 +12:00
Damian Mooyman	fa0c56e582	Merge 3.2 into 3.3	2016-08-15 18:50:59 +12:00
Damian Mooyman	629a849c79	Merge 3.2 into 3.3 ... # Conflicts: # lang/cs.yml # lang/sk.yml	2016-08-15 18:48:40 +12:00
Damian Mooyman	a6562dd574	Merge 3.1 into 3.2 ... # Conflicts: # code/controllers/ReportAdmin.php	2016-08-15 18:46:50 +12:00
Damian Mooyman	c2f21d0008	Merge 3.4.1 into 3.4	2016-08-15 18:37:50 +12:00
Damian Mooyman	0ffe5fa560	Merge 3.3.3 into 3.3	2016-08-15 18:36:11 +12:00
Damian Mooyman	49ccb10c9b	Merge 3.2.5 into 3.2	2016-08-15 18:34:55 +12:00
Damian Mooyman	c58d358e50	Merge 3.1.20 into 3.1	2016-08-15 18:33:40 +12:00
Damian Mooyman	bffab11a54	Update translations	2016-08-15 18:27:31 +12:00
Damian Mooyman	2f78f43273	Update translations	2016-08-15 17:44:52 +12:00
Damian Mooyman	1b50d59aba	Update translations	2016-08-15 17:02:07 +12:00
Damian Mooyman	312cfca3ca	Update translations	2016-08-15 16:31:55 +12:00
Damian Mooyman	ef856185ab	BUG Fix regression in FormField casting	2016-08-15 15:55:06 +12:00
Damian Mooyman	9f86315330	Update translations	2016-08-15 15:49:50 +12:00
Damian Mooyman	a6a9cd729f	BUG Fix regression in FormField casting	2016-08-15 15:34:29 +12:00
Damian Mooyman	5ad8157655	BUG Fix regression in FormField casting	2016-08-15 15:32:22 +12:00
Damian Mooyman	95c640ae6b	BUG Fix regression in FormField casting	2016-08-15 15:26:39 +12:00
Damian Mooyman	f8c2945c22	Update translations	2016-08-15 15:00:58 +12:00
Damian Mooyman	a5017e598c	Update translations	2016-08-15 14:01:09 +12:00
Daniel Hensby	5f73d3454e	[SS-2016-012] FIX Missing ACL check on ReportAdmin ... This issue exposed reports to users able to guess the URL of a Report that they were not allowed to view the report	2016-08-15 13:26:14 +12:00
Damian Mooyman	4d17dcc799	Update translations	2016-08-15 13:12:49 +12:00
Daniel Hensby	a6fae9b35b	Merge pull request #1579 from tractorcow/pulls/3.4/fix-settings-border ... BUG Fix extra border in page settings	2016-08-09 16:56:18 +01:00
Damian Mooyman	63fc4dbcae	BUG Fix extra border in page settings ... Fixes #1547	2016-08-09 17:19:45 +12:00
Damian Mooyman	7c13f7f75f	Merge 3.4 into 3 ... # Conflicts: # code/controllers/CMSPageHistoryController.php	2016-08-05 19:14:57 +12:00
Damian Mooyman	518eea2eac	Merge 3.4.1 into 3.4	2016-08-05 19:11:42 +12:00
Damian Mooyman	5f07e193fa	Update translations	2016-08-05 17:57:46 +12:00
Damian Mooyman	afc9bb0dc6	Merge 3.3 into 3.4 ... # Conflicts: # code/controllers/CMSPageHistoryController.php # code/controllers/SilverStripeNavigator.php # lang/bg.yml # lang/cs.yml # lang/it.yml # lang/sk.yml	2016-08-05 16:46:35 +12:00
Damian Mooyman	2831fc6077	Merge 3.3.3 into 3.3	2016-08-05 16:41:07 +12:00
Damian Mooyman	8284fdc4ca	Update translations	2016-08-05 16:13:13 +12:00
Damian Mooyman	99b3346316	Merge 3.2 into 3.3	2016-08-05 14:36:30 +12:00