Commit Graph

23 Commits

Author SHA1 Message Date
Damian Mooyman
6524d60f75 Update translations 2016-09-23 14:02:58 +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
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
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
Daniel Hensby
91444b8016
Merge branch '3' 2016-09-07 11:28:05 +01:00
Ingo Schommer
b599095a50 API Remove AssetAdmin (moved to asset-admin module) 2016-08-31 23:15:12 +12:00
Paul Clarke
89aba7d146 Remove unwanted spacing 2016-08-03 12:10:54 +12:00
Paul Clarke
e6b31aaf04 Remove horizontal scroll on old asset admin grid 2016-08-03 12:10:54 +12:00
Paul Clarke
43ceeebb82 Gridfield updates for new styling. Mainly class update 2016-08-03 12:10:54 +12:00
Damian Mooyman
48a2aecaab Merge pull request #1537 from silverstripe-terraformers/fix/menuitems-fix
When page is disabled, rename "Edit" label in contextmenu and …
2016-08-02 17:01:07 +12:00
Damian Mooyman
7c151321b4 BUG Fix issue with old asset-admin repeating "level up" button
BUG Fix incorrectly built dist files
2016-08-01 17:38:22 +12:00
Damian Mooyman
d7fa00267e
Fix field casting 2016-07-28 12:06:05 +12:00
Damian Mooyman
ff07a2e264 API Convert CMS forms to bootstrap
API Update to cms-forms theme

This commit is required by and depends on https://github.com/silverstripe/silverstripe-framework/pull/5826 in framework.
2016-07-25 17:25:22 +12:00
Christopher Joe
adcc5251b5 added translation to src file 2016-07-19 10:04:24 +12:00
Christopher Joe
49e5cd54fa When page is disabled, rename "Edit" label in contextmenu and hide duplicate options 2016-06-30 17:28:17 +12:00
Paul Clarke
f4e080e046 Converted all south toolbars to use new toolbar component styles, content and preview styles for scrollbars adjusted where required 2016-05-24 12:28:38 +12:00
Paul Clarke
11192b0207 Swap out .Actions class for bootstrap .btn-toolbar 2016-05-24 12:28:38 +12:00
Daniel Hensby
a507c80d15 Merge pull request #1492 from open-sausages/pulls/linting
Linting and CodeClimate support
2016-05-12 17:51:15 +01:00
Damian Mooyman
c58d8bdedc Update translations 2016-05-12 15:37:09 +12:00
Ingo Schommer
fff84a5e13 Add SCSSLint
Not validating any files since it's all in legacy folders, but future proofing for new code
2016-05-11 09:47:03 +12:00
Damian Mooyman
59ca068806 Rebuild dist files for merge 2016-04-29 18:02:30 +12:00
Damian Mooyman
d7d6fd8758 Merge 3 into master
# Conflicts:
#	code/controllers/CMSPageAddController.php
#	code/model/ErrorPage.php
#	composer.json
#	css/screen.css
#	tests/behat/features/insert-a-link.feature
2016-04-29 14:34:29 +12:00
Ingo Schommer
e4861bdc79 Adjust file paths for new static file structure in framework 2016-04-20 21:13:20 +12:00