Commit Graph

1343 Commits

Author SHA1 Message Date
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
Tim Donohue
da1a97bd8c Merge pull request #329 from bram-atmire/issue-298-language-switch-2018-11-18-rebase-squash
Issue 298 Language switch
2019-01-18 14:43:08 -06:00
Art Lowel
586a4ac35b add docs, rename classes for clarity 2019-01-17 14:59:48 +01:00
Art Lowel
e387f9446f remove unused 'first' imports 2019-01-17 13:53:34 +01:00
Bram Luyten
8fd18127c8 Removing test for presence of active language string in the header itself 2019-01-17 09:25:05 +01:00
Tim Donohue
65c7aa0ad2 Merge pull request #342 from atmire/Item-Status-Edit-Actions
Add Item Status Edit Actions
2019-01-16 15:58:48 -06:00
Bram Luyten
82c91be44f Reconciling with new header design 2019-01-16 20:51:02 +01:00
Bram Luyten
17be7a34e0 Issue 298 Language switch 2019-01-16 20:01:14 +01:00
Yana De Pauw
3fcc74cd36 Fix small merge issue 2019-01-10 15:41:24 +01:00
Yana De Pauw
a93f3e4357 Merge branch 'master' into Item-Status-Edit-Actions 2019-01-10 14:37:27 +01:00
Art Lowel
f51ac8086d remove exportToZip config property that was added accidentally 2019-01-10 13:32:42 +01:00
lotte
b0da712915 added trivial tests 2019-01-10 13:01:57 +01:00
lotte
d30245a1da 54472: fixed small test issue 2019-01-07 09:17:22 +01:00
lotte
303fc08520 54472: fixed small test issue 2019-01-04 16:55:16 +01:00
lotte
773973cdef fixed missing take 1 2019-01-04 14:16:35 +01:00
lotte
1ebd6f0e86 Finished refactoring, guards, docs, tests 2019-01-03 10:29:29 +01:00
lotte
e0ed960d4c refactoring continued 2019-01-03 10:28:31 +01:00
lotte
a35dffbe95 refactoring comcol forms 2018-12-23 00:12:46 +01:00
Art Lowel
761966020e Merge pull request #344 from courtneypattison/responsive-home-news
Made home news responsive
2018-12-22 08:52:30 +01:00
courtneypattison
d3a3461651 Added logo dimensions to css 2018-12-21 11:47:35 -08:00
lotte
d37a2e051d Started fixing tests 2018-12-21 16:22:59 +01:00
courtneypattison
91f8eba6d8 Merged with dspace logo svg 2018-12-20 09:14:02 -08:00
lotte
42d1bdb3d8 Merge branch 'master' into w2p-54472_Create-community-and-collection-pages
Conflicts:
	resources/i18n/en.json
	src/app/+community-page/community-page.component.html
	src/app/+community-page/community-page.module.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/core.module.ts
	src/app/core/index/index.effects.ts
	src/app/core/index/index.reducer.spec.ts
	src/app/core/index/index.reducer.ts
	src/app/header/header.component.spec.ts
2018-12-20 15:59:23 +01:00
lotte
7a12332d70 Edit and create communities 2018-12-20 15:54:47 +01:00
Art Lowel
2055f3216d Merge pull request #338 from atmire/dynamic_menus
Dynamic menus
2018-12-20 14:46:11 +01:00
Art Lowel
5fcc798bb0 Merge pull request #345 from courtneypattison/filter-cursor
Changed search filter cursor to pointer
2018-12-20 14:36:31 +01:00
lotte
e7e285cadc fixed search filter animation 2018-12-20 14:30:41 +01:00
lotte
8ae08fc1fd added title to admin sidebar section icon 2018-12-20 14:09:41 +01:00
Yana De Pauw
2e40b007ae Add additional typedocs to Edit Item classes 2018-12-20 11:43:04 +01:00
courtneypattison
b4d21d88b5 Changed search filter cursor to pointer 2018-12-19 15:15:35 -08:00
courtneypattison
b305462449 Made home news responsive 2018-12-19 13:53:19 -08:00
Tim Donohue
829d4381c2 Merge pull request #330 from atmire/DS249_Display-subcommunities
DS249:  display subcommunities
2018-12-19 14:34:25 -06:00
lotte
cd52c0cc06 Merge branch 'response-cache-refactoring' into w2p-54472_Create-community-and-collection-pages
Conflicts:
	src/app/core/data/data.service.ts
2018-12-19 16:27:36 +01:00
Art Lowel
9911578bcc remove all instances of first as it can cause an error if it's never triggered 2018-12-19 14:53:11 +01:00
lotte
67e2a78a26 applied more feedback 2018-12-19 14:15:34 +01:00
lotte
6163d159f7 applied feedback 2018-12-19 13:38:37 +01:00
Yana De Pauw
b9ea5133e3 Remove edit page menu options not handled in this PR 2018-12-19 12:40:25 +01:00
Yana De Pauw
12d49e010d DS249: Fix to typedoc and angular 6 fix 2018-12-19 10:37:18 +01:00
Yana De Pauw
2c78f98097 Merge branch 'master' into DS249_Display-subcommunities 2018-12-19 10:16:39 +01:00
Tim Donohue
930fad5bdf Merge pull request #324 from bram-atmire/issue-323-comcol-page-logo-bottom-padding
issue 323 comcol page logo bottom padding
2018-12-18 14:44:18 -06:00
Yana De Pauw
d9a393c8e6 Add Item Status Edit Actions
Add the Item Withdraw and Reistate action
Add the make Item Private and Public action
Add the Permanently Delete action
2018-12-18 16:52:11 +01:00
lotte
01b4a7ff01 Merge branch 'response-cache-refactoring' into w2p-54472_Create-community-and-collection-pages
Conflicts:
	src/app/core/metadata/metadata.service.spec.ts
2018-12-17 12:50:33 +01:00
lotte
e2a6db3679 Merge branch 'master' into response-cache-refactoring
Conflicts:
	src/app/core/data/comcol-data.service.ts
	src/server.ts
2018-12-17 12:49:31 +01:00
lotte
cc53dda46b fixed issue with hostwindowservice, search filter bug, changed sidebar toggle text to pin, fixed mobile view of header 2018-12-17 12:08:12 +01:00
lotte
dceb835e53 latest fixes 2018-12-13 16:17:21 +01:00
lotte
8856e48616 Merge branch 'master' into w2p-57053_menu-angular6
Conflicts:
	webpack.config.js
2018-12-13 14:19:08 +01:00
lotte
6498d7dfbf added all tests 2018-12-13 14:18:14 +01:00
lotte
c6b7fd40e2 intermediate commit 2018-12-13 11:19:50 +01:00
lotte
f1da199cde start of tests 2018-12-11 17:13:17 +01:00
lotte
e13d743e32 added type doc to menu related files 2018-12-11 15:47:41 +01:00