Commit Graph

1008 Commits

Author SHA1 Message Date
lotte
2a53ad249f Merge branch 'w2p-49440_date-widget-for-search-features' into search-features 2018-07-18 15:40:12 +02:00
lotte
f8ef018713 test fix 2018-07-18 15:40:07 +02:00
lotte
05ba5edc7b Merge branch 'w2p-49440_date-widget-for-search-features' into search-features 2018-07-18 15:29:21 +02:00
lotte
235841d23d 49440: fix for letting go of handle outside widget 2018-07-18 15:28:58 +02:00
Kristof De Langhe
98966bd0d0 Merge branch 'search-features' into w2p-54053_Active-filter-labels 2018-07-17 17:28:35 +02:00
lotte
329d5ac81e 54435: sort options 2018-07-17 14:20:44 +02:00
lotte
b4de3433e1 49440: solved merge issues 2018-07-17 11:23:28 +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
lotte
4d538cab5f 54435: fix for facet pages 2018-07-17 09:51:38 +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
Kristof De Langhe
7947b933fb 54053: Label alignment fix 2018-07-13 15:27:04 +02:00
lotte
981f2cdc77 54348: scope dropdown 2018-07-13 15:25:23 +02:00
lotte
c62725a8bf Merge branch 'w2p-54053_Active-filter-labels' into search-features 2018-07-12 14:59:42 +02:00
lotte
3acd9d4f5e Merge branch 'w2p-53881_facet-search-box' into search-features
Conflicts:
	src/app/core/shared/resource-type.ts
	src/app/shared/shared.module.ts
2018-07-12 14:54:42 +02:00
lotte
c8371720bf 53881: fixed some bugs 2018-07-12 14:50:51 +02:00
lotte
473cd51ffb 53881: small attribute fixes 2018-07-12 13:23:10 +02:00
lotte
73de6f33ee implemented feedback 2018-07-12 12:58:29 +02:00
Kristof De Langhe
bbc1daab3c 54053: Search label offset 2018-07-11 15:51:37 +02:00
Art Lowel
44e58e1282 Merge pull request #277 from MatMercer/pointerevents
Fix truncated text being difficult to select
2018-07-11 10:16:18 +02:00
lotte
3473091270 53881: facet search boxes finished 2018-07-10 10:14:44 +02:00
MatMercer
dc633ea77d Fix truncated text being difficult to select
Related to Google Chrome browser
2018-07-09 22:30:31 -03:00
Tim Donohue
bfa87c927c Merge pull request #246 from Atmire-Kristof/w2p-50632_Replace-mock-registry-service-with-implementation
Admin Registry pages and service
2018-07-09 09:40:40 -05:00
Kristof De Langhe
079b8b7679 Merge remote-tracking branch 'dspace/master' into w2p-50632_Replace-mock-registry-service-with-implementation
Conflicts:
	src/app/app-routing.module.ts
	src/app/core/cache/response-cache.models.ts
2018-07-09 14:09:24 +02:00
Art Lowel
9745faf17b Merge pull request #275 from 4Science/authentication
Authentication
2018-07-09 13:14:54 +02:00
lotte
e6538946c6 53881: added some tests 2018-07-06 11:04:01 +02:00
Kristof De Langhe
307443f5cc 54053: Active filter label tests 2018-07-05 15:00:14 +02:00
Kristof De Langhe
050536844b 54053: Working active filter labels 2018-07-05 12:56:39 +02:00
Giuseppe Digilio
6b7c748251 Added a fallback for x-forwarded-for header 2018-07-05 09:25:35 +02:00
Kristof De Langhe
205fe3ede3 Merge branch 'w2p-53881_facet-search-box' into w2p-54053_Active-filter-labels 2018-07-04 15:56:55 +02:00
Kristof De Langhe
8931337d2d 54053: intermediate commit 2018-07-04 15:56:29 +02:00
lotte
6b292aab33 53881: bugfixing facet search box 2018-07-04 15:51:59 +02:00
lotte
ac4a1b179b 53881: facet search box 2018-07-02 15:27:13 +02:00
Giuseppe Digilio
3126a96554 Added x-forwarded-for header to pass server ip check 2018-06-28 11:51:52 +02:00
Giuseppe Digilio
099ebd487f fixes 2018-06-07 12:30:24 +02:00
Art Lowel
12d93cf4de Update README.md
Removed the "yarn run global" instruction, as it isn't necessary for first installs, and can cause issues
2018-05-31 16:32:44 +02:00
Art Lowel
26b82bed30 accidentally left focus on a unit test 2018-05-29 17:03:16 +02:00
Art Lowel
101921ceac refactored IDToUUIDSerializer 2018-05-29 15:03:40 +02:00
Giuseppe Digilio
66295d10ed Fixed issue with credentials that have special chars 2018-05-29 10:51:07 +02:00
Lotte Hofstede
8b8f067a6c added tests for collections component 2018-05-28 12:07:22 +02:00
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
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