hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-17 23:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
773 Commits 23 Branches 25 Tags
add8c7cec91c7f3412251442f21c413831ee137f
Commit Graph

773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrea Chiapparelli - 4Science
add8c7cec9 fix graphics 2018-03-06 15:45:47 +01:00
Andrea Chiapparelli - 4Science
cfcc024bfc fix graphics 2018-03-06 15:45:47 +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
Art Lowel
605c3524c8 Merge pull request #231 from DSpace/update-README 
Update README with PR testing process & yarn dependency mgmt notes
 2018-03-06 09:57:12 +01:00
Tim Donohue
b03342e90f Update yarn add notes per comments and official docs 2018-03-05 16:11:02 -06:00
Tim Donohue
7b3f3fa2d9 Update README with PR testing process & yarn dependency mgmt notes 2018-03-05 16:11:02 -06:00
Tim Donohue
bc6e45d633 Merge pull request #221 from LotteHofstede/w2p-46063_truncation-implementation 
Truncation
 2018-03-05 15:55:27 -06:00
Tim Donohue
2d567e6f3c Merge pull request #233 from artlowel/travis-chrome-issue 
Fix travis chrome issue
 2018-03-05 09:22:56 -06:00
Giuseppe Digilio
31edf91c0a Added notifications state selectors 2018-03-05 15:15:54 +01:00
Giuseppe Digilio
0b50d14b06 Merge branch 'notification' of https://github.com/4Science/dspace-angular into notification 2018-03-05 13:04:00 +01:00
Giuseppe Digilio
e1e7840ec7 Added actions to notifications state 2018-03-05 13:01:54 +01:00
Art Lowel
4c45f29be5 fixes an issue where protractor can't find the right chrome version when running in travis, see https://github.com/angular/angular-cli/wiki/stories-continuous-integration#using-travis-ci 2018-03-05 09:57:26 +01:00
Andrea Chiapparelli - 4Science
2b8df1cc9d bootstrap style notification 2018-03-02 19:41:12 +01:00
Giuseppe Digilio
cc615ac0bf Added notifications state 2018-03-02 19:26:24 +01:00
Tim Donohue
791c552c8b Merge pull request #228 from LotteHofstede/bootstrap-upgrade 
Bootstrap upgrade
 2018-03-02 10:37:28 -06:00
Andrea Chiapparelli - 4Science
8c555292ac notification start 2018-03-02 16:19:15 +01:00
Tim Donohue
d94ec77f4f Merge pull request #229 from LotteHofstede/w2p-49399-seach-form-fix-without-javascript 
Fixed search form that did not work without javascript
 2018-02-28 16:29:14 -06:00
Tim Donohue
e61fcdccdb Merge pull request #227 from artlowel/fix-csr-only 
Fix CSR only issue
 2018-02-22 08:41:02 -06:00
Lotte Hofstede
437ded7f40 dependency fix 2018-02-16 14:10:43 +01:00
Lotte Hofstede
76227960a3 made search form work without js 2018-02-16 13:36:13 +01:00
Lotte Hofstede
bfb6889d7d reversed source-map upgrade to be able to run without node 8 2018-02-16 11:43:43 +01:00
Lotte Hofstede
9bce42323b upgraded dependencies and bootstrap upgrade styling fix 2018-02-16 11:17:10 +01:00
Art Lowel
a654955340 fix an issue where the app woulnd't start if server side rendering was disabled 2018-02-15 15:46:25 +01:00
Lotte Hofstede
24d7980b9f bootstrap upgrade to 4.0.0 2018-02-15 15:05:55 +01:00
Lotte Hofstede
7c873905e8 Merge branch 'master' into w2p-46063_truncation-implementation 
Conflicts:
	src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts
	src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts
	src/app/shared/object-grid/item-grid-element/item-grid-element.component.spec.ts
	src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
	src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
	src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.spec.ts
 2018-02-13 15:51:30 +01:00
Lotte Hofstede
c9071bc067 ts lint fixes 2018-02-13 15:47:06 +01:00
Lotte Hofstede
38fccfca58 Merge branch 'w2p-46063_truncation-implementation' into w2p-46063_truncation-implementation-test-fixes 
Conflicts:
	src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
 2018-02-13 15:06:41 +01:00
Lotte Hofstede
2895bb61e8 fixed list element tests 2018-02-13 15:06:07 +01:00
Lotte Hofstede
52781d02c4 drag/click differensiating directive + fix for fixedheight truncatable elements 2018-02-13 11:50:35 +01:00
Art Lowel
fe9150c0fc Merge pull request #220 from artlowel/transfer-state 
Switch to Angular 5's TransferState API
 2018-02-08 19:04:32 +01:00
Art Lowel
74dc51c20b Merge pull request #214 from artlowel/angular5-upgrade 
Angular5 upgrade
 2018-02-08 16:54:43 +01:00
Lotte Hofstede
9fd7b0ab2e tslint fixes 2018-02-08 14:42:13 +01:00
Lotte Hofstede
7bf23d1b7a 466063: test fixes 2018-02-08 14:39:13 +01:00
Lotte Hofstede
42b315f8fb 46063: clean up 2018-02-05 12:51:36 +01:00
Lotte Hofstede
8ffd08d59f Merge branch 'master' into w2p-46063_truncation-implementation 2018-02-05 11:32:33 +01:00
Lotte Hofstede
5f76bba050 46063: truncation finished, still have to fix some existing tests 2018-02-05 11:32:26 +01:00
Art Lowel
78574df60b removed the concept of prerender strategies. rehydrate is the default now 2018-02-01 13:57:24 +01:00
Art Lowel
4fbceab1b9 Switched to angular 5's built-in transfer state api 2018-02-01 13:17:59 +01:00
Art Lowel
befe08b571 Merge pull request #213 from 4Science/fix-pagination 
Fix pagination issue on change page size
 2018-01-25 15:41:59 +01:00
Lotte Hofstede
58a26c03cc 46063: removed ellipsis, added other animations.. 2018-01-25 14:01:02 +01:00
Lotte Hofstede
1b0fc45b6d 46063: working CSS truncation, but were switching to JS again... 2018-01-24 15:22:31 +01:00
Art Lowel
1aebb4fb5b package @angularclass/idle-preload was renamed to angular-idle-preload 2018-01-23 16:32:26 +01:00
Art Lowel
50ce788946 fixed 'Critical dependency' warnings when running karma 2018-01-23 16:00:39 +01:00
Art Lowel
643b715da2 fix lint issues 2018-01-23 15:18:11 +01:00
Art Lowel
962d87173e Fixed AoT Build 2018-01-23 15:16:22 +01:00
Giuseppe Digilio
cf867cbcd6 Fixed pagination issue on change page size 2018-01-23 13:12:59 +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
Art Lowel
107a0736c6 Angular 5 upgrade: upgrade dependencies - AoT build broken 2018-01-22 17:02:35 +01:00
Art Lowel
e47046c43d Angular 5 upgrade: upgrade prep 2018-01-22 11:40:19 +01:00