Commit Graph

2300 Commits

Author SHA1 Message Date
Michael W Spalti
73dd0147bc Minor update of the imports in unit test. 2019-09-18 10:37:12 -07:00
Michael W Spalti
e70b9c5994 Added new auth redirect code for ssr. 2019-09-17 12:44:02 -07:00
Michael W Spalti
8fe617bd74 Changed method name. 2019-09-16 13:14:45 -07: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
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
benbosman
c4c6de66de Merge pull request #402 from atmire/Item-Relations-Edit-Delete
Item relations edit delete
2019-09-05 15:59:41 +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
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
lotte
fa86601f55 applied feedback 2019-08-29 13:36:24 +02:00
Terry Brady
7b65270a0f add docker startup 2019-08-27 13:06:13 -07:00
Tim Donohue
7903a93042 Merge pull request #463 from lhenze/440-pagination-messaging
Pagination messaging:  Hiding "Now Showing"
2019-08-26 17:54:54 +02:00
lhenze
f49fab3599 Added "empty" message
Modeled on browse-by.component.html
2019-08-26 08:56:13 -04:00
lhenze
316ced7fef More compact approach h/t @artlowel 2019-08-26 07:47:11 -04:00
lhenze
064552188e Moving the ngIf directive to wrap both parts of the statement 2019-08-24 13:47:20 -04:00
Yana De Pauw
88c8fddbce Fix to message, margin and deletion page reset 2019-08-19 17:25:41 +02:00
Yana De Pauw
1d05680126 Implement feedback
Change padding into margin
Change 'Create link' to a button
Add placeholder to extension field
Fix pagination
2019-08-16 13:00:04 +02:00
lotte
1b6c0a9e42 fixed AoT errors 2019-08-14 16:20:10 +02:00
Kristof De Langhe
7d0439b006 64225: Fixed AoT build errors 2019-08-14 16:00:26 +02:00
Kristof De Langhe
737792a1df 62741: Moved entity mantis files to correct location 2019-08-14 15:05:25 +02:00
lotte
d1dbd891b4 62355: solved lint error 2019-08-14 13:05:20 +02:00
lotte
62880336d9 Merge branch 'master' into w2p-62355_optimize-search-performance 2019-08-14 12:31:07 +02:00