Loz Calver
4f673635a1
Merge pull request #1460 from open-sausages/pulls/4.0/fix-icon-styles
...
Fix font-icon regression on tree view
2016-04-22 11:05:47 +01:00
David Craig
85fb080319
Fix font-icon regression on tree view
2016-04-22 10:44:40 +12:00
Ingo Schommer
830a97a9fc
Merge pull request #1456 from open-sausages/pulls/4.0/static-file-restructure
...
Adjust file paths for new static file structure in framework
2016-04-20 21:16:05 +12:00
Ingo Schommer
e4861bdc79
Adjust file paths for new static file structure in framework
2016-04-20 21:13:20 +12:00
Sam Minnée
398adbb7e8
Merge pull request #1455 from open-sausages/pulls/4.0/css-editorconfig
...
Editorconfig for JS and CSS
2016-04-19 11:01:10 +12:00
Ingo Schommer
2c2056fe56
Editorconfig for JS and CSS
2016-04-19 10:41:08 +12:00
Damian Mooyman
9be7758a9f
Merge pull request #1450 from open-sausages/pulls/4.0/build-tooling
...
Improved build tooling
2016-04-15 11:58:24 +12:00
Hamish Friedlander
433a609373
Merge pull request #1454 from open-sausages/pulls/4.0/fix-setting-chosenfield
...
BUG Fix chosen dropdown on settings being cropped
2016-04-14 12:47:54 +12:00
Damian Mooyman
7e37abeb21
BUG Fix chosen dropdown on settings being cropped
2016-04-14 11:19:10 +12:00
Ingo Schommer
d65851f0e9
ESLint fixes in gulpfile
2016-04-08 15:17:18 +12:00
Ingo Schommer
db42ab772f
Adding ESLint
...
Not much too lint yet in terms of new code, but it's consistent with framework and asset-admin modules
2016-04-08 15:08:08 +12:00
Ingo Schommer
925bdde0a5
Added "npm run lock" command
2016-04-08 14:56:01 +12:00
scott1702
3cdb2f1f08
Handle CSS compilation with gulp-sass
2016-04-08 14:55:23 +12:00
Ingo Schommer
0789ad2fd9
Always use uglify during build
...
It makes very little difference between "npm run build"
and "npm run build --development" (both under a second),
since the gulp pipeline is smart enough to only uglify the new bits.
Creating different dist files with "--development"
is causing grief during pull requests, since most
devs will add the changed files without reviewing them.
It also means you can commit without stopping your "watch" npm task.
2016-04-08 14:32:38 +12:00
Ingo Schommer
23292e22b6
Updated babel dependency
2016-04-08 14:31:48 +12:00
Damian Mooyman
3ed4c0fd52
Merge pull request #1418 from mikenz/patch-2
...
FIX 'Settings' fields being overwritten by 'Content' fields
2016-04-06 13:06:14 +12:00
Damian Mooyman
c66caaa28a
Merge pull request #1445 from open-sausages/pulls/ie-babel-support
...
Fix IE support by using babelify transforms
2016-04-06 10:38:59 +12:00
Ingo Schommer
c4a9720730
Fix IE support by using babelify transforms
2016-04-06 09:50:00 +12:00
Ingo Schommer
3d2f722231
Merge pull request #1446 from tractorcow/pulls/4.0/travis-artifacts
...
API Update to use new travis-artifacts
2016-04-06 09:17:58 +12:00
Ingo Schommer
9384aed9fc
Merge pull request #1435 from open-sausages/pulls/4.0/changesets
...
API Support new DataObject::can() signature
2016-04-05 23:03:13 +12:00
Damian Mooyman
db6251a9b7
API Update to use new travis-artifacts
2016-04-05 13:49:56 +12:00
Ingo Schommer
5a7b7084ff
Support for new DataObject->can() signature
...
Cherry pick from https://github.com/silverstripe/silverstripe-cms/pull/1435
in order to get CMS loading again.
2016-04-05 08:01:40 +12:00
Damian Mooyman
716baa6b1f
API Support renamed Versioned API
2016-04-01 16:17:47 +13:00
Damian Mooyman
d22ad706a9
API Support new DataObject::can() signature
2016-04-01 16:17:47 +13:00
Damian Mooyman
5852cd56a5
Merge pull request #1433 from open-sausages/pulls/4.0/build-tooling-fixes
...
Build tooling fixes
2016-03-31 11:56:06 +13:00
Daniel Hensby
478d04327b
Merge pull request #1434 from open-sausages/pulls/4.0/cms-set-form
...
Ensure all form fields have a form set
2016-03-28 11:04:57 +01:00
David Craig
a9d839396d
Ensure all form fields have a form set
2016-03-28 22:25:04 +13:00
Ingo Schommer
b71a3d2b86
Added .gitattributes, ignoring src files and binary diffs
2016-03-28 22:22:43 +13:00
Ingo Schommer
abe565eb01
JS build tooling fixes
...
- Relaxed NodeJS dependency to 4.x
- Switch to NPM "dependencies" (rather than dev)
Provides consistency with framework, where these had previously
been broken out between "dependencies" and "devDependencies", which in turn caused issues with "npm shrinkwrap"
- Add npm-shrinkwrap.json: Consistent with framework approach
Using uber's wrapper library since it prevents npm shrinkwrap from failing on file generation,
as well as actually suceeding with an "npm install" once the file is present.
- Don't add comments to dist files via babelify
We've had some issues with different dependencies causing different results based on the environment,
which in turn causes unnecessary diffs - making our work harder to review.
Comments can be read through the ES6 source files, and through source maps when
generated through `npm run build --development`
- Make JS build tooling and naming consistent with framework
2016-03-28 22:22:21 +13:00
Ingo Schommer
ee3158183f
"npm run lock" command
...
Uses https://github.com/uber/npm-shrinkwrap instead of the built-in "npm shrinkwrap" since it works more reliably.
Specifically, "npm install" doesn't fail depending on node_modules/ being installed in the local cache or not.
It also makes npm-shrinkwrap.json easier to diff by more consistently ordering its output between runs.
If you need any convincing that this is a problem, look at the over 400 issues related to "shrinkwrap"
in https://github.com/npm/npm/search?q=shrinkwrap&type=Issues&utf8=%E2%9C%93
2016-03-28 13:45:03 +13:00
Damian Mooyman
c8b3ebb7a8
Merge pull request #1432 from sminnee/php7-support
...
FIX: Changes to support php7 and new DBFields
2016-03-23 10:21:16 +13:00
Sam Minnee
46b35ecb0e
FIX: Changes to support php7 and new DBFields
...
These changes are necessary for CMS to work with this API breakage:
https://github.com/silverstripe/silverstripe-framework/pull/4551
2016-03-23 10:05:05 +13:00
Ingo Schommer
209e1568c3
Merge pull request #1423 from open-sausages/pulls/4.0/tinymce-image-shortcode
...
TinyMCE image shortcodes
2016-03-21 15:02:40 +13:00
Damian Mooyman
067d44ac6c
API Update link tracking for image shortcodes
2016-03-21 09:08:31 +13:00
Hamish Friedlander
3017028755
Merge pull request #1415 from open-sausages/features/triggered-publishing
...
API Update uses of versioned
2016-03-17 21:20:40 +13:00
Damian Mooyman
4cc7b0806d
API Update to use new Versioned API
...
API CMS notifications for recursive operations
API Un-deprecated delete action and batch actions
API remove deprecated API
2016-03-17 13:44:26 +13:00
Mike Cochrane
70062ebc9c
FIX 'Settings' fields being overwritten by 'Content' fields
...
CMSMain::getEditForm wasn't passing the $fields parameter to the parent. The the "Settings" fields we being replaced with the "Content" settings when requesting /admin/pages/settings/show/123345
2016-03-09 17:40:43 +13:00
Damian Mooyman
849cd898a4
Cleanup trailing whitespace
2016-03-09 10:28:45 +13:00
Ingo Schommer
08202f018f
Merge pull request #1401 from open-sausages/pulls/4.0/ownership-api
...
API Mark image tracking as owned
2016-03-08 11:55:01 +13:00
Damian Mooyman
de6db9f5c6
API Mark image tracking as owned
2016-03-08 10:58:33 +13:00
Damian Mooyman
a737f9c901
Merge pull request #1410 from open-sausages/features/form-schema
...
Form Schema
2016-03-08 10:55:20 +13:00
Ingo Schommer
6a53e607f5
Replace CMSForm use with new setValidationResponseCallback() API
...
Preparing for form schema API, see https://github.com/silverstripe/silverstripe-framework/issues/4938
2016-03-07 16:49:33 +13:00
Ingo Schommer
b4c4c636f2
Merge remote-tracking branch 'origin/3'
2016-03-04 17:07:23 +13:00
Ingo Schommer
fa8f5b3f2b
Merge remote-tracking branch 'origin/3.3' into 3
2016-03-04 14:35:06 +13:00
Damian Mooyman
ffdfac6af4
Merge branch '3.2' into 3.3
...
# Conflicts:
# lang/en.yml
# lang/sk.yml
2016-02-29 16:47:11 +13:00
Damian Mooyman
2406881d3e
Merge remote-tracking branch 'origin/3.3.1' into 3.3
...
# Conflicts:
# lang/cs.yml
2016-02-29 16:44:01 +13:00
Damian Mooyman
1eed3608ad
Merge branch '3.1' into 3.2
...
# Conflicts:
# code/controllers/CMSMain.php
2016-02-29 16:41:01 +13:00
Damian Mooyman
ba9c3378e2
Merge remote-tracking branch 'origin/3.2.3' into 3.2
2016-02-29 16:38:38 +13:00
Damian Mooyman
d6292b9b55
Merge remote-tracking branch 'origin/3.1.18' into 3.1
2016-02-29 16:34:26 +13:00
Damian Mooyman
77d506547c
Update translations
2016-02-29 15:01:55 +13:00
