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 |
|
Christopher Joe
|
c411c500a5
|
Fix for pages admin add to campaign modal
|
2016-08-23 12:39:01 +12: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 |
|
Christopher Joe
|
c46490ea3a
|
ErrorPage no longer generates HTML response for ajax requests
|
2016-08-22 15:36:01 +12:00 |
|
Daniel Hensby
|
ef46dee37f
|
Merge pull request #1583 from open-sausages/pulls/4.0/namespace-admin
Namespace Admin module
|
2016-08-17 15:33:55 +01:00 |
|
Damian Mooyman
|
dab2a7ac9d
|
Split code into class-per-file
Add psr-4 directive in composer.json
|
2016-08-16 13:22:58 +12:00 |
|
Damian Mooyman
|
041d12129a
|
Fix regressions from namespacing
Update template locations
Add permission codes to cms sections
Code, phpdoc, and typehint cleanup
Split batch actions into files
|
2016-08-16 11:56:34 +12:00 |
|
Damian Mooyman
|
2352127fe0
|
Apply SilverStripe\Admin namespace
|
2016-08-16 11:13:32 +12: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
|
095ae30a3e
|
Merge pull request #1580 from open-sausages/pulls/4.0/old-template
API remove obsolete template
|
2016-08-12 12:26:41 +01:00 |
|
Damian Mooyman
|
90aff08df7
|
API remove obsolete template
|
2016-08-12 11:00:49 +12:00 |
|
Hamish Friedlander
|
29fc7ade96
|
Merge pull request #1574 from open-sausages/pulls/4.0/namespace-cms
API namespace CMS
|
2016-08-11 10:43:32 +07:00 |
|
Damian Mooyman
|
4dfa4f4473
|
Resolve issues with namespacing
|
2016-08-10 16:09:23 +12:00 |
|
Damian Mooyman
|
5bf364bedb
|
Apply SilverStripe\CMS namespace
|
2016-08-10 16:09:23 +12:00 |
|
Damian Mooyman
|
cb946508cf
|
Move CMS classes and templates to namespaced locations
|
2016-08-10 16:09:23 +12:00 |
|
Hamish Friedlander
|
25a8fb87da
|
Merge pull request #1571 from open-sausages/pulls/4.0/virtualpage-controller
API Better behaviour for virtualised controller
|
2016-08-10 07:09:54 +07: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 |
|