Commit Graph

583 Commits

Author SHA1 Message Date
Steve Boyd
1aa560ff74 Merge branch '3.7' into 3 2021-12-22 10:25:58 +13:00
Steve Boyd
421e08cba5
Merge pull request #334 from creative-commoners/pulls/3.7/cherry-pick
MNT Fix unit test
2021-11-29 17:25:45 +13:00
Steve Boyd
91d2db1020 MNT Fix unit test 2021-11-29 17:24:29 +13:00
Steve Boyd
9258ce6fa4 Merge branch '3.7' into 3 2021-11-25 13:16:34 +13:00
Maxime Rainville
8a3b569653
Merge pull request #333 from creative-commoners/pulls/3.7/js
DEP Update JS dependencies
2021-11-24 17:26:28 +13:00
Steve Boyd
aa81f8cdd2 DEP Update JS dependencies 2021-11-23 10:45:13 +13:00
Steve Boyd
6895ac4f9d
Merge pull request #331 from creative-commoners/pulls/3/eslint
MNT Use caret for eslint
2021-11-22 13:35:29 +13:00
Steve Boyd
a3c7943fdd
Merge pull request #330 from creative-commoners/pulls/3/fix-test
MNT Fix unit test
2021-11-22 11:56:08 +13:00
Steve Boyd
43e221daa8 MNT Use caret for eslint 2021-11-19 12:29:17 +13:00
Steve Boyd
6d9a808cd4 MNT Fix unit test 2021-11-19 10:55:22 +13:00
Maxime Rainville
7eb8ebedf4
Merge pull request #329 from creative-commoners/pulls/3/sapphire-test-nine
API phpunit 9 support
2021-11-01 17:52:24 +13:00
Steve Boyd
305ae6b4b8 API phpunit 9 support 2021-10-27 18:03:55 +13:00
Loz Calver
066b28bb3d
Fix broken link in README.md 2021-10-14 16:22:35 +01:00
dependabot[bot]
5cee54faca
Merge pull request #324 from silverstripe/dependabot/npm_and_yarn/hosted-git-info-2.8.9 2021-08-05 06:25:32 +00:00
dependabot[bot]
4cfecdfcd6
Merge pull request #325 from silverstripe/dependabot/npm_and_yarn/ws-6.2.2 2021-06-06 15:57:51 +00:00
dependabot[bot]
3a4130302d
Bump ws from 6.2.1 to 6.2.2
Bumps [ws](https://github.com/websockets/ws) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/commits)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-05 15:06:53 +00:00
dependabot[bot]
a4eeec4bba
Bump hosted-git-info from 2.8.8 to 2.8.9
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-10 06:32:37 +00:00
Steve Boyd
545df1d54f Merge branch '3.4' into 3 2021-03-21 10:31:41 +13:00
Steve Boyd
9c3c1e8120 Fix merge conflict 2021-03-21 10:31:02 +13:00
Steve Boyd
38495c69f0 Merge branch '3.4' into 3 2021-03-21 10:28:31 +13:00
Steve Boyd
e6971b82c6 Merge branch '3.3' into 3.4 2021-03-21 10:27:53 +13:00
Steve Boyd
362cb05029 Merge branch '3.4' into 3 2021-03-20 10:03:18 +13:00
Steve Boyd
5bda1a7076 Merge branch '3.3' into 3.4 2021-03-20 09:58:21 +13:00
Garion Herman
175664d5a8
Merge pull request #320 from creative-commoners/pulls/3.4/jquery-yarn
ENH Use yarn and webpack to upgrade jquery
2021-03-04 17:29:12 +13:00
Steve Boyd
3b37fdb1ae ENH Use yarn and webpack to upgrade jquery 2021-03-04 17:05:29 +13:00
Steve Boyd
fb15ba7d43
Update build status badge 2021-01-21 16:32:17 +13:00
Garion Herman
06b243b1e4
Merge pull request #316 from creative-commoners/pulls/3.3/shared-config
MNT Use shared travis config, use sminnee/phpunit
2021-01-18 10:30:53 +13:00
Steve Boyd
668f90d2f9 Merge branch '3.4' into 3 2021-01-02 19:42:12 +13:00
Maxime Rainville
867d0e8281
Merge pull request #318 from creative-commoners/pulls/3.4/travis-shared
MNT Travis shared config, use sminnee/phpunit
2020-12-21 14:46:25 +13:00
Steve Boyd
c065d0c5de MNT Travis shared config, use sminnee/phpunit 2020-12-01 20:34:24 +13:00
Steve Boyd
739b211afb ENH Update translations 2020-11-18 12:56:01 +13:00
Garion Herman
d12a71ddff
Merge pull request #311 from silverstripe/dependabot/npm_and_yarn/node-sass-4.14.1
Bump node-sass from 4.13.0 to 4.14.1
2020-11-17 10:42:35 +13:00
Steve Boyd
c834e19631 MNT Use shared travis config, use sminnee/phpunit 2020-11-16 15:24:51 +13:00
dependabot[bot]
a8d1cf1355
Bump node-sass from 4.13.0 to 4.14.1
Bumps [node-sass](https://github.com/sass/node-sass) from 4.13.0 to 4.14.1.
- [Release notes](https://github.com/sass/node-sass/releases)
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/node-sass/compare/v4.13.0...v4.14.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-04 10:37:02 +00:00
Garion Herman
f5f6e8f08f
Merge pull request #309 from silverstripe/dependabot/npm_and_yarn/elliptic-6.5.3
Bump elliptic from 6.5.1 to 6.5.3
2020-08-19 16:33:48 +12:00
dependabot[bot]
8bc492bb77
Bump elliptic from 6.5.1 to 6.5.3
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.1 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.1...v6.5.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-30 14:08:55 +00:00
dependabot[bot]
68ec979987
Merge pull request #308 from silverstripe/dependabot/npm_and_yarn/npm-6.14.7 2020-07-22 10:37:41 +00:00
dependabot[bot]
f91b13ad96
Bump npm from 6.13.4 to 6.14.7
Bumps [npm](https://github.com/npm/cli) from 6.13.4 to 6.14.7.
- [Release notes](https://github.com/npm/cli/releases)
- [Changelog](https://github.com/npm/cli/blob/v6.14.7/CHANGELOG.md)
- [Commits](https://github.com/npm/cli/compare/v6.13.4...v6.14.7)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-21 20:23:55 +00:00
dependabot[bot]
6972da84a6
Merge pull request #306 from silverstripe/dependabot/npm_and_yarn/npm-registry-fetch-4.0.5 2020-07-21 20:22:31 +00:00
dependabot[bot]
99b2ed4dfc
Merge pull request #307 from silverstripe/dependabot/npm_and_yarn/lodash-4.17.19 2020-07-21 20:22:23 +00:00
dependabot[bot]
1e9d8fcd1b
Bump lodash from 4.17.15 to 4.17.19
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-16 22:42:39 +00:00
dependabot[bot]
bcbc58f46e
Bump npm-registry-fetch from 4.0.2 to 4.0.5
Bumps [npm-registry-fetch](https://github.com/npm/registry-fetch) from 4.0.2 to 4.0.5.
- [Release notes](https://github.com/npm/registry-fetch/releases)
- [Changelog](https://github.com/npm/npm-registry-fetch/blob/latest/CHANGELOG.md)
- [Commits](https://github.com/npm/registry-fetch/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-08 00:40:27 +00:00
Steve Boyd
e88c7d5154
Merge pull request #301 from torleif/patch-1
FIX Broken action checkboxes
2020-07-03 11:23:50 +12:00
Maxime Rainville
edfb9d7b74 Merge branch '3.3' into 3 2020-06-12 14:15:04 +12:00
Maxime Rainville
932ef5d284 Merge branch '3.2' into 3.3 2020-06-12 14:14:32 +12:00
torleif
82c817c452
Fixes #300 2020-04-20 09:40:57 +12:00
Robbie Averill
aaa9328a72
Merge pull request #299 from silverstripe/dependabot/npm_and_yarn/npm-6.13.4
Bump npm from 6.13.0 to 6.13.4
2019-12-13 14:05:12 -08:00
dependabot[bot]
e2db114158
Bump npm from 6.13.0 to 6.13.4
Bumps [npm](https://github.com/npm/cli) from 6.13.0 to 6.13.4.
- [Release notes](https://github.com/npm/cli/releases)
- [Changelog](https://github.com/npm/cli/blob/latest/CHANGELOG.md)
- [Commits](https://github.com/npm/cli/compare/v6.13.0...v6.13.4)

Signed-off-by: dependabot[bot] <support@github.com>
2019-12-13 20:02:32 +00:00
Garion Herman
cfdffb394a Merge branch '3.3' into 3 2019-11-18 12:13:59 +13:00
Garion Herman
d0b6181b48 Update config for 3.3 / CMS 4.5 branches 2019-11-18 12:12:58 +13:00