Daniel Hensby
91444b8016
Merge branch '3'
2016-09-07 11:28:05 +01:00
Daniel Hensby
1cc1aa8dae
Merge pull request #1599 from open-sausages/pulls/4.0/create-correct-changedclass
...
BUG Ensure changes in class write to an instance of the new class
2016-09-05 23:55:32 +01:00
Damian Mooyman
9c48b93983
BUG Ensure changes in class write to an instance of the new class, not the old one
...
Fixes #1210
Requires https://github.com/silverstripe/silverstripe-framework/pull/5950
2016-09-05 18:46:00 +12:00
Damian Mooyman
10759a5509
Merge pull request #1597 from open-sausages/pulls/4.0/insert-link
...
Update tests for insert link modal
2016-09-05 16:14:57 +12:00
Paul Clarke
9a812101fb
Update tests
2016-09-05 11:23:12 +12:00
Damian Mooyman
feb57d6b8d
Merge pull request #1596 from pine3ree/patch-1
...
typo?
2016-09-05 10:19:22 +12:00
maks feltrin
a0886f16bf
typo?
...
$controller is already a reference
2016-09-02 16:40:14 +02:00
Daniel Hensby
9493d9a104
Merge pull request #1590 from open-sausages/pulls/4.0/remove-asset-admin
...
API Remove AssetAdmin (moved to asset-admin module)
2016-08-31 21:30:44 +01:00
Ingo Schommer
b599095a50
API Remove AssetAdmin (moved to asset-admin module)
2016-08-31 23:15:12 +12:00
Ingo Schommer
fdcc3f9b83
Merge pull request #1587 from open-sausages/pulls/4.0/add-to-campaign
...
Fixes for add to campaign in pages admin
2016-08-28 14:11:36 +12:00
Ingo Schommer
eb9f525ecf
Add CodeClimate duplicate detection for JS
...
Keep this in-line with framework and asset-admin configs
2016-08-28 14:09:59 +12:00
Ingo Schommer
40904686a4
Removed AddToCampaignHandler->setShowTitle()
...
It was used to support different display variations in admin/assets and admin/pages,
while those display variations should've been removed in the first place (and have been now).
2016-08-28 13:49:25 +12:00
Ingo Schommer
93d7197aad
Support for React-driven "add to campaign"
2016-08-25 21:30:53 +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
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
