tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
5,218 Commits 29 Branches 403 Tags 28 MiB
df0ce184bf
Commit Graph

5218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
c46a6c3e9b Merge pull request #1621 from open-sausages/die-dist-conflicts-die 
FIX: Break dist javascript and onto newlines.
 2016-09-22 14:45:56 +12:00
Paul
63f69b55db Merge pull request #1618 from open-sausages/pulls/4.0/fix-cms-buttons 
API use new bootstrap button row template
 2016-09-22 14:44:23 +12:00
Ingo Schommer
4b2c6b0503 FIX: Break dist javascript and onto newlines. 
This doesn’t have much impact on resulting JS size, but it will
hopefully make merge conflicts much less frequent.

The CSS growth is a little higher (6.5% increase in size) but is not
material.

If this materially reduces the number of merge conflicts we have, by
letting the git merge tools resolve some dist file mergers, I think it
would be worth it.

See https://github.com/silverstripe/silverstripe-framework/pull/6051
 2016-09-22 14:39:02 +12:00
Damian Mooyman
760caaab44 API use new bootstrap button row template 2016-09-22 13:20:31 +12:00
Damian Mooyman
07ba92c5b7 Merge pull request #1617 from open-sausages/pulls/4.0/webpack-optimise 
Remove framework bundle include
 2016-09-21 17:14:56 +12:00
Ingo Schommer
5c31bf357b Remove framework bundle include 
This is now handled through one combined bundle
which is included through LeftAndMain.php (in framework module)
Rename bundle-legacy.js to bundle.js: It'll contain more than legacy stuff eventually
Remove leftover dist artefacts: These weren't part of the webpack build any more
Building SilverStripeNavigator separately (and rename bundle)
 2016-09-21 15:00:26 +12:00
Damian Mooyman
b2f250c539 Merge pull request #1614 from open-sausages/pulls/4.0/alignment-and-spacing 
Alignment and spacing of main CMS panels
 2016-09-21 10:13:05 +12:00
Ingo Schommer
402c6879a3 Merge pull request #1615 from open-sausages/pulls/4.0/fix-level-up 
BUG Fix pages level up link
 2016-09-20 14:57:45 +12:00
Damian Mooyman
18939157f0
BUG Fix pages level up link 
Fixes https://github.com/silverstripe/silverstripe-framework/issues/5400
 2016-09-20 13:03:56 +12:00
Damian Mooyman
685a72d470 Merge pull request #1613 from open-sausages/pulls/4.0/file-links 
Moved Backlink list/table to SS Template
 2016-09-20 12:57:07 +12:00
Damian Mooyman
4f19113c5c API Use new DBField::getSchemaValue() 2016-09-20 12:08:20 +12:00
Christopher Joe
4b3f4ba01c move BackLinkHTMLList to template 2016-09-19 10:43:39 +12:00
Paul Clarke
c42a20ae05 Update preview classes as area broken 2016-09-16 15:18:54 +12:00
Paul Clarke
1158520f40 Use consistent panel styles, apply .panel styles 2016-09-16 15:18:54 +12:00
Paul Clarke
59b2e293cf Convert to new styles to use .panel and .toolbar 2016-09-16 15:18:54 +12:00
Damian Mooyman
fba54c8ae8 Merge pull request #1589 from sminnee/webpack 
Replace browserify/gulp with Webpack
 2016-09-16 14:18:36 +12:00
Damian Mooyman
7751a6cee7 Behat test cases for site tree duplication (#995) 2016-09-16 11:44:07 +12:00
Ingo Schommer
fee7e0211e Use CDN jQuery for RemoveOrphanedPagesTask 
We shouldn't rely on static file paths from framework,
since they tend to change around.
 2016-09-15 15:16:12 +12:00
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