Commit Graph

153 Commits

Author SHA1 Message Date
Kristof De Langhe
b2ef5ee2fa Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates
Conflicts:
	package.json
	resources/i18n/en.json5
	src/app/+item-page/item-page.module.ts
	src/app/core/core.module.ts
	src/app/core/data/bundle-data.service.ts
	src/app/core/data/data.service.spec.ts
	src/app/core/data/data.service.ts
	src/app/core/data/item-data.service.ts
	src/app/core/data/object-updates/object-updates.service.ts
	src/app/core/shared/hal-endpoint.service.ts
	src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
	src/app/shared/mocks/mock-request.service.ts
	src/app/shared/shared.module.ts
	src/app/shared/trackable/abstract-trackable.component.ts
	yarn.lock
2020-01-24 14:21:20 +01:00
Giuseppe Digilio
d47a8fc572 commit yarn.lock 2020-01-13 11:14:49 +01:00
Giuseppe Digilio
ec9e0407df Merge branch 'dependabot/npm_and_yarn/handlebars-4.5.3' into upgrade-angular-7 2020-01-13 10:45:43 +01:00
dependabot[bot]
ebe64c2dcc 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>
2020-01-06 16:18:15 +00:00
Giuseppe Digilio
daeb475eb6 upgrade angulartics lib version 2020-01-02 10:47:27 +01:00
Giuseppe Digilio
ee8293978f Merge remote-tracking branch 'remotes/origin/master' into upgrade-angular-7
# Conflicts:
#	src/app/core/services/route.service.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
#	src/app/shared/form/builder/form-builder.service.ts
#	src/app/shared/object-list/object-list.component.spec.ts
#	src/app/submission/submission.service.ts
2019-12-24 15:57:06 +01:00
Giuseppe Digilio
62b555beee fixed vulnerabilty with serialize-javascript 2019-12-19 18:22:35 +01:00
Giuseppe Digilio
8ecb215105 Updated yarn.lock 2019-12-19 14:41:13 +01:00
Giuseppe Digilio
8df0591272 upgrade library dependencies to angular 7 2019-12-17 13:05:24 +01:00
lotte
c54faf69b1 Merge branch 'master' into clean-relationships-in-submission 2019-12-16 10:45:21 +01:00
Marie Verdonck
0b368e8c25 Merge remote-tracking branch 'upstream/master' into w2p-66391_ComCol-Tree---PR-Feedback 2019-12-04 14:09:04 +01:00
Art Lowel
8c2e63c2a7 fix issue where font urls in scss slow down the build 2019-11-27 14:55:18 +01:00
Marie Verdonck
4feba32157 65528: ComCol Tree with full FlatList that gets generated at page-load 2019-11-26 17:18:03 +01:00
lotte
168e74d1fa Merge branch 'master' into clean-relationships-in-submission 2019-11-25 11:18:57 +01:00
Marie Verdonck
3550cb9073 i18n-sync-files script 2019-11-15 09:59:32 +01:00
lotte
d8a049c550 Merge branch 'w2p-65195_dynamic-component-refactoring' into clean-relationships-in-submission 2019-11-08 13:55:08 +01:00
Antoine Snyers
bbb2570f87 Update webdriver-manager library 2019-10-30 14:13:47 +01:00
Kristof De Langhe
5e6082c1c7 65717: cdk install, table layout to divs, dragging support (no implementation yet) 2019-10-22 15:58:41 +02:00
lotte
f79e210959 Merge branch 'w2p-65195_dynamic-component-refactoring' into clean-relationships-in-submission 2019-10-17 12:49:22 +02:00
Art Lowel
d088f0a504 update set-value to fix CVE-2019-10747 2019-09-16 18:35:17 +02:00
Art Lowel
b4d5bff1e6 update set-value to fix CVE-2019-10747 2019-09-16 18:28:40 +02:00
dependabot[bot]
95005ef110 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-09-16 15:36:17 +00:00
lotte
4d67c98f04 Merge branch 'master' into w2p-62849_relationships-in-submission 2019-08-27 16:41:37 +02:00
Art Lowel
44aabe19d7 Merge branch 'master' into improve-i18n-files 2019-08-08 13:50:10 +02:00
Art Lowel
73f67827f3 upgrade dependencies to prevent CVE-2019-10744, CVE-2019-13173, CVE-2018-14732, CVE-2018-16469, CVE-2018-1000620, CVE-2019-10744 and WS-2018-0236 2019-08-05 18:23:27 +02:00
Art Lowel
0b4379abad Merge pull request #431 from DSpace/dependabot/npm_and_yarn/lodash.mergewith-4.6.2
Bump lodash.mergewith from 4.6.1 to 4.6.2
2019-08-02 17:23:59 +02:00
Art Lowel
2e4b9d7811 Merge pull request #422 from DSpace/dependabot/npm_and_yarn/ecstatic-3.3.2
Bump ecstatic from 3.2.2 to 3.3.2
2019-08-02 17:23:26 +02:00
Art Lowel
00858ae013 Merge pull request #415 from DSpace/dependabot/npm_and_yarn/handlebars-4.1.2
Bump handlebars from 4.0.11 to 4.1.2
2019-08-02 17:23:05 +02:00
Art Lowel
aed3e5ae46 Merge pull request #414 from DSpace/dependabot/npm_and_yarn/js-yaml-3.13.1
Bump js-yaml from 3.12.0 to 3.13.1
2019-08-02 17:22:44 +02:00
Art Lowel
3e8b12cb91 Merge pull request #412 from DSpace/dependabot/npm_and_yarn/pem-1.13.2
Bump pem from 1.12.3 to 1.13.2
2019-08-02 17:21:57 +02:00
Art Lowel
16b8184dad patch protractor with the latest webdriver-manager 2019-08-01 13:54:34 +02:00
Art Lowel
359cb10fa3 add json5 support 2019-07-26 17:21:57 +02:00
lotte
650b77081f Merge branch 'master' into w2p-62849_relationships-in-submission 2019-07-26 10:01:50 +02:00
dependabot[bot]
d20962e5cd Bump lodash.mergewith from 4.6.1 to 4.6.2
Bumps [lodash.mergewith](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2019-07-11 09:18:53 +00:00
lotte
7653558cc0 fixed URL polyfill issue 2019-07-09 13:34:36 +02:00
lotte
96959b401c added new input field type and started on lookup modal 2019-06-26 16:46:15 +02:00
lotte
0746aaed43 added JSON response, created new submission section 2019-06-25 16:35:26 +02:00
dependabot[bot]
cc7374351d Bump ecstatic from 3.2.2 to 3.3.2
Bumps [ecstatic](https://github.com/jfhbrook/node-ecstatic) from 3.2.2 to 3.3.2.
- [Release notes](https://github.com/jfhbrook/node-ecstatic/releases)
- [Changelog](https://github.com/jfhbrook/node-ecstatic/blob/3.3.2/CHANGELOG.md)
- [Commits](https://github.com/jfhbrook/node-ecstatic/compare/3.2.2...3.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
2019-06-07 21:31:28 +00:00
lotte
1753d55d77 Merge branch 'master' into selectable-themes
Conflicts:
	src/app/core/core.effects.ts
2019-06-06 15:35:18 +02:00
dependabot[bot]
0040ff2920 Bump handlebars from 4.0.11 to 4.1.2
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.0.11 to 4.1.2.
- [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.0.11...v4.1.2)

Signed-off-by: dependabot[bot] <support@github.com>
2019-06-06 09:40:03 +00:00
Art Lowel
2008c8bc92 Revert "always use forward slashes in relative theme paths"
This reverts commit 7fbde900
2019-06-06 09:28:28 +02:00
dependabot[bot]
072537968f Bump js-yaml from 3.12.0 to 3.13.1
Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.12.0 to 3.13.1.
- [Release notes](https://github.com/nodeca/js-yaml/releases)
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodeca/js-yaml/compare/3.12.0...3.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
2019-06-06 04:38:52 +00:00
Art Lowel
7fbde90095 always use forward slashes in relative theme paths 2019-06-05 18:53:24 +02:00
Art Lowel
fac7cc266e remove dependency on replace-in-file 2019-06-05 17:17:53 +02:00
dependabot[bot]
99b43e0a4e Bump pem from 1.12.3 to 1.13.2
Bumps [pem](https://github.com/Dexus/pem) from 1.12.3 to 1.13.2.
- [Release notes](https://github.com/Dexus/pem/releases)
- [Changelog](https://github.com/Dexus/pem/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Dexus/pem/compare/v1.12.3...v1.13.2)
2019-06-04 15:47:28 +00:00
Art Lowel
d93173e8d2 add syncbuilddir step to aot build 2019-05-31 09:44:49 +02:00
dependabot[bot]
1f9e014df0 Bump webpack-bundle-analyzer from 2.13.1 to 3.3.2
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 2.13.1 to 3.3.2.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases)
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v2.13.1...v3.3.2)
2019-05-30 11:02:34 +00:00
Art Lowel
da4115f122 fix issues following rebase 2019-05-28 16:21:02 +02:00
lotte
8a32777802 finished webpack config for switching themes 2019-05-28 14:18:56 +02:00
lotte
22928c3f23 intermediate theming commit 2019-05-28 13:53:12 +02:00