L. Henze
|
5341beae1e
|
Merge branch '460-coll-pages-revisions' into 460-coll-pages
|
2019-09-18 13:20:07 -04:00 |
|
L. Henze
|
e854fb85e5
|
Merge branch 'master' into 460-coll-pages
|
2019-09-18 13:09:14 -04:00 |
|
L. Henze
|
4a77dec870
|
Fixing some work that was rolled back
|
2019-09-17 17:38:46 -04:00 |
|
L. Henze
|
6b55f94405
|
Update comcol-page-browse-by.component.ts
|
2019-09-17 17:29:37 -04:00 |
|
L. Henze
|
af3005c863
|
wip
|
2019-09-17 17:19:34 -04:00 |
|
L. Henze
|
01212750bf
|
handle component
|
2019-09-17 17:08:09 -04:00 |
|
Art Lowel
|
5917d92a07
|
Merge pull request #484 from atmire/fix-CVE-2019-10747
Update set-value to fix CVE-2019-10747
|
2019-09-17 10:33:06 +02:00 |
|
L. Henze
|
65ae16b70b
|
Merge branch 'master' into 460-coll-pages
|
2019-09-16 16:39:28 -04:00 |
|
Tim Donohue
|
6ae9efde59
|
Merge pull request #477 from atmire/64644-Removal-of-filtered-discovery-page
Removal of filtered-discovery-page in Angular
|
2019-09-16 19:08:21 +02:00 |
|
Tim Donohue
|
f429483c93
|
Merge pull request #479 from terrywbrady/compose-v2
Use the improved DSpace Docker Compose files to create the ci image
|
2019-09-16 19:06:52 +02:00 |
|
Art Lowel
|
d088f0a504
|
update set-value to fix CVE-2019-10747
|
2019-09-16 18:35:17 +02:00 |
|
Art Lowel
|
b4d5bff1e6
|
update set-value to fix CVE-2019-10747
|
2019-09-16 18:28:40 +02:00 |
|
L. Henze
|
afc38dbff5
|
Merge branch 'master' into 460-coll-pages
|
2019-09-16 12:11:27 -04:00 |
|
Art Lowel
|
f45bc3124a
|
Merge pull request #483 from DSpace/dependabot/npm_and_yarn/mixin-deep-1.3.2
Bump mixin-deep from 1.3.1 to 1.3.2
|
2019-09-16 18:06:51 +02:00 |
|
dependabot[bot]
|
95005ef110
|
Bump mixin-deep from 1.3.1 to 1.3.2
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2)
Signed-off-by: dependabot[bot] <support@github.com>
|
2019-09-16 15:36:17 +00:00 |
|
Art Lowel
|
5fd8a12489
|
Merge pull request #439 from atmire/improve-i18n-files
Convert i18n files to JSON5 format
|
2019-09-16 17:28:41 +02:00 |
|
Art Lowel
|
ed958c1232
|
Merge branch 'master' into improve-i18n-files
|
2019-09-16 16:57:17 +02:00 |
|
Tim Donohue
|
8ffd44f1ed
|
Merge pull request #480 from atmire/upgrade-travis-image
Fix travis chrome install issue
|
2019-09-16 16:16:07 +02:00 |
|
Art Lowel
|
7d947291e4
|
add dpkg to prevent chrome install issues
|
2019-09-16 11:04:35 +02:00 |
|
helix84
|
6c0aaa7bee
|
Update cs.json5
|
2019-09-16 08:28:56 +02:00 |
|
Tim Donohue
|
ef8f857fe8
|
Merge pull request #335 from atmire/Move-item-component
Move item component
|
2019-09-13 18:14:17 +02:00 |
|
Art Lowel
|
154fc83930
|
fix typo
|
2019-09-12 17:14:19 +02:00 |
|
Art Lowel
|
b186ec635e
|
Merge branch 'master' into improve-i18n-files
|
2019-09-12 17:13:43 +02:00 |
|
Ben Bosman
|
da0b70faa4
|
Merge remote-tracking branch 'atmire-git/w2p-64644_Removal-of-filtered-discovery-page' into 64644-Removal-of-filtered-discovery-page
|
2019-09-10 12:38:24 +02:00 |
|
Ben Bosman
|
4c5d4427dc
|
Merge remote-tracking branch 'atmire-git/64644-Removal-of-filtered-discovery-page' into 64644-Removal-of-filtered-discovery-page
|
2019-09-10 09:24:44 +02:00 |
|
Yana De Pauw
|
ee760908c5
|
Merge branch 'master' into w2p-64644_Removal-of-filtered-discovery-page
|
2019-09-09 18:26:01 +02:00 |
|
Yana De Pauw
|
5553d046ce
|
64644: Remove empty line to fix lint error
|
2019-09-09 17:37:14 +02:00 |
|
Yana De Pauw
|
ee76c256f8
|
Merge branch 'master' into Move-item-component
|
2019-09-09 11:06:16 +02:00 |
|
lhenze
|
9e8dd6f349
|
Adding Var Directive to tests as needed
|
2019-09-08 21:38:08 -04:00 |
|
Terry Brady
|
754abdd2ec
|
correct data load script
|
2019-09-06 20:32:11 -07:00 |
|
Terry Brady
|
0b1bc9fe65
|
Use v2 compose files
|
2019-09-06 20:27:44 -07:00 |
|
lhenze
|
1099c42eb1
|
Merge branch 'master' into 460-coll-pages
|
2019-09-06 16:10:23 -04:00 |
|
Art Lowel
|
80706b9f61
|
Merge pull request #437 from atmire/w2p-62355_optimize-search-performance
Search performance optimisations #2
|
2019-09-06 16:35:45 +02:00 |
|
Tim Donohue
|
3c9fdec8dd
|
Merge pull request #466 from terrywbrady/travis-docker
Start Docker Compose for end-to-end (e2e) Testing
|
2019-09-06 16:12:48 +02:00 |
|
lotte
|
e518380025
|
fixed import issues
|
2019-09-06 16:07:37 +02:00 |
|
Tim Donohue
|
ddd1bb42cf
|
Spelling fixes
|
2019-09-06 08:38:48 -05:00 |
|
Tim Donohue
|
56c479f73d
|
Merge pull request #476 from Flusspferd123/spellingMistake
Typo in dropdown-field-parser.ts fixed
|
2019-09-06 15:36:31 +02:00 |
|
Art Lowel
|
af3cc28f43
|
Merge pull request #478 from atmire/Clean-build-folder-pretest
Clean build folder pre-tests
|
2019-09-06 15:36:08 +02:00 |
|
lotte
|
2b24caba34
|
Merge branch 'master' into w2p-62355_optimize-search-performance
|
2019-09-06 15:22:44 +02:00 |
|
Kristof De Langhe
|
bf039978be
|
62589: test environment comment
|
2019-09-06 14:30:57 +02:00 |
|
Kristof De Langhe
|
431d7e12b1
|
62589: Clean build folder pre-tests
|
2019-09-06 14:09:21 +02:00 |
|
Julius Gruber
|
92f8a5d522
|
Typo in dropdown-field-parser.ts fixed
|
2019-09-06 13:22:43 +02:00 |
|
Tim Donohue
|
3a68b6dd7b
|
Merge pull request #474 from atmire/master-travis-test-fixes
master travis test fixes
|
2019-09-05 18:50:53 +02:00 |
|
Kristof De Langhe
|
6c4d461ade
|
master travis test fixes
|
2019-09-05 18:24:03 +02:00 |
|
Art Lowel
|
f9c5768ee3
|
Merge pull request #443 from atmire/UI-language-cookie
UI language cookie
|
2019-09-05 17:22:16 +02:00 |
|
L. Henze
|
f443a2bcce
|
Excess whitespace removed
|
2019-09-05 10:52:05 -04:00 |
|
benbosman
|
c4c6de66de
|
Merge pull request #402 from atmire/Item-Relations-Edit-Delete
Item relations edit delete
|
2019-09-05 15:59:41 +02:00 |
|
lotte
|
9723d929e1
|
resolved issues after merge with master
|
2019-09-05 10:44:37 +02:00 |
|
lotte
|
b634799ef9
|
Merge branch 'master' into w2p-62355_optimize-search-performance
|
2019-09-05 10:16:51 +02:00 |
|
lhenze
|
20bc4d1c2d
|
tidying - whitespace only
|
2019-09-04 17:12:52 -04:00 |
|