Commit Graph

5049 Commits

Author SHA1 Message Date
Ingo Schommer
cd3ae42c1d Fixed jquery.js path 2016-09-15 15:15:24 +12:00
Sam Minnee
beef8fa072 FIX Switch gulp JavaScript generation to Webpack
See https://github.com/silverstripe/silverstripe-framework/pull/5918
2016-09-14 21:12:39 +12:00
Ingo Schommer
7f3f5b63e8 Merge pull request #1603 from open-sausages/pulls/4.0/tabify
Add Bootstrap4 classes to tabs
2016-09-14 14:04:21 +12:00
Daniel Hensby
09dde6147a Merge pull request #1610 from open-sausages/pulls/4.0/eslint-init-declarations
Enforce JS var declaration with value
2016-09-13 15:00:53 +01:00
Daniel Hensby
03efecf894 Merge pull request #1611 from open-sausages/pulls/4.0/preview-panel
API Move preview template to cms section
2016-09-13 14:55:14 +01:00
Damian Mooyman
327a8a320e API Move preview template to cms section 2016-09-13 13:24:26 +12:00
Ingo Schommer
ff4336010c Enforce JS var declaration with value
This caught us out recently where code did a strict type check for `myVar === undefined`.
The var was defined as `let myVar;`, without a value - so the check returned false (it's `null`).
To avoid this situation, we've decided to enforce declarations with values.
Note that preference should be given to single, immutable assignments via const where possible.

See http://eslint.org/docs/rules/init-declarations
2016-09-13 10:08:32 +12:00
Christopher Joe
a7ca510bf5 Add Bootstrap4 classes to tabs 2016-09-12 18:45:08 +12:00
Damian Mooyman
4b5dd99245 Merge pull request #1608 from kinglozzer/urlsegment-template
FIX: SiteTreeURLSegmentField.ss in wrong location (fixes #1607)
2016-09-09 21:24:41 +12:00
Loz Calver
dbf7824367 FIX: SiteTreeURLSegmentField.ss in wrong location (fixes #1607) 2016-09-09 09:57:33 +01:00
Sam Minnée
461abae189 Merge pull request #1606 from open-sausages/pulls/4.0/ss-rename
Rename SS_ prefixed class names
2016-09-09 18:11:41 +12:00
Damian Mooyman
2dae4e2adc Rename SS_ prefixed class names 2016-09-09 11:26:24 +12:00
Daniel Hensby
5b00d5af99 Merge pull request #1604 from open-sausages/pulls/4.0/namespace-fixes
BUG Fix some namespace class errors
2016-09-08 10:18:48 +01:00
Damian Mooyman
a12d52a161 BUG Fix some namespace class errors 2016-09-08 19:33:32 +12:00
Ingo Schommer
ac954095ab Merge pull request #1602 from open-sausages/pulls/4.0/namespace-everything
Upgrade code for framework namespaces
2016-09-08 17:44:45 +12:00
Daniel Hensby
91444b8016
Merge branch '3' 2016-09-07 11:28:05 +01:00
Damian Mooyman
a87a857a6e
Upgrade code for framework namespaces
Remove @package / @subpackage
Fix inifinite loop in VirtualPage_Controller
2016-09-07 16:29:26 +12: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