hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-14 05:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,317 Commits 23 Branches 25 Tags
42d1bdb3d83d6f562ff6ac86f62d8162a1696e7c
Commit Graph

1317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
courtneypattison
b4d21d88b5 Changed search filter cursor to pointer 2018-12-19 15:15:35 -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
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
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
lotte
c0a4fdc797 57053: added menu preview 2018-12-07 17:06:44 +01:00
lotte
38652b7a6a fixed sidebar set-off 2018-12-07 13:53:21 +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
Tim Donohue
a3b4883e2d Merge pull request #320 from atmire/angular6-upgrade 
Angular6 upgrade
 2018-12-03 07:10:39 -08:00
Yana De Pauw
d70034c9b4 DS-249: Force rerun of tests 2018-11-27 17:02:40 +01:00
lotte
c839b55412 finishing touches to menu 2018-11-27 16:26:58 +01:00
lotte
def5391449 57053: finished animations 2018-11-27 15:34:05 +01:00
lotte
afa3a03d2c fix for 401 requests 2018-11-27 11:45:35 +01:00
Art Lowel
3c7fcfc87a Merge pull request #325 from atmire/hide-metadata-wrapper-component 
Hide the wrapper component when there is no text content
 2018-11-27 11:07:30 +01:00
lotte
907fa5f22f refactored to flexbox 2018-11-23 17:16:05 +01:00
lotte
7a343dbd71 added missing files 2018-11-23 14:50:12 +01:00
lotte
567d4dc331 sidebar animations 2018-11-23 14:44:11 +01:00
Antoine Snyers
9bf96d11df Remove fdescribe 2018-11-21 15:23:05 +01:00
Antoine Snyers
86830263dd Add an empty span in the test case 2018-11-21 15:02:42 +01:00
lotte
d46ab9637c Merge branch 'master' into angular6-upgrade 2018-11-21 11:09:38 +01:00
lotte
ea3a2076c7 finished look of sidebar 2018-11-21 09:13:02 +01:00
Bram Luyten
1e01073395 Using Bootstrap 4 md-3 class for bottom margin instead of hardcoding 1em 2018-11-21 06:48:02 +01:00
lotte
5cbe8ffb88 resolved PR feedback 2018-11-20 15:53:40 +01:00
lotte
cd5c7b72c2 57053: progress menu bar 2018-11-16 17:00:06 +01:00
lotte
0c4784346b progress vertical menu 2018-11-14 15:56:23 +01:00
Antoine Snyers
8800f238eb Hide the wrapper component when there is no text content 2018-11-12 10:23:28 +01:00
lotte
17239cd1be Merge branch 'resolvers-branch-angular6' into w2p-57053_menu-angular6 
Conflicts:
	src/app/app.module.ts
	src/app/header/header.component.ts
	src/app/navbar/navbar.effects.ts
 2018-11-12 09:49:26 +01:00
lotte
83bf3ab8b8 start of vertical menu 2018-11-09 17:00:58 +01:00
lotte
b0fe14d015 57053: horizontal menu 2018-11-09 10:18:17 +01:00
Kristof De Langhe
dd439109a4 54472: Send normalized collections/communities instead of FormData 2018-11-06 09:57:27 +01:00