Commit Graph

251 Commits

Author SHA1 Message Date
Steve Boyd
eef72506e1 Merge branch '2.4' into 2 2020-11-11 17:45:54 +13:00
Serge Latyntsev
e5ba6caf74
Merge pull request #174 from creative-commoners/pulls/2.4/shared-config
MNT Use shared travis config, use sminnee/phpunit
2020-11-11 11:41:16 +13:00
Steve Boyd
c06430068c MNT Use shared travis config, use sminnee/phpunit 2020-11-10 15:37:53 +13:00
Maxime Rainville
ccca22c6fa Merge branch '2.4' into 2 2020-10-22 13:41:47 +13:00
dependabot[bot]
5c5a8f605a
Merge pull request #168 from silverstripe/dependabot/npm_and_yarn/elliptic-6.5.3 2020-09-04 00:02:41 +00:00
Sam Minnée
c50f461a78
Merge pull request #165 from open-sausages/pulls/fix-list-values
FIX Preselect based on SS_List values
2020-08-12 13:32:50 +12:00
dependabot[bot]
2af34223aa
Bump elliptic from 6.5.0 to 6.5.3
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.0 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.0...v6.5.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-30 20:43:55 +00:00
dependabot[bot]
ea1b4c26ab
Merge pull request #167 from silverstripe/dependabot/npm_and_yarn/npm-6.14.7 2020-07-22 10:37:50 +00:00
dependabot[bot]
7a43f3af36
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/latest/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:26:46 +00:00
dependabot[bot]
d1c6d35bd1
Merge pull request #164 from silverstripe/dependabot/npm_and_yarn/npm-registry-fetch-4.0.5 2020-07-21 20:25:01 +00:00
dependabot[bot]
69f61a5f88
Merge pull request #166 from silverstripe/dependabot/npm_and_yarn/lodash-4.17.19 2020-07-21 20:24:55 +00:00
dependabot[bot]
4c7174d9b7
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-17 11:06:37 +00:00
Ingo Schommer
70d80920d7 FIX Preselect based on SS_List values 2020-07-16 17:45:04 +12:00
Ingo Schommer
2c0c712b59 Remove cms dependance in unit tests 2020-07-16 09:35:15 +12:00
dependabot[bot]
b1a278303c
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-07 21:36:31 +00:00
Guy Marriott
66aa1af72a
Merge pull request #162 from tractorcow/pulls/fix-react 2020-07-06 16:55:48 -07:00
Damian Mooyman
748ef1a8f0
Actually save the values 2020-07-06 14:36:17 +12:00
Damian Mooyman
2790d7504a
PHP 5 compatibility 🙄 2020-07-06 14:33:09 +12:00
Damian Mooyman
5decfa39e1
Merge remote-tracking branch 'origin/2.4' into pulls/fix-react 2020-07-06 14:18:12 +12:00
Damian Mooyman
a61612ec4b
BUG Resolve issue with react select values not being saved
Fixes #150
2020-07-06 14:17:08 +12:00
dependabot[bot]
28812fcae1
Merge pull request #159 from silverstripe/dependabot/npm_and_yarn/websocket-extensions-0.1.4 2020-06-30 23:12:53 +00:00
Steve Boyd
c6a387f5f5 Use travis node version 10 2020-06-18 14:27:54 +12:00
Steve Boyd
2830b221f1 Merge branch '2.4' into 2 2020-06-18 13:38:00 +12:00
Daniel Hensby
3f6af1ab17
Merge pull request #160 from sminnee/fix-readonly-titlefield
FIX: Fix readonly transformation of field with setTitleField()
2020-06-17 09:04:35 +01:00
Sam Minnee
d11b9474ed FIX: Fix readonly transformation of field with setTitleField()
If the title field was customised, this metadata was lost during a
readonly transformation. This can cause fatal errors in read-only views
such as history browsing.
2020-06-17 16:40:57 +12:00
Maxime Rainville
9f11be6a04 Merge branch '2.4' into 2 2020-06-12 14:26:28 +12:00
dependabot[bot]
ee7f71b753
Bump websocket-extensions from 0.1.3 to 0.1.4
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-07 02:05:58 +00:00
Guy Marriott
3b6ec92e66
Merge pull request #158 from christopherdarling/patch-1 2020-05-06 12:28:42 -07:00
Christopher Darling
c538a231b7
FIX $record->hasMethod() should be called before getting the relation 2020-05-06 19:45:41 +01:00
Robbie Averill
1e453c0e0f
Merge pull request #157 from silverstripe/dependabot/npm_and_yarn/jquery-3.5.0
Bump jquery from 3.4.1 to 3.5.0
2020-05-04 16:53:22 -07:00
dependabot[bot]
9e66d61fa4
Bump jquery from 3.4.1 to 3.5.0
Bumps [jquery](https://github.com/jquery/jquery) from 3.4.1 to 3.5.0.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.4.1...3.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-04-30 07:14:51 +00:00
Garion Herman
eaaf467d28 Merge branch '2.4' into 2 2020-02-13 16:18:01 +13:00
Garion Herman
01e7f457a6 Merge branch '2.3' into 2.4 2020-02-13 15:42:44 +13:00
Garion Herman
2620218fe4 Merge branch '2.2' into 2.3 2020-02-13 15:28:42 +13:00
Garion Herman
b7a2b3b1d7 Merge branch '2.1' into 2.2 2020-02-13 15:18:32 +13:00
Guy Marriott
09df859091
Merge pull request #155 from silverstripe/dependabot/npm_and_yarn/handlebars-4.5.3
Bump handlebars from 4.1.2 to 4.5.3
2020-01-02 11:36:26 -08:00
dependabot[bot]
54cbb3e14a
Bump handlebars from 4.1.2 to 4.5.3
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.2 to 4.5.3.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.1.2...v4.5.3)

Signed-off-by: dependabot[bot] <support@github.com>
2019-12-28 17:45:15 +00:00
Robbie Averill
fd66043d1f
Merge pull request #154 from silverstripe/dependabot/npm_and_yarn/npm-6.13.4
Bump npm from 6.10.2 to 6.13.4
2019-12-13 13:44:10 -08:00
dependabot[bot]
410c35d9a2
Bump npm from 6.10.2 to 6.13.4
Bumps [npm](https://github.com/npm/cli) from 6.10.2 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.10.2...v6.13.4)

Signed-off-by: dependabot[bot] <support@github.com>
2019-12-13 19:12:49 +00:00
Robbie Averill
f67cd979f2 Merge branch '2.4' 2019-08-15 09:57:07 +12:00
Robbie Averill
ec0d65904d Remove obsolete branch alias 2019-08-15 09:56:39 +12:00
Robbie Averill
58edb12fa3
Merge pull request #120 from wilr/fixes/107-tagfield-in-admin
Setup TagField to work within AssetAdmin (Fixes #107)
2019-07-25 09:03:18 +02:00
Robbie Averill
804c6bac2f
Run automated phpcs linting 2019-07-25 12:27:29 +12:00
Guy Marriott
bd84139b96
Code clean-up 2019-07-25 12:23:04 +12:00
Guy Marriott
61d3d04ed6
FIX Removing potentially breaking lower-case change (and fix tests) 2019-07-25 12:13:52 +12:00
Guy Marriott
a1c57f664d
FIX redux-form can now control tag fields
This also fixes an issue where tags would be created and tags could not have the same name as the ID of an existing tag
And the react-select module is updated to the (current) latest 1.x version
And the tests are now working again after updating jest
2019-07-25 12:13:52 +12:00
Guy Marriott
e97a82f0b7
FIX Ensure tagfield is compatible with both React and Entwine contexts 2019-07-25 12:13:50 +12:00
Will Rossiter
068e4c6a26
Setup TagField to work within AssetAdmin (Fixes #107) 2019-07-25 12:13:44 +12:00
Ingo Schommer
bc7404005b
Add screenshot to readme 2019-07-04 09:11:50 +12:00
Ingo Schommer
461d467e3f
Added screenshot 2019-07-04 09:11:11 +12:00