Commit Graph

1779 Commits

Author SHA1 Message Date
Lotte Hofstede
74cc699252 Merge branch 'master' into embedded-objects-fixes
Conflicts:
	src/app/core/cache/builders/remote-data-build.service.ts
2018-05-28 10:43:47 +02:00
Lotte Hofstede
0ad4edb523 small css fixes 2018-05-28 10:05:52 +02:00
LotteHofstede
a99402c6b6 Changed workaround comment for clarification 2018-05-25 13:05:47 +02:00
Kristof De Langhe
8bb091b2ae Notifications each on their own line 2018-05-25 12:58:17 +02:00
Lotte Hofstede
0bcc8ee007 finished embedded object fixes 2018-05-25 12:48:00 +02:00
Kristof De Langhe
4e74530a21 50632: Increased page size for bitstream-format and metadata-registry 2018-05-25 10:12:45 +02:00
Giuseppe Digilio
7d8324d701 Test to fix travis build issue 2018-05-24 11:34:28 +02:00
Giuseppe Digilio
37e7d96eb3 Test to fix travis build issue 2018-05-24 10:28:59 +02:00
Giuseppe Digilio
b427b4846a Renamed isMobileView() into isXsOrSm() 2018-05-23 18:55:20 +02:00
Giuseppe Digilio
e0efa5f8e5 changes based on review comments 2018-05-23 18:13:34 +02:00
Kristof De Langhe
c5b05a2553 Merge branch 'master' into w2p-50632_Replace-mock-registry-service-with-implementation
Conflicts:
	src/app/core/core.module.ts
2018-05-22 13:41:40 +02:00
Giuseppe Digilio
4a697c09f6 Merge remote-tracking branch 'remotes/origin/master' into authentication
# Conflicts:
#	src/app/core/core.module.ts
2018-05-21 17:22:45 +02:00
Giuseppe Digilio
95d6527e31 Fixes 2018-05-21 17:06:38 +02:00
Tim Donohue
43380732de Merge pull request #268 from atmire/browse-entries
Fetching and parsing browse entries
2018-05-18 10:17:14 -05:00
Lotte Hofstede
2a8de6dc49 another intermediate commit 2018-05-18 16:34:04 +02:00
Art Lowel
7c392f316d fixed lint error 2018-05-18 16:00:59 +02:00
Art Lowel
a0851884e6 Added more tests 2018-05-18 15:54:05 +02:00
Kristof De Langhe
c9c2e70c00 request.effects.ts pipeable operators error fix 2018-05-18 10:09:47 +02:00
Kristof De Langhe
184d47bb41 request.effects.ts pipeable operators fine-tuning 2018-05-17 17:56:06 +02:00
Kristof De Langhe
f03126b550 request.effects.ts pipeable operators 2018-05-17 17:38:28 +02:00
Lotte Hofstede
ca8c1830aa intermediate commit 2018-05-17 17:10:38 +02:00
Art Lowel
44b031a234 #255 Fetching and parsing browse entries 2018-05-17 14:52:09 +02:00
Giuseppe Digilio
d43d36513e Fixed auth.effects.spec 2018-05-17 11:16:27 +02:00
Giuseppe Digilio
f66dd32658 Added tests 2018-05-17 11:05:26 +02:00
Giuseppe Digilio
10c739c903 Merge remote-tracking branch 'remotes/origin/master' into dynamic_forms 2018-05-16 16:53:37 +02:00
Giuseppe Digilio
240e1ee0af Merge remote-tracking branch 'remotes/origin/master' into authentication 2018-05-16 16:41:22 +02:00
Giuseppe Digilio
f34490db71 Added tests 2018-05-16 16:00:43 +02:00
Tim Donohue
fdd9746f64 Merge pull request #263 from the-library-code/262
Set ip and port by an env variable.
2018-05-15 15:44:14 -05:00
Tim Donohue
b1d3d4f7d5 Remove unnecessary "as ServerConfig" statements 2018-05-15 15:14:23 -05:00
Giuseppe Digilio
1e4bc0563a Merge remote-tracking branch 'remotes/origin/master' into dynamic_forms
# Conflicts:
#	src/app/app.reducer.ts
#	src/app/core/core.module.ts
#	src/app/shared/shared.module.ts
2018-05-15 18:44:51 +02:00
Giuseppe Digilio
e0ac7ea045 Fixed test 2018-05-15 18:40:59 +02:00
Giuseppe Digilio
b3e62b428b Fixed tests 2018-05-15 18:26:41 +02:00
Giuseppe Digilio
4fc76139b9 Added tests 2018-05-15 18:12:35 +02:00
Giuseppe Digilio
989a405947 Fixed merge 2018-05-15 17:14:39 +02:00
Giuseppe Digilio
478cbaf57c Merge remote-tracking branch 'remotes/origin/master' into authentication
# Conflicts:
#	src/app/app.effects.ts
#	src/app/app.module.ts
#	src/app/app.reducer.ts
#	src/app/core/core.module.ts
#	src/app/shared/shared.module.ts
2018-05-15 17:01:26 +02:00
Giuseppe Digilio
27a36362cf Added tests 2018-05-15 16:54:27 +02:00
Kristof De Langhe
cdf707bfea Notification style fix 2018-05-15 11:34:45 +02:00
Lotte Hofstede
95060ee573 almost finished date widget 2018-05-15 11:03:18 +02:00
Giuseppe Digilio
88a05996a6 Added tests 2018-05-14 18:45:04 +02:00
Art Lowel
f21b3e390e Merge pull request #267 from Georgetown-University-Libraries/mock-admin-guard
Mock AdminGuard
2018-05-14 18:31:38 +02:00
Michael Marttila
b60373e290 Add MockAdminGuard as provider 2018-05-14 11:25:35 -04:00
Michael Marttila
0827208c58 Spacing style fix 2018-05-14 09:39:00 -04:00
Michael Marttila
b53b7fdfb8 Add MockAdminGuard 2018-05-14 09:06:06 -04:00
Pascal-Nicolas Becker
c6557ca317 Set a few configuration options an env variables.
For docker containers it would be useful if any configuration variables
defining how to connect to the angular ui and how it connects to the
DSpace 7 REST endpoint could be overriden by environment variables. We
should not extend configuration by environment variables too much.
2018-05-11 18:52:00 +02:00
Art Lowel
c712ae789e Merge pull request #243 from 4Science/notifications
This PR closes #160
2018-05-11 18:24:26 +02:00
Giuseppe Digilio
1609a06a43 made sure that content and title notification are not interpreted as html 2018-05-11 16:19:59 +02:00
Giuseppe Digilio
7a4f15c3e0 turned the html field in to a boolean 2018-05-11 13:57:31 +02:00
Giuseppe Digilio
876dba2892 Added tests 2018-05-10 17:24:09 +02:00
Giuseppe Digilio
a114650564 fixes and adjustments 2018-05-09 19:23:09 +02:00
Giuseppe Digilio
7a32d18b1b Merged dynamic form module 2018-05-09 12:14:18 +02:00