Giuseppe Digilio
aea83ed662
Merge remote-tracking branch 'remotes/origin/master' into submission-miscellaneous-fixes
2019-09-13 17:26:16 +02:00
Art Lowel
154fc83930
fix typo
2019-09-12 17:14:19 +02:00
Art Lowel
b186ec635e
Merge branch 'master' into improve-i18n-files
2019-09-12 17:13:43 +02:00
Ben Bosman
da0b70faa4
Merge remote-tracking branch 'atmire-git/w2p-64644_Removal-of-filtered-discovery-page' into 64644-Removal-of-filtered-discovery-page
2019-09-10 12:38:24 +02:00
Ben Bosman
4c5d4427dc
Merge remote-tracking branch 'atmire-git/64644-Removal-of-filtered-discovery-page' into 64644-Removal-of-filtered-discovery-page
2019-09-10 09:24:44 +02:00
Michael W Spalti
6425f6e7d1
Removed the router injection that slipped into auth service during rebase, test now passes.
2019-09-09 13:33:51 -07:00
Michael W Spalti
c3102b9d43
A little cleanup in unit tests.
2019-09-09 12:58:55 -07:00
Michael W Spalti
d9fb68dce9
Modified redirectToPreviousUrl to use the standalone page parameter if no redirect url is found in the store.
...
Removed unused import that was causing merge conflict.
Once again try to fix merge conflict.
Added routeService to server module providers.
Changed order of providers.
Minor change to ServerAuthService to make method signature consistent with AuthService.
Try adding RouteService to browser-app module to see if that fixes travis build.
One more try at getting the CI build to work.
Removed change to browser module.
2019-09-09 12:58:55 -07:00
Michael W Spalti
0935bd4afd
Proposed authentication service method that sets redirect url and dispatches auth request.
2019-09-09 12:55:31 -07:00
Michael W Spalti
f0813fcbc1
Added @Input to the log-in component that indicates whether the component is being used in the standalone login page or the drop-down.
2019-09-09 12:39:04 -07:00
Michael W Spalti
54fc57d1f3
Modified mobile log-in to use history as provided by the store.
...
Minor typedoc and import updates.
2019-09-09 12:39:04 -07:00
Michael W Spalti
fcaf01807c
Modifed log-in component to use LOGIN_ROUTE when setting the redirect url.
...
Also added check for mobile layout that forces setting of the redirect url.
2019-09-09 12:39:04 -07:00
Michael W Spalti
c6156c5cbe
Modified log-in component to set the redirect url only if one has not been set already.
2019-09-09 12:39:04 -07:00
Michael W Spalti
db326a706c
Fixed the unit test (and added a typedoc)
2019-09-09 12:39:04 -07:00
Michael W Spalti
6360d5a88c
Modified the log-in component to set the redirectUrl in AuthState (so the user is returned to the same page after login).
2019-09-09 12:39:04 -07:00
Yana De Pauw
ee760908c5
Merge branch 'master' into w2p-64644_Removal-of-filtered-discovery-page
2019-09-09 18:26:01 +02:00
Yana De Pauw
5553d046ce
64644: Remove empty line to fix lint error
2019-09-09 17:37:14 +02:00
Yana De Pauw
ee76c256f8
Merge branch 'master' into Move-item-component
2019-09-09 11:06:16 +02:00
Terry Brady
754abdd2ec
correct data load script
2019-09-06 20:32:11 -07:00
Terry Brady
0b1bc9fe65
Use v2 compose files
2019-09-06 20:27:44 -07:00
Art Lowel
80706b9f61
Merge pull request #437 from atmire/w2p-62355_optimize-search-performance
...
Search performance optimisations #2
2019-09-06 16:35:45 +02:00
Tim Donohue
3c9fdec8dd
Merge pull request #466 from terrywbrady/travis-docker
...
Start Docker Compose for end-to-end (e2e) Testing
2019-09-06 16:12:48 +02:00
lotte
e518380025
fixed import issues
2019-09-06 16:07:37 +02:00
Tim Donohue
ddd1bb42cf
Spelling fixes
2019-09-06 08:38:48 -05:00
Tim Donohue
56c479f73d
Merge pull request #476 from Flusspferd123/spellingMistake
...
Typo in dropdown-field-parser.ts fixed
2019-09-06 15:36:31 +02:00
Art Lowel
af3cc28f43
Merge pull request #478 from atmire/Clean-build-folder-pretest
...
Clean build folder pre-tests
2019-09-06 15:36:08 +02:00
lotte
2b24caba34
Merge branch 'master' into w2p-62355_optimize-search-performance
2019-09-06 15:22:44 +02:00
Kristof De Langhe
bf039978be
62589: test environment comment
2019-09-06 14:30:57 +02:00
Kristof De Langhe
431d7e12b1
62589: Clean build folder pre-tests
2019-09-06 14:09:21 +02:00
Julius Gruber
92f8a5d522
Typo in dropdown-field-parser.ts fixed
2019-09-06 13:22:43 +02:00
Tim Donohue
3a68b6dd7b
Merge pull request #474 from atmire/master-travis-test-fixes
...
master travis test fixes
2019-09-05 18:50:53 +02:00
Kristof De Langhe
6c4d461ade
master travis test fixes
2019-09-05 18:24:03 +02:00
Art Lowel
f9c5768ee3
Merge pull request #443 from atmire/UI-language-cookie
...
UI language cookie
2019-09-05 17:22:16 +02:00
Giuseppe Digilio
5a3eb8c9df
Merge remote-tracking branch 'remotes/origin/master' into submission-miscellaneous-fixes
...
# Conflicts:
# src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
2019-09-05 16:35:32 +02:00
benbosman
c4c6de66de
Merge pull request #402 from atmire/Item-Relations-Edit-Delete
...
Item relations edit delete
2019-09-05 15:59:41 +02:00
Giuseppe Digilio
67b09e3794
Merge remote-tracking branch 'remotes/origin/master' into submission-miscellaneous-fixes
...
# Conflicts:
# src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
2019-09-05 14:54:27 +02:00
lotte
9723d929e1
resolved issues after merge with master
2019-09-05 10:44:37 +02:00
lotte
b634799ef9
Merge branch 'master' into w2p-62355_optimize-search-performance
2019-09-05 10:16:51 +02:00
Tim Donohue
36f134f1c6
Merge pull request #433 from atmire/Entities-grid-templates
...
Entities grid templates
2019-09-04 22:15:55 +02:00
Art Lowel
94eecffa88
Merge pull request #465 from lhenze/464-collpages-emptymessage
...
Collection pages, recent submissions: Added "empty" message
2019-09-04 17:56:29 +02:00
lhenze
64db1c242e
New key created for *no recent items in this collection*
2019-09-03 17:02:09 -04:00
lhenze
79ccf2e2be
Merge branch 'master' into 464-collpages-emptymessage
2019-09-03 16:24:32 -04:00
Terry Brady
b68c59b835
Updating comments per review
2019-09-01 16:25:26 -07:00
Yana De Pauw
343a1498ac
Prevent navigation by link from collection-list component
2019-08-30 15:41:50 +02:00
Art Lowel
ee56de9e55
Merge pull request #455 from atmire/Bitstream-format-registries
...
Bitstream format registries
2019-08-30 09:55:01 +02:00
Tim Donohue
c80542c280
Merge pull request #459 from atmire/edit-com-col-labels
...
Fix the labels on edit collection and community pages
2019-08-29 19:44:12 +02:00
Terry Brady
c8fafd067e
run e2e tests in docker using docker-compose
2019-08-29 09:15:12 -07:00
Yana De Pauw
22df3ec7f2
64644: Removal of filtered discovery page
2019-08-29 16:33:38 +02:00
Yana De Pauw
f955998d8b
64644: Removal of filtered discovery page
2019-08-29 16:03:37 +02:00
lotte
fa86601f55
applied feedback
2019-08-29 13:36:24 +02:00
