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
3,823 Commits 24 Branches 25 Tags
09ee329f17435c79caf259bbdbbbd6c2a554dc29
Commit Graph

3823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
lotte
03668e347e added missing typedoc 2020-05-12 17:03:48 +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
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
lotte
ce9fed7507 fixing e2e:ci 2020-04-22 16:28:17 +02:00
lotte
51dd1b1b2b changing timeout 2020-04-22 16:07:22 +02:00
lotte
2caf88bebe reset env variables 2020-04-22 15:30:45 +02:00
lotte
2e367cb87c testing e2e on travis 2020-04-22 15:29:52 +02:00
lotte
2a353efa5f updated environment file 2020-04-22 07:44:29 +02:00
lotte
6196a99a98 fixed tests 2020-04-21 18:41:38 +02:00
lotte
ad4b7fa254 test travis with external rest 2020-04-21 16:39:51 +02:00
lotte
42740809c0 changed tasks into wfi's 2020-04-21 16:27:26 +02:00
lotte
172d3891f0 switched port to test with Travis 2020-04-21 15:16:42 +02:00
lotte
cad9dcaf98 Merge branch 'master' into angular-cli 2020-04-21 13:45:55 +02:00
lotte
267db6ddce updated dockers files 2020-04-21 13:41:30 +02:00
Tim Donohue
b7a57035c4 Merge pull request #651 from bram-atmire/2020-04-09-New-Message-Keys 
Extending catalogs with missing messages April 9th
dspace-7.0-beta2 		2020-04-17 10:34:15 -05:00
lotte
c4d02ff67d fixed import 2020-04-17 16:43:01 +02:00
lotte
37e4e63f81 fixed compilation issue with abstract component 2020-04-17 16:26:26 +02:00
lotte
bbac79bdfc fixes after merge 2020-04-17 16:09:26 +02:00
lotte
92dca8d4e8 Merge branch 'master' into angular-cli 2020-04-17 16:09:12 +02:00
Tim Donohue
c64760b0d3 Merge pull request #643 from atmire/Edit-Collection---Assign-Roles-Groups 
Edit collection - assign roles groups
 2020-04-16 11:37:46 -05:00
Giuseppe Digilio
c03146e415 Fixed resource policy's group edit link 2020-04-16 17:12:20 +02:00
Giuseppe Digilio
98ade2eb63 Fixed issue with merge 2020-04-15 16:35:29 +02:00
Giuseppe Digilio
4deaf145b6 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.ts
#	src/app/shared/testing/group-mock.ts
 2020-04-15 16:18:27 +02:00
Giuseppe Digilio
b81d8ed900 Added test for ResourcePolicyEditComponent 2020-04-15 16:13:38 +02:00
Giuseppe Digilio
4ac3eb5f9b Added test for ResourcePolicyCreateComponent 2020-04-15 16:13:22 +02:00
Giuseppe Digilio
83a1f9d31d Added test for EpersonGroupListComponent 2020-04-15 16:13:06 +02:00