hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-11 03:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,006 Commits 23 Branches 25 Tags
10d90e432594c4124bd1f463fbe7884029719911
Commit Graph

65 Commits

Author SHA1 Message Date
Giuseppe Digilio
10d90e4325 Merge remote-tracking branch 'remotes/origin/master' into dynamic_forms 
# Conflicts:
#	resources/i18n/en.json
#	src/app/core/cache/response-cache.models.ts
#	src/app/core/data/request.models.ts
#	src/app/shared/shared.module.ts
#	src/styles/_custom_variables.scss
 2018-07-12 14:56:57 +02: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
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
Michael Marttila
b60373e290 Add MockAdminGuard as provider 2018-05-14 11:25:35 -04: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
Giuseppe Digilio
beb5e97158 Merge remote-tracking branch 'remotes/origin/master' into authentication 
# Conflicts:
#	package.json
#	src/app/app.reducer.ts
#	src/app/shared/shared.module.ts
 2018-03-08 10:18:33 +01:00
Giuseppe Digilio
39eeec5385 Merge remote-tracking branch 'remotes/origin/master' into notification 
# Conflicts:
#	src/app/app.reducer.ts
#	src/app/shared/shared.module.ts
 2018-03-06 10:20:52 +01:00
Andrea Chiapparelli - 4Science
8c555292ac notification start 2018-03-02 16:19:15 +01:00
Lotte Hofstede
52781d02c4 drag/click differensiating directive + fix for fixedheight truncatable elements 2018-02-13 11:50:35 +01:00
Giuseppe Digilio
19c9482009 Added first release of the authentication module 2018-02-06 15:48:05 +01:00
Giuseppe Digilio
2309c1be3b Added login page ang nav menu 2018-02-01 17:13:08 +01:00
Lotte Hofstede
1b0fc45b6d 46063: working CSS truncation, but were switching to JS again... 2018-01-24 15:22:31 +01:00
Lotte Hofstede
136edddbdd Merge branch 'master' into w2p-46063_truncation-implementation 
Conflicts:
	src/app/object-list/item-list-element/item-list-element.component.ts
	src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.scss
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.ts
	src/styles/_custom_variables.scss
	src/styles/_mixins.scss
 2018-01-23 10:27:25 +01:00
Lotte Hofstede
33e04fd324 46063: saved currect state 2018-01-23 10:21:35 +01:00
Lotte Hofstede
f381649112 46063: css attempt to fix multiline clamping 2017-12-20 12:38:59 +01:00
Lotte Hofstede
eb2143d0a1 46063: overflow-text-clamp wrapper attempt 2017-12-20 08:55:45 +01:00
Jonas Van Goolen
db0db81c63 #150 Generalised AbstractListableElementComponent instead of grid/list specific implementations 2017-12-01 09:59:35 +01:00
Jonas Van Goolen
520b7f3e12 #150 Moved list,grid and object-collection to shared package 2017-12-01 09:59:35 +01:00
Jonas Van Goolen
e7e129f80f #150 Intermediate commit 2017-12-01 09:59:35 +01:00
Jonas Van Goolen
a704157c1f #150 Initial grid/list view implementation 2017-12-01 09:59:35 +01:00
Lotte Hofstede
71a8ed05d1 46063: object list truncation start 2017-11-24 10:45:50 +01:00
Lotte Hofstede
57c525d178 solved merge issues 2017-11-08 16:26:36 +01:00
Lotte Hofstede
1ff29621af Merge branch 'master' into w2p-45621_filter-facets-ui 
Conflicts:
	src/app/+search-page/search-page.component.html
	src/app/+search-page/search-page.component.spec.ts
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-results/search-results.component.html
	src/app/+search-page/search-service/search.service.ts
	src/app/shared/search-form/search-form.component.html
	src/app/shared/shared.module.ts
 2017-11-08 16:08:59 +01:00
Lotte Hofstede
532741d073 45621: filter components for sidebar 2017-11-06 14:27:48 +01:00
Lotte Hofstede
7d5dad94a1 44988: added reducer, angular animation, tests... 2017-10-30 17:04:52 +01:00
Art Lowel
ce330fcb47 refactored template variables 2017-10-27 17:57:28 +02:00
Àlex Magaz Graça
eab2dd86e2 Implement component to switch between view modes 
For now it allows to switch between list and grid views.

Fixes https://github.com/DSpace/dspace-angular/issues/171
 2017-10-17 12:52:33 +02:00
William Welling
8932817658 reduce async observables with local assignment 2017-10-04 19:41:20 -05:00
William Welling
7937a47aa5 added error component and coverage for new components 2017-10-04 14:17:19 -05:00
William Welling
fa99152104 ngIf else ng-template for initial loading work 2017-10-03 15:29:30 -05:00
William Welling
0efcd9cecc resolved merge conflicts 2017-09-29 10:05:49 -05:00
William Welling
51e41ddba0 removed tslint-loader, breaks aot build 2017-09-26 15:55:32 -05:00
William Welling
bd25a489d0 use forRoot on app router, whitelist ngx on server 2017-09-26 15:13:36 -05:00
William Welling
da3d0b412f shared module should not provide singletons 2017-09-26 14:41:33 -05:00
William Welling
7cbd79fa85 fixed aot build with translate loader (wip) 2017-09-26 12:25:17 -05:00
William Welling
3d02e660da fixed core and shared module usage, lazy loading modules 2017-09-26 11:44:07 -05:00
Lotte Hofstede
c38a43ff2b Merge remote-tracking branch 'origin/master' into w2p-44024_simple-search-with-select 
Conflicts:
	package.json
	src/app/core/cache/builders/remote-data-build.service.ts
	src/app/shared/shared.module.ts
 2017-09-20 16:07:34 +02:00
Lotte Hofstede
872984e505 44024: simple search finalisation 2017-09-05 17:09:17 +02:00
Àlex Magaz Graça
0d0cb721d5 Avoid getting a separate instance of ServerResponseService for each PageNotFoundComponent 
https://angular.io/guide/ngmodule-faq#should-i-add-other-providers-to-a-module-or-a-component
 2017-09-01 17:28:19 +02:00
Lotte Hofstede
bacb048bb6 44024: simple search UI with working search results 2017-08-25 15:01:35 +02:00
Lotte Hofstede
563cf6e820 44024: simple search UI with decorator bug 2017-08-25 15:01:35 +02:00
William Welling
ff934d048b upgraded to ngx-pagination 2017-07-13 07:47:22 -05:00
William Welling
c08f5c672b dependency upgrades, server and platform module updates, linting wip 2017-07-12 14:33:16 -05:00
Art Lowel
ac58c8c2aa replace ng2-truncate with a naive own implementation, because ng2-truncate isnt compatible with the AoT build 2017-06-22 13:03:54 +02:00
Art Lowel
12edec3471 added crude first recent items list to collection hompage - needs refactoring 2017-06-21 18:42:54 +02:00
Art Lowel
429d4a8937 Merge branch 'live-rest-backend' into w2p-41914_DSO-list-component 2017-06-20 11:39:52 +02:00
Lotte Hofstede
6db165b7a3 41914: implemented pagination sort direction/field 2017-06-15 13:32:15 +02:00
Lotte Hofstede
3929a49c1d 41914: DSO list finished without item count 2017-06-14 13:51:38 +02:00
Christian Scheible
ac7b2775e4 Renamed Collection/Community shared components 2017-06-13 15:41:38 +02:00