Commit Graph

154 Commits

Author SHA1 Message Date
Damian Mooyman 2e25beb703
BUG Prevent assets folder being destroyed on behat tests
ENHANCEMENT Shift into vendormodule
2018-03-07 14:34:56 +13:00
Damian Mooyman 2c277b53fb
Update branch alias for 2.x-dev to 2.1.x-dev 2017-11-28 13:20:08 +13:00
Damian Mooyman 5413f9182e
Merge branch '2.0' into 2 2017-11-28 13:19:29 +13:00
Damian Mooyman 3a65d766c7
Remove branch-alias for 2.0 branch 2017-11-28 13:19:02 +13:00
Damian Mooyman 03a1311bef Merge pull request #54 from open-sausages/pulls/2.0/i-am-getenv-us-of-your-progress
Fix update getenv call
2017-10-27 14:50:34 +13:00
Christopher Joe a523d66402 Fix update getenv call 2017-10-27 14:37:12 +13:00
Loz Calver b34a4f9081 Merge pull request #53 from dhensby/pulls/yml-syntax
FIX Quote yample starting with %
2017-07-27 10:59:07 +01:00
Daniel Hensby b18ac73d81
FIX Quote yample starting with % 2017-07-27 10:47:35 +01:00
Chris Joe 2b64499e36 Merge pull request #52 from open-sausages/pulls/4.0/upgrader-tweaks
Upgrade code with upgrader
2017-07-03 16:10:18 +12:00
Damian Mooyman 0374e935e7
Upgrade code with upgrader 2017-07-03 15:09:05 +12:00
Damian Mooyman 62cd6303da Merge pull request #50 from open-sausages/pulls/4.0/update-middleware
API Replace request filter with middleware
2017-06-27 13:31:11 +12:00
Damian Mooyman 3e08c1aad0 API Replace request filter with middleware 2017-06-27 13:00:41 +12:00
Damian Mooyman 81130c7025 Merge pull request #51 from silverstripe/pulls/1/env-in-shined
Fix converted to getenv()
2017-06-27 12:58:16 +12:00
Christopher Joe a5d1545347 Fix converted to getenv() 2017-06-27 12:22:58 +12:00
Ingo Schommer 787ba1cc67 Merge pull request #49 from open-sausages/pulls/4.0/app-object
[WIP] App object refactor
2017-06-22 23:01:41 +12:00
Damian Mooyman 2868e6bd3e Update references to deprecated global 2017-06-22 15:15:17 +12:00
Damian Mooyman f5ef9f4fbf API Use new TempDatabase service 2017-06-21 21:04:10 +12:00
Damian Mooyman 1651d5695a
Update testsession for SapphireTest changes 2017-06-13 15:00:32 +12:00
Damian Mooyman 9ec863f917
Fix session accessors 2017-06-12 14:59:20 +12:00
Damian Mooyman 1ab843776d
App object refactor 2017-06-08 18:01:46 +12:00
Daniel Hensby be78e58ff6 FIX Be less opinionated about test DB name 2017-05-13 10:23:45 +12:00
Damian Mooyman beda9e158f API Namespace and update for ss 4.0 2017-04-26 15:59:54 +12:00
Damian Mooyman 04fe1e5ee8 Merge pull request #46 from open-sausages/pulls/4.0/6626-remove-jquery-datepicker
Fixed DatetimeField API usage
2017-04-04 10:58:40 +12:00
Ingo Schommer 7982a853e9 Fixed DatetimeField API usage
See https://github.com/silverstripe/silverstripe-framework/issues/6626
2017-04-03 20:20:07 +12:00
Damian Mooyman 8826a70e4d Merge pull request #44 from silverstripe/fix-composer
FIX: Allow pre-release versions of SS4.
2017-02-27 14:38:54 +13:00
Chris Joe 0f06483edd Merge pull request #45 from open-sausages/pulls/4.0/fix-header-blocks
BUG Fix use of duplicate yml header block
2017-02-27 13:30:09 +13:00
Damian Mooyman 7457549131 BUG Fix use of duplicate yml header block 2017-02-27 13:19:19 +13:00
Sam Minnee 74eed2a6d0 FIX: Allow pre-release versions of SS4.
Since SS4 has not yet been released, and this module is used to test
pre-release versions of SS4, we need to have @dev on the requirement
to make it as flexible as possible.

As a general rule, modules that plug *into* SS4 rather than making *use*
of it should have @dev on the end of their dependencies.
2017-02-27 09:08:43 +11:00
Ingo Schommer 9ca529492b Merge pull request #43 from open-sausages/pulls/4.0/i18n-locale
Update to use php-intl instead of zend_date
2017-02-16 10:57:06 +13:00
Damian Mooyman 6ad8d24946
Update to use php-intl instead of zend_date 2017-02-07 17:52:29 +13:00
Daniel Hensby 00367f210c Merge pull request #40 from open-sausages/pulls/upgrade-config
Update config names to match SS4 namespaces
2016-09-16 11:47:01 +01:00
Damian Mooyman a9223ab1ba Merge pull request #41 from open-sausages/webpack
Webpack compat
2016-09-16 14:18:04 +12:00
Ingo Schommer 79552d2667 Use CDN jQuery for TestSessionController
We shouldn't hotlink to static asset files
in other modules since these paths aren't a "public api",
and tend to move around.
2016-09-15 15:16:37 +12:00
Ingo Schommer a54ddb5513 Changed debug.css paths
See https://github.com/silverstripe/silverstripe-framework/pull/5918
2016-09-15 11:30:59 +12:00
Ingo Schommer eb24406c5b Update config names to match SS4 namespaces 2016-09-15 11:25:44 +12:00
Daniel Hensby 81d4b73c2a Merge pull request #39 from sminnee/fix-alpha2
FIX: Fixes for final 4.0-alpha2 class names.
2016-09-12 00:48:22 +01:00
Sam Minnee 9b85c80178 FIX: Use composer-aware phpunit to run tests.
SilverStripe now requires the phpunit autoloader to work, which means
that a non-composer-installed copy of phpunit won’t work.
2016-09-12 11:43:12 +12:00
Sam Minnee 0662a9ad90 FIX: Fixes for final 4.0-alpha2 class names. 2016-09-10 11:19:56 +12:00
Ingo Schommer 7b918814ba Merge pull request #38 from open-sausages/pulls/4.0/namespace-everything
Upgrade for framework namespacing
2016-09-08 16:13:13 +12:00
Damian Mooyman 1bedade619 Upgrade for framework namespacing 2016-08-29 16:17:53 +12:00
Ingo Schommer 3b06f5f738 Merge pull request #36 from open-sausages/pulls/namespace-orm
Update for SilverStripe\ORM namespace
2016-07-01 15:08:17 +12:00
Damian Mooyman cbcd808dde
Update for SilverStripe\ORM namespace
Lock master branch to 4.x compat due to incompatibliities
2016-06-27 15:08:08 +12:00
Daniel Hensby e66772fdce Merge pull request #35 from helpfulrobot/add-standard-scrutinizer-config
Added standard Scrutinizer config
2016-03-22 11:24:59 +00:00
helpfulrobot 4e02738323 Added standard Scrutinizer config 2016-02-17 05:31:54 +13:00
Daniel Hensby b91d12205c Merge pull request #34 from helpfulrobot/add-standard-code-of-conduct-file
Added standard code of conduct file
2016-02-16 09:42:10 +00:00
helpfulrobot 3feceb1629 Added standard code of conduct file 2016-02-16 11:43:36 +13:00
Daniel Hensby ac8492b546 Merge pull request #30 from jeffreyguo/pulls/cleanup-temp-db
clean up team db after test session run
2016-01-21 22:35:21 +00:00
Daniel Hensby c1a3d89e8f Merge pull request #32 from tractorcow/pulls/fix-tests
BUG Fix test dependencies for master branch
2016-01-18 16:06:06 +00:00
Damian Mooyman dd5f97c49a BUG Fix test dependencies for master branch 2016-01-18 15:51:42 +13:00
Damian Mooyman 4e4e7f0cc4 Merge pull request #31 from helpfulrobot/add-standard-gitattributes-file
Added standard .gitattributes file
2016-01-18 15:48:37 +13:00