Commit Graph

3903 Commits

Author SHA1 Message Date
Giuseppe Digilio
5421d97bc5 Merge remote-tracking branch 'remotes/origin/master' into authentication_issue_CSR 2020-05-28 09:23:22 +02:00
Giuseppe Digilio
a57d5d7c4f Merge remote-tracking branch 'remotes/origin/master' into #601-resource-policies 2020-05-28 09:22:11 +02:00
lotte
a9cb6aeaa6 added doc to scripts 2020-05-28 09:15:02 +02:00
lotte
f881c2f428 fixed SSR issues 2020-05-28 09:15:01 +02:00
lotte
e7043f8734 changes to server.ts 2020-05-28 09:15:01 +02:00
lotte
e4a83f0704 fixed ui environment vars issue 2020-05-28 09:15:01 +02:00
Tim Donohue
780b8b7db9 Merge pull request #690 from tdonohue/fix_travis_e2e
Quick fix to Travis e2e testing issues (running against a Docker backend)
2020-05-27 17:00:16 -05:00
Tim Donohue
92b1a4477d Fix Docker local.cfg by correcting UI port to 4000 2020-05-27 15:54:33 -05:00
Reeta Kuuskoski
5f6fdf00ec Add Finnish translations (first set after master rebase) 2020-05-25 12:56:34 +03:00
Giuseppe Digilio
460e20284e fixed test 2020-05-22 16:50:48 +02:00
Giuseppe Digilio
b61490341e Added missing class in the authentication form to apply style properly 2020-05-22 16:50:06 +02:00
Giuseppe Digilio
4a65051641 Fixed issue with authentication when SSR is disabled 2020-05-22 16:48:51 +02:00
Giuseppe Digilio
1dde3087ff Fixed failed test 2020-05-22 11:36:02 +02:00
Giuseppe Digilio
c5bf8f6267 Merge remote-tracking branch 'remotes/origin/master' into #601-resource-policies
# Conflicts:
#	src/app/shared/shared.module.ts
2020-05-21 19:35:35 +02:00
Tim Donohue
5c7cd4a27d Merge pull request #653 from atmire/Login-as-EPerson
Login as EPerson
2020-05-21 10:10:04 -05:00
Giuseppe Digilio
b41acfdb33 Moved resource policy's group edit link 2020-05-21 12:21:08 +02:00
Giuseppe Digilio
8ef77df651 Fixed issue with resource policies list that was not updated after a delete 2020-05-21 12:19:24 +02:00
Giuseppe Digilio
51620df76c Fixed issue with item edit page 2020-05-21 12:18:17 +02:00
Giuseppe Digilio
09ee329f17 Fixed failed test 2020-05-21 12:17:37 +02:00
Giuseppe Digilio
e1716751d4 Fixed build error 2020-05-20 18:10:17 +02:00
Giuseppe Digilio
b70f8e12f6 Fixed merge with master 2020-05-20 17:05:54 +02:00
Giuseppe Digilio
b5d92590ee Merge remote-tracking branch 'remotes/origin/master' into #601-resource-policies
# Conflicts:
#	src/app/core/eperson/eperson-data.service.spec.ts
#	src/app/core/eperson/group-data.service.spec.ts
#	src/app/shared/shared.module.ts
#	src/app/submission/sections/upload/section-upload.component.spec.ts
2020-05-20 15:37:33 +02:00
Kristof De Langhe
ad26ececbf Merge branch 'master' into Login-as-EPerson
Conflicts:
	src/app/shared/shared.module.ts
2020-05-19 10:01:10 +02:00
Tim Donohue
b28f59f087 Merge pull request #676 from bram-atmire/sync-i18n-fix
Ensuring environment.ts is present before sync-i18n-files invocation
2020-05-18 10:21:51 -05:00
Bram Luyten
03f910b45d Ensuring environment.ts is present before sync-i18n-files invocation 2020-05-18 15:52:16 +02:00
Tim Donohue
64478870c0 Merge pull request #650 from atmire/w2p-70136_workflow-search-ui
Administer Workflow
2020-05-14 10:22:59 -05:00
Kristof De Langhe
3894b3615d 70373: Test import fix 2020-05-12 17:20:02 +02:00
lotte
03668e347e added missing typedoc 2020-05-12 17:03:48 +02:00
Kristof De Langhe
f548d5bf20 Merge branch 'master' into Login-as-EPerson
Conflicts:
	src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
	src/app/core/auth/auth.service.spec.ts
	src/app/profile-page/profile-page.component.spec.ts
2020-05-12 16:54:40 +02:00
Tim Donohue
33be8a4a91 Merge pull request #663 from atmire/resolve-tsconfig-errors-in-spec-files
[Quickfix] Fix IDE issues with spec files
2020-05-11 09:23:07 -05:00
lotte
a58d6da8e0 added jasmine to root tsconfig.json 2020-05-11 15:05:02 +02:00
lotte
6220c51aa6 fixed tests 2020-05-11 13:28:02 +02:00
lotte
e8f418b077 Merge branch 'master' into w2p-70136_workflow-search-ui 2020-05-11 11:58:31 +02:00
Art Lowel
bb0f28c9c4 Merge pull request #661 from atmire/fix-prod-server-port
Hotfix: use the server port from the environment file
2020-05-08 13:15:19 +02:00
Art Lowel
4580f1b18a use the server port from the environment file 2020-05-08 12:40:31 +02:00
Art Lowel
4fe2c75810 Merge pull request #625 from atmire/angular-cli
Switch to Angular CLI
2020-05-08 09:16:38 +02:00
lotte
b249a91aaa Merge branch 'master' into angular-cli 2020-05-07 16:11:38 +02:00
Bram Luyten
519046e769 i18n correction English catalog 2020-05-04 15:09:46 +02:00
Bram Luyten
3b30af3e4d i18n correcting two errors in English main catalog 2020-05-04 13:33:55 +02:00
Giuseppe Digilio
bacb778fa7 Fixed resource policy page buttons 2020-04-30 17:25:00 +02:00
Giuseppe Digilio
b338332d13 Added possibility to search for eperson or group while adding a new resource policy 2020-04-30 15:43:52 +02:00
lotte
84d9e4b063 removed debugger; line 2020-04-30 12:35:25 +02:00
lotte
4c48088920 fixed test issues and watch mode for unit tests 2020-04-30 12:13:41 +02:00
lotte
ef91468310 fixed set-env.ts, reverted unnecessary e2e changes, updated travis.yml 2020-04-29 16:28:26 +02:00
Art Lowel
df2cc22172 remove clearStateMetaReducer 2020-04-24 14:06:37 +02:00
Art Lowel
c2789dfbf7 fix issue where a hard refresh wouldn't work to clear the state due to the browser caching the html 2020-04-24 13:16:52 +02:00
Giuseppe Digilio
8635209959 Merge remote-tracking branch 'remotes/origin/master' into #601-resource-policies 2020-04-23 17:05:38 +02:00
lotte
7ec7d3a455 reinstated other tests 2020-04-23 14:30:46 +02:00
lotte
0f43ff4fea switched back to port 4000 2020-04-23 14:17:05 +02:00
lotte
f1d1761fd7 sync i18n script 2020-04-23 14:14:29 +02:00