Daniel Hensby
0b952e277e
Merge branch '3.5' into 3
2016-12-19 11:56:55 +00:00
Daniel Hensby
f833bb53c3
Merge branch '3.4' into 3.5
2016-12-16 16:46:28 +00:00
Daniel Hensby
e90715d6c6
Merge branch '3.4' into 3.5
2016-12-07 13:43:34 +00:00
Damian Mooyman
224b2a4cba
BUG Fix localisation issues in CMS
2016-12-07 12:15:54 +13:00
Daniel Hensby
4a1cf3d4fb
Merge branch '3.5' into 3
2016-11-28 14:02:13 +00:00
Daniel Hensby
ca76b9488f
Merge branch '3.4' into 3.5
2016-11-28 14:01:01 +00:00
Daniel Hensby
21d9b7cdf1
Merge branch '3.3' into 3.4
2016-11-28 13:57:38 +00:00
Daniel Hensby
5355831de9
Merge branch '3.2' into 3.3
2016-11-28 13:56:51 +00:00
Loz Calver
b2503ac004
FIX: content authors unable to duplicate top-level pages ( fixes #1685 )
2016-11-22 15:55:28 +00: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
Daniel Hensby
ad2b2a044e
Merge branch '3.4' into 3
2016-10-16 22:43:01 +01:00
Daniel Hensby
ae83b7b5ef
FIX History controller now shows right comparison versions
2016-10-07 16:33:03 +01:00
Daniel Hensby
98d95cd707
FIX Sort order for duplicated child pages is now retained
2016-10-03 22:08:05 +01: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
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
c2f21d0008
Merge 3.4.1 into 3.4
2016-08-15 18:37:50 +12:00
Damian Mooyman
ef856185ab
BUG Fix regression in FormField casting
2016-08-15 15:55:06 +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
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
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
Jonathon Menz
c965133da0
FIX Direct edit file by URL
...
Trying to navigate directly to the edit view of a file by URL would fail if a folder other than the file’s parent was held in session data. Removed reliance on current ID in session and added folder detection for edit view.
2016-07-29 16:53:31 -07:00
Damian Mooyman
3306deb69b
BUG Fix link concatenation in SilverStripeNavigator ( #1560 )
...
Fixes #1557
Fixes https://github.com/tractorcow/silverstripe-fluent/issues/219
2016-07-25 14:34:45 +01:00
Daniel Hensby
4f99ced5df
Merge branch '3.3' into 3.4
2016-07-25 14:12:31 +01:00
Robbie Averill
82e54314bf
FIX do not show HiddenClass pages in allowed children ( #1555 )
...
* FIX do not show HiddenClass pages in allowed children
* Resolves #1553
* * Update SiteTreeTest to include HiddenClass checks
* Refactor testAllowedChildren to use a data provider
2016-07-22 09:45:14 +01:00
Daniel Hensby
a8cf17b008
Merge pull request #1551 from phptek/issue/1054
...
FIX: Fixes #1054 By preventing errors in the CMS _only_.
2016-07-21 12:18:33 +01:00
Russell Michell
10e06dce50
FIX: Fixes #1054 By preventing errors in the CMS _only_.
...
MINOR Boyscouting: Addition of missing braces, default return and missing types in @return annotation.
2016-07-21 20:07:30 +12:00
Daniel Hensby
c7b1a4ded8
Merge branch '3.3' into 3.4
2016-07-14 12:24:04 +01:00
Damian Mooyman
8123c433f0
BUG Fix getAbsoluteLiveLink() concatenation
...
Fixes #1183
2016-07-12 15:57:52 +12:00
Daniel Hensby
a2657b519a
Merge branch '3.3' into 3.4
2016-07-12 01:08:54 +01:00
Daniel Hensby
118a09afff
Merge branch '3.2' into 3.3
2016-07-12 01:07:12 +01:00
micmania1
5f2d8cae0d
Merge pull request #1522 from micmania1/fix-sitetree-rading-stage
2016-07-05 16:13:23 +01:00
Daniel Hensby
ea81389a18
Merge branch '3.3' into 3.4
2016-06-13 14:35:40 +01:00
Daniel Hensby
19047d1577
Merge branch '3.2' into 3.3
2016-06-13 14:34:12 +01:00
Daniel Hensby
eba89b9520
FIX OldPageRedirector no longer loops infinitely if 404 thrown on existing page
2016-05-31 15:46:17 +01:00
Daniel Hensby
af4b546050
Merge branch '3.3' into 3
2016-04-26 01:59:56 +01:00
Daniel Hensby
06d882b49c
Merge 3.2 into 3.3
2016-04-26 01:50:03 +01:00
Daniel Hensby
6cd1837f0c
Merge 3.1 into 3.2
...
Conflicts:
code/reports/SideReport.php
2016-04-26 00:09:19 +01:00
Patrick Nelson
000bf09354
FIX for #1447 to ensure proper type-safe checking of file_put_contents() in ErrorPage->writeStaticPage()
2016-04-06 17:34:55 -07:00
Daniel Hensby
9d62d9d381
FIX Link tracking not escaping # Fixes #1409
2016-03-21 15:22:00 +00:00
Jake Bentvelzen
68694c01b7
Added readonly version of SiteTreeURLSegmentFiled, small quality of life thing when a user is looking at readonly data and wants to easily view the frontend of that page.
2016-03-15 10:48:46 +11:00
Daniel Hensby
bc31d9ca9c
FIX Use Controller::join_links() in Reports
2016-03-10 16:39:00 +00:00
Andrew Mc Cormack
e6078be52e
Update SiteTree.php
...
Minor type fix
2016-03-07 20:37:29 +00:00
micmania1
7c5f29ce19
Removed dependency for translatable module
2016-03-03 23:11:49 +00:00
