Commit Graph

616 Commits

Author SHA1 Message Date
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
Andre Kiste
ce450103ac
Merge pull request #298 from creative-commoners/pulls/3/upgrade-dependnecies
Restore empty comments.css file
2019-11-12 12:26:55 +13:00
Maxime Rainville
05c5cb64a7 Restore empty comments.css file 2019-11-12 11:53:35 +13:00
Andre Kiste
408845b01a
Merge pull request #297 from creative-commoners/pulls/3/upgrade-dependnecies
Upgrade dependencies and build settings
2019-11-12 11:42:30 +13:00
Maxime Rainville
85374a1f76 Upgrade dependencies and build settings 2019-11-11 12:18:54 +13:00
Dylan Wagstaff
07b24073dd
Merge pull request #295 from silverstripe/dependabot/npm_and_yarn/mixin-deep-1.3.2
Bump mixin-deep from 1.3.1 to 1.3.2
2019-10-04 10:55:56 +13:00
dependabot[bot]
250e522887
Bump mixin-deep from 1.3.1 to 1.3.2
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
2019-10-03 21:09:03 +00:00
Dylan Wagstaff
9d9ab35cc6
Merge pull request #294 from AdamSawoscianik/patch-1
Update Installing.md
2019-10-04 10:07:48 +13:00
AdamSawoscianik
d5b9a2818c
Update Installing.md
Adding information about $CommentsForm tag to help people with this module.
2019-10-03 10:32:22 +02:00
Guy Marriott
e21a09234a
Update translations 2019-08-20 16:37:58 +12:00
Jason Irish
fbfead9c9e BUGFIX CommentAdmin implements PermissionProvider
fixes #288
2019-08-15 09:50:36 +12:00
Will Rossiter
b3fe6d82b4 Add legacy YAML for upgrading 2019-08-15 09:50:27 +12:00
Heath Dunlop
617501efed comments extension filters on Parent Class
This allows both pages and DataObjects to have comments without the ParentID clashing and showing comments on a page where the ParentID is the Same as a DataObjects or even two DataObjects having the sameID
2019-08-15 09:50:19 +12:00
Robbie Averill
f4c82f238e
Merge pull request #292 from jsirish/bugfix/adminPermissionProvider
BUGFIX CommentAdmin implements PermissionProvider
2019-07-15 22:03:28 +01:00
Jason Irish
c0f0c99e56 BUGFIX CommentAdmin implements PermissionProvider
fixes #288
2019-07-15 12:02:50 -05:00
Dylan Wagstaff
f8eeeee4b8
Merge pull request #290 from GOVTNZ/pulls/legacy
Add legacy YAML for upgrading
2019-07-03 12:47:47 +12:00
Will Rossiter
cad9369f7b
Add legacy YAML for upgrading 2019-07-03 11:40:42 +12:00
Robbie Averill
c16ca56408
Merge pull request #289 from creative-commoners/pulls/3.2/focus-comment-submission-message
NEW Add tabindex="-1" to comment submission message for a11y support
2019-06-28 16:15:27 +12:00