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
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
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
Damian Mooyman
8c9a7042be
Merge 3.2.5 into 3.2
2016-08-05 14:33:04 +12:00
Damian Mooyman
c449ad3f18
Update translations
2016-08-05 13:03:00 +12:00
Damian Mooyman
795ece3352
Merge 3.1 into 3.2
...
# Conflicts:
# javascript/lang/fa_IR.js
# javascript/lang/ru.js
# javascript/lang/src/fa_IR.js
# javascript/lang/src/ru.js
# lang/fa_IR.yml
2016-08-05 11:37:29 +12:00
Damian Mooyman
f0e380689e
Merge 3.1.20 into 3.1
2016-08-05 11:31:44 +12:00
Damian Mooyman
6477e24219
Update translations
2016-08-05 11:06:51 +12:00
Daniel Hensby
95bb134e64
Merge pull request #1566 from jonom/fix-direct-edit
...
FIX Direct edit file by URL
2016-08-01 00:58:29 +01: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
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
Daniel Hensby
1cc39a9c0b
Merge pull request #1542 from tractorcow/pulls/3.3/fix-live-link
...
BUG Fix getAbsoluteLiveLink() concatenation
2016-07-12 13:52:57 +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
