tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,735 Commits 28 Branches 397 Tags 24 MiB
Commit Graph

98 Commits

Author SHA1 Message Date
Damian Mooyman 99cdeec461
Update .travis.yml in line with framework .travis.yml 2017-11-23 15:55:37 +13:00
Damian Mooyman 2fc3f80f1f Fix tinymce issue 
Fix phpunit path issue
 2017-10-03 17:05:54 +13:00
Damian Mooyman a2f0a79b21
Fix test environment type 2017-10-02 17:05:54 +13:00
Damian Mooyman 496b9c8c04 API Implement insert-anchor modal 2017-09-20 13:35:25 +12:00
Damian Mooyman a83d94abe0
Switch cms to trusty 2017-09-13 10:56:30 +12:00
Damian Mooyman 89429683f4
Update .travis.yml 2017-09-12 15:06:02 +12:00
Damian Mooyman 4f6af36369
Manual fixes to automatic namespacing 2017-08-09 17:09:28 +12:00
Daniel Hensby 99b2d9842a
Merge branch '3' into 4 2017-07-25 15:58:34 +01:00
Daniel Hensby a7d3d82dd7
Stay on travis precise dist for now 2017-07-25 15:56:30 +01:00
Franco Springveldt c034ead6df FIX beforeUpdateCMSFields added to ErrorPage and VirtualPage 
References #1756
 2017-05-26 13:21:51 +12:00
Damian Mooyman a6a74cd5a9
Adjust cms .travis.yml build 2017-05-22 10:37:00 +12:00
Damian Mooyman 6c5e0f829a
BUG Ensure logs are saved to artifacts 2017-05-16 14:20:54 +12:00
Damian Mooyman 0b24e02db4 BUG Fix missing path to travis-upload-artifacts.php 2017-05-16 13:28:00 +12:00
Damian Mooyman 23e1aa8c45 API Refactor inherited permissions (#1811) 2017-05-12 12:47:46 +12:00
Damian Mooyman fc2219dc72 .travis.yml code cleanup 
Fixed indentation
Move coverage build to script
Update travis node version to 6
Update npm to use yarn for CI
 2017-05-11 10:03:13 +12:00
Sam Minnee 14540729ca FIX: Use framework 3.5 to test cms 3.5 2017-05-09 11:41:55 +12:00
Sam Minnee 11b8926c1a fixup - prefer-stable necessary to avoid armageddon 2017-05-05 17:19:41 +12:00
Sam Minnee e2271d1b0a fixup - make behat work 2017-05-05 17:19:41 +12:00
Sam Minnee f4179d608d NEW: Simplify test runs. 2017-05-05 17:19:41 +12:00
Damian Mooyman df100b8798 API Upgrade to behat 3 2017-05-05 17:19:41 +12:00
Ingo Schommer 904f18cc48 Pin PHP7 build to 7.1.2 
7.1.3 breaks with segfaults: https://travis-ci.org/silverstripe/silverstripe-cms/jobs/220828001

Same fix as framework: 6cfeb7f07e
 2017-04-12 08:43:36 +12:00
Ingo Schommer 53b4c779f2 Merge branch 'master' into pulls/4/code-cov-after-success 2017-04-12 08:12:14 +12:00
Ingo Schommer fb0c69f877 Only git-diff files in client folder 
We only care about the dist files. If we diff in the root folder,
we'll get false positives on composer.json changes.

See https://travis-ci.org/silverstripe/silverstripe-cms/jobs/215796957
 2017-03-28 19:30:38 +13:00
Damian Mooyman 5ce98aced2 API Upgrade to rely on silverstripe/versioned module 2017-03-28 10:35:14 +13:00
Ingo Schommer d95be0e273 Remove composer self-update, handled by Travis now 2017-03-20 20:06:18 +13:00
Ingo Schommer 7dfa6fc21c Drop PHP 5.5 support 
See https://github.com/silverstripe/silverstripe-framework/issues/6705#issuecomment-287515832
 2017-03-20 20:06:18 +13:00
Damian Mooyman bd409bfd30
BUG Fix PHPUNIT_COVERAGE_TEST by moving to php 5 build 2017-03-13 15:48:16 +13:00
Daniel Hensby fd987a6360
Run code coverage upload after success 2017-02-08 12:42:04 +00:00
Damian Mooyman a80b8aef60 Lint php coding standards via CI 2017-01-31 15:12:25 +13:00
Daniel Hensby 90b6c9d942
CI Check dist files are correctly built 2017-01-30 20:23:52 +00:00
Robbie Averill 6759f5a135 BUILD Run PHP 7.1 as default 7.x 2016-12-30 00:49:38 +13:00
Daniel Hensby 36900a651b
Updating travis.yml 2016-12-28 17:57:21 +00:00
Daniel Hensby 7a296a541b
Merge branch '3' 2016-12-28 17:00:32 +00:00
Daniel Hensby 0b952e277e
Merge branch '3.5' into 3 2016-12-19 11:56:55 +00:00
Daniel Hensby 95995adc98
Move travis env vars out of .travis.yml and into travis CI dashboard 2016-12-06 22:29:48 +00:00
Ingo Schommer 0d788ddfbc NEW: Code Coverage via CodeCov.io (#1631) 
* Add phpunit.xml.dist for code coverage whitelist
* Fixed @covers with namespaces
* Increase memory_limit to allow code coverage run. phpdbg can peak to more than 1GB built-in.

Travis allows up to 3GB of useable memory:
https://docs.travis-ci.com/user/common-build-problems/#My-build-script-is-killed-without-any-error
https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments

https://github.com/silverstripe/silverstripe-cms/pull/1631
 2016-11-21 15:17:25 +13:00
Damian Mooyman 02b9de93c3
Increment 3 alias to 3.6 2016-11-14 10:05:34 +13:00
Sam Minnee added2129f NEW: Simplified travis run 
Travis no longer relies on travis-support or special project structures.
Instead, behat and silverstripe-serve are provided as dev dependencies
and used within a normal composer install structure.

tests/fixtures/Page.php should be copied into the project root before
a test run. .travis.yml does this.
 2016-10-28 17:47:21 +13:00
Ingo Schommer ec66912bc0 Use sass-lint 
See https://github.com/silverstripe/silverstripe-framework/pull/6016
 2016-09-27 17:10:47 +13:00
Jonathon Menz c965133da0 FIX Direct edit file by URL 
Trying to navigate directly to the edit view of a file by URL would fail if a folder other than the file’s parent was held in session data. Removed reliance on current ID in session and added folder detection for edit view.
 2016-07-29 16:53:31 -07: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
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 db6251a9b7 API Update to use new travis-artifacts 2016-04-05 13:49:56 +12: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
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 397f9670b5 Fixed core release constraint in travis.yml 2016-03-04 16:57:49 +13:00
Ingo Schommer 8f2e486dc5 Forcing Behat 2.x dependency 
Due to `"prefer-stable": true`, composer will use the 1.0.0 release which had a wrong dependency constraint (not limited to 3.x). It's too early to tag behat-extension 2.0.0 already in terms of semver - so we opt for installing the 2.x dev version instead.
 2016-02-24 23:50:48 +13:00
Damian Mooyman 7dfe145412 Merge remote-tracking branch 'origin/3' 
# Conflicts:
#	code/controllers/CMSFileAddController.php
#	code/controllers/CMSPageAddController.php
#	code/controllers/CMSPageHistoryController.php
#	code/controllers/CMSSiteTreeFilter.php
#	code/controllers/ContentController.php
#	code/controllers/LeftAndMainPageIconsExtension.php
#	code/controllers/SilverStripeNavigator.php
#	code/model/SiteTreeFileExtension.php
#	code/model/VirtualPage.php
#	composer.json
#	tests/model/ErrorPageTest.yml
#	tests/model/FileLinkTrackingTest.yml
#	tests/model/VirtualPageTest.yml
 2016-01-20 13:16:43 +13:00
Sam Minnee bbc3aaaf9f MINOR: Remove training whitespace. 
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -prune -o -type f -name "$match" -exec sed -i '' 's/[[:space:]]\+$//' {} \+
	find . -path ./thirdparty -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
 2016-01-07 10:32:05 +13:00