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
4,973 Commits 29 Branches 403 Tags 28 MiB
eb9f525ecf
Commit Graph

4973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Damian Mooyman
f0b574b835 Merge pull request #1459 from open-sausages/pulls/4.0/add-to-campaign 
Add 'Add to campaign' button to pages
 2016-04-28 10:04:24 +12:00
Daniel Hensby
af4b546050
Merge branch '3.3' into 3 2016-04-26 01:59:56 +01:00
Daniel Hensby
06d882b49c
Merge 3.2 into 3.3 2016-04-26 01:50:03 +01:00
Damian Mooyman
7a36789130 Cleanup PHPDoc and use injector for AddToCampaignHandler 2016-04-26 11:56:37 +12:00
Daniel Hensby
6cd1837f0c
Merge 3.1 into 3.2 
Conflicts:
	code/reports/SideReport.php
 2016-04-26 00:09:19 +01:00
Ingo Schommer
30375937a6 Merge pull request #1461 from open-sausages/pulls/4.0/OSS-1750-js-file-rename 
Adapted JS lib references to renamed paths
 2016-04-25 15:57:03 +12:00
Ingo Schommer
fa9d90c74f Adapted JS lib references to renamed paths 2016-04-25 15:43:43 +12:00
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
Ingo Schommer
38d828b3db Merge pull request #1457 from open-sausages/pulls/3/fix-dependencies 
BUG Correct framework/module dependencies for cms
 2016-04-22 13:52:16 +12:00
David Craig
85fb080319 Fix font-icon regression on tree view 2016-04-22 10:44:40 +12:00
scott1702
69d7a3ae7d Add 'Add to campaign' button to pages 2016-04-22 08:39:39 +12:00
Damian Mooyman
b4f466f5e1 BUG Correct framework/module dependencies for cms 2016-04-21 18:45:56 +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
Damian Mooyman
9c21bd1d70 Merge pull request #1448 from patricknelson/1447-errorpage-write-static-check 
FIX for #1447 to ensure proper type-safe checking of file_put_contents() in ErrorPage->writeStaticPage()
 2016-04-12 12:25:49 +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
Patrick Nelson
000bf09354 FIX for #1447 to ensure proper type-safe checking of file_put_contents() in ErrorPage->writeStaticPage() 2016-04-06 17:34:55 -07: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
be1a16a357 Merge pull request #1437 from camfindlay/patch-2 
License moved to own file
 2016-04-04 18:25:30 +12:00
Damian Mooyman
6be57343f9 Merge pull request #1436 from camfindlay/patch-1 
Add license file
 2016-04-04 18:25:24 +12:00
Cam Findlay
4c419ae4ae License moved to own file 2016-04-04 16:34:04 +12:00
Cam Findlay
1755714210 Add license file 
While this is in the README it's common to have a separate license file to make it clear this is FOSS.
 2016-04-04 16:33:01 +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
Ingo Schommer
491d532dfa Merge pull request #1413 from chillu/pulls/3.2/disable-xdebug-travis 
Disable xdebug on Travis runs
 2016-03-30 07:49:43 +13:00
Ingo Schommer
5f9077242a Disable xdebug on Travis runs 
We're not using it for code coverage,
and it's slowing down both composer and phpunit builds.

Recommended by Travis:
https://docs.travis-ci.com/user/speeding-up-the-build/#PHP-optimisations
 2016-03-29 17:22:02 +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