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

94 Commits

Author SHA1 Message Date
lotte
c40179fc88 Merge branch 'master' into w2p-59334_edit-item-metadata-branch 
Conflicts:
	src/app/+community-page/community-page.component.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/data/dso-response-parsing.service.ts
	src/app/core/data/item-data.service.ts
	src/app/core/data/metadata-schema-data.service.ts
	src/app/core/data/request.models.ts
	src/app/core/metadata/metadata.service.spec.ts
	src/app/core/metadata/normalized-metadata-schema.model.ts
	src/app/core/shared/metadatum.model.ts
	src/app/core/shared/operators.spec.ts
	src/app/shared/shared.module.ts
 2019-02-25 10:28:18 +01:00
lotte
bfa1e77177 finalised edit item page 2019-02-19 10:13:49 +01:00
Kristof De Langhe
371f2bcd85 Merge remote-tracking branch 'atmire/master' into Browse-by-links 
Conflicts:
	src/app/core/browse/browse.service.spec.ts
	src/app/core/data/dso-response-parsing.service.ts
	src/app/shared/shared.module.ts
 2019-02-13 13:25:35 +01:00
lotte
7eec961fa7 59334: edit item metadata finished 2019-02-13 11:39:32 +01:00
lotte
ace523ed14 intermediate commit for tests 2019-02-08 14:42:34 +01:00
Kristof De Langhe
0312e659a4 59415: Browse-By links on community and collection pages' 2019-01-29 16:07:53 +01:00
lotte
a733eb5834 Merge branch 'community-and-collection-forms' into w2p-58522_delete-collections-and-communities 
Conflicts:
	src/app/core/data/data.service.ts
	src/app/shared/shared.module.ts
 2019-01-24 12:58:05 +01:00
lotte
6dba02ca67 Merge branch 'master' into community-and-collection-forms 
Conflicts:
	src/app/core/data/item-data.service.spec.ts
	src/app/core/data/item-data.service.ts
	src/app/core/shared/operators.spec.ts
	src/app/core/shared/operators.ts
	src/app/shared/shared.module.ts
 2019-01-22 08:34:51 +01:00
Bram Luyten
17be7a34e0 Issue 298 Language switch 2019-01-16 20:01:14 +01:00
lotte
ab5cc1c961 58522: implemented delete for coll and comms 2019-01-04 16:30:25 +01:00
lotte
1ebd6f0e86 Finished refactoring, guards, docs, tests 2019-01-03 10:29:29 +01:00
lotte
07c9927b6a finished dynamic menus 2018-12-06 15:50:12 +01:00
lotte
c17b395ba0 57053: intermediate commit active issue 2018-12-05 12:46:22 +01:00
lotte
0c4784346b progress vertical menu 2018-11-14 15:56:23 +01:00
lotte
e025f3bc4d Merge branch 'master' into resolvers-branch-angular6 
Conflicts:
	package.json
	src/app/+search-page/search-filters/search-filters.component.ts
	src/app/core/auth/auth.effects.ts
	src/app/core/auth/auth.service.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/data/comcol-data.service.ts
	src/app/core/data/community-data.service.ts
	src/app/core/data/data.service.ts
	src/app/core/data/item-data.service.ts
	src/app/core/shared/dspace-object.model.ts
	src/app/header/header.component.spec.ts
	src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
	src/app/shared/testing/auth-service-stub.ts
	yarn.lock
 2018-10-08 12:28:08 +02:00
lotte
777facf5cd intermediate commit 2018-08-29 15:12:01 +02:00
Kristof De Langhe
4590264d5a Merge branch 'master' into browse-by-features 
Conflicts:
	src/app/core/core.module.ts
	src/app/core/shared/operators.ts
	src/app/shared/object-grid/item-grid-element/item-grid-element.component.html
	src/app/shared/object-list/item-list-element/item-list-element.component.html
	src/app/shared/shared.module.ts
 2018-08-29 14:24:45 +02:00
Kristof De Langhe
072507b293 improved coverage, type docs, removed startsWith option and general refactoring 2018-08-09 12:37:09 +02:00
Kristof De Langhe
883a1d8881 Issues 252,253: Browse by title and browse by metadata (author) 2018-08-08 11:36:42 +02:00
lotte
117a0cd3ff Merge branch 'master' into search-features 
Conflicts:
	package.json
	src/app/shared/shared.module.ts
	yarn.lock
 2018-08-02 14:21:28 +02:00
lotte
3fa70523ea Fixed issue #1 and some other fixes 2018-07-30 10:19:45 +02:00
lotte
cfc448332d latest fixes for search page 2018-07-19 13:44:38 +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
c62725a8bf Merge branch 'w2p-54053_Active-filter-labels' into search-features 2018-07-12 14:59:42 +02:00
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
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
Kristof De Langhe
8931337d2d 54053: intermediate commit 2018-07-04 15:56:29 +02:00
lotte
ac4a1b179b 53881: facet search box 2018-07-02 15:27:13 +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
Lotte Hofstede
ce08f52b94 Finished date widget without tests and with AoT error 2018-05-09 09:32:07 +02:00
Lotte Hofstede
e7054af1d5 49440: date widget with decorator 2018-04-16 09:28:36 +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