hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 01:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,236 Commits 24 Branches 25 Tags
bcc6daa39fd65defc9d0a2f5fb1a7cb10e4f6acb
Commit Graph

123 Commits

Author SHA1 Message Date
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
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
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
lotte
5fa8fd2688 added different themes, issue with ngrx 2019-05-14 11:38:34 +02:00
Art Lowel
37e0afc2d5 upgrade morgan to 1.9.1 to fix CVE-2019-5413 2019-04-23 13:56:49 +02:00
Giuseppe Digilio
6556d4453d Merge remote-tracking branch 'remotes/origin/master' into submission 2019-03-29 15:22:15 +01:00
lotte
c4cbac44d8 Merge branch 'master' into performance-optimizations 
Conflicts:
	yarn.lock
 2019-03-29 08:54:24 +01:00
lotte
fc73fc1d3e optimizations links in facets 2019-03-20 16:57:55 +01:00
Art Lowel
cc5783082f webpack: replace deprecated LoaderOptionsPlugin with OptimizeCSSAssetsPlugin 2019-03-15 16:55:22 +01:00
lotte
6f55788f37 61116: bootstrap upgrade 2019-03-15 10:16:35 +01:00
lotte
42d1bdb3d8 Merge branch 'master' into w2p-54472_Create-community-and-collection-pages 
Conflicts:
	resources/i18n/en.json
	src/app/+community-page/community-page.component.html
	src/app/+community-page/community-page.module.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/core.module.ts
	src/app/core/index/index.effects.ts
	src/app/core/index/index.reducer.spec.ts
	src/app/core/index/index.reducer.ts
	src/app/header/header.component.spec.ts
 2018-12-20 15:59:23 +01:00
lotte
c839b55412 finishing touches to menu 2018-11-27 16:26:58 +01:00
lotte
0c4784346b progress vertical menu 2018-11-14 15:56:23 +01:00
Kristof De Langhe
b09fa0e8af Merge branch 'resolvers-branch-angular6' into w2p-54472_Create-community-and-collection-pages 
Conflicts:
	src/app/app.module.ts
 2018-10-29 13:15:18 +01:00
Art Lowel
7ada6c7b21 configure @ngrx/store-devtools 2018-10-22 11:35:22 +02:00
lotte
18a57b09c0 Merge branch 'resolvers-branch-angular6' into patch-support 2018-10-12 14:24:56 +02:00
lotte
5b71788a20 improved test compiling time 2018-10-12 14:24:41 +02:00
lotte
1928da8c32 Merge branch 'resolvers-branch-angular6' into patch-support 
Conflicts:
	src/app/core/auth/auth-response-parsing.service.spec.ts
	src/app/core/auth/auth.service.ts
	src/app/core/auth/models/auth-status.model.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/data/data.service.spec.ts
	src/app/core/data/data.service.ts
	src/app/core/data/dspace-object-data.service.ts
	src/app/core/data/item-data.service.spec.ts
	src/app/core/data/item-data.service.ts
	src/app/core/data/request.models.ts
	src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
	src/app/shared/mocks/mock-form-service.ts
	src/app/shared/mocks/mock-remote-data-build.service.ts
	src/app/shared/mocks/mock-store.ts
 2018-10-11 12:51:10 +02:00
lotte
e025f3bc4d Merge branch 'master' into resolvers-branch-angular6 
Conflicts:
	package.json
	src/app/+search-page/search-filters/search-filters.component.ts
	src/app/core/auth/auth.effects.ts
	src/app/core/auth/auth.service.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/data/comcol-data.service.ts
	src/app/core/data/community-data.service.ts
	src/app/core/data/data.service.ts
	src/app/core/data/item-data.service.ts
	src/app/core/shared/dspace-object.model.ts
	src/app/header/header.component.spec.ts
	src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
	src/app/shared/testing/auth-service-stub.ts
	yarn.lock
 2018-10-08 12:28:08 +02:00
Tim Donohue
5912c88791 Merge pull request #290 from atmire/authorization-issue 
Fix for authentication
 2018-09-27 14:16:11 -05:00
lotte
dc5747982b Merge remote-tracking branch 'atmire-internal/w2p-55565_authorization-issue' into patch-support 
Conflicts:
	package.json
	src/app/+search-page/search-filters/search-filters.component.ts
	src/app/core/auth/auth.effects.ts
	src/app/core/auth/auth.service.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/data/data.service.ts
	src/app/header/header.component.spec.ts
	src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
	src/app/shared/testing/auth-service-stub.ts
	yarn.lock
 2018-09-27 16:54:59 +02:00
Tim Donohue
9029231396 Update version of Bootstrap per CVE-2018-14041 2018-09-21 12:02:06 -05:00
lotte
97669d0c34 upgrade ngrx to fix store devtools bug 2018-09-17 10:20:12 +02:00
lotte
acb5f5197d patching changes 2018-09-11 16:05:21 +02:00
lotte
14f5c97ecc another intermediate commit 2018-09-06 11:55:13 +02:00
lotte
f11d486d14 updated angular/rxjs to v6 successfully 2018-08-31 15:40:39 +02:00
lotte
777facf5cd intermediate commit 2018-08-29 15:12:01 +02:00
lotte
2cbe6a6d91 upgrade to angular6 2018-08-24 13:26:43 +02:00
lotte
117a0cd3ff Merge branch 'master' into search-features 
Conflicts:
	package.json
	src/app/shared/shared.module.ts
	yarn.lock
 2018-08-02 14:21:28 +02:00
lotte
62e6fc2c79 Merge branch 'Notification-style-fix' into search-features-without-reassigning-observables 2018-07-25 14:16:37 +02:00
lotte
2e04b542b8 Merge branch 'w2p-49440_Date-widget' into w2p-49440_date-widget-for-search-features 
Conflicts:
	package.json
	src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
	src/app/+search-page/search-filters/search-filter/search-filter.component.html
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-page.module.ts
	src/app/shared/shared.module.ts
 2018-07-17 10:09:07 +02:00
Art Lowel
fd916501de fixed an issue where the server-side would crash if the page contained nouislider 2018-07-13 16:36:36 +02:00
Giuseppe Digilio
10d90e4325 Merge remote-tracking branch 'remotes/origin/master' into dynamic_forms 
# Conflicts:
#	resources/i18n/en.json
#	src/app/core/cache/response-cache.models.ts
#	src/app/core/data/request.models.ts
#	src/app/shared/shared.module.ts
#	src/styles/_custom_variables.scss
 2018-07-12 14:56:57 +02:00