helix84
462ed4437c
Merge pull request #1559 from helix84/DS-3363-csv-import-error-messages
...
DS-3363 CSV import error says "row", means "column"
2016-11-14 18:24:38 +01:00
helix84
a60a1f61e8
Merge branch 'master' into DS-3363-csv-import-error-messages
2016-11-14 18:04:18 +01:00
helix84
030242a7ff
DS-3386 Travis build on both Java 7 and 8 ( #1571 )
2016-11-14 10:57:50 -06:00
Tim Donohue
f2e7cbf8bc
Merge pull request #1570 from helix84/DS-3384-travis-oraclejdk8
...
DS-3384 tell Travis CI to build using Oracle JDK 8
2016-11-14 10:29:42 -06:00
Ivan Masár
8383ad0228
DS-3384 tell Travis CI to build using Oracle JDK 8
2016-11-14 16:49:38 +01:00
helix84
288be9bbc6
Merge pull request #1569 from helix84/reenable-doclint
...
DS-3384 re-enable DocLint
2016-11-13 19:47:39 +01:00
Ivan Masár
f7c0577a7c
revert doclint-java8-disable
2016-11-13 19:18:49 +01:00
Ivan Masár
cae5570643
whitespace per Coding Conventions
2016-11-13 19:18:23 +01:00
Ivan Masár
0b0fab6404
javadoc fixme, whitespace fixes
2016-11-13 19:18:13 +01:00
helix84
dfbaa9074e
Merge pull request #1567 from mwoodiupui/DS-3308
...
Clean up remaining doclint errors and warnings.
2016-11-13 19:17:31 +01:00
Mark H. Wood
d1f321f345
Clean up remaining doclint errors and warnings.
...
Throughout dspace-sword I was baffled by the validation aspect, so
you'll see lots of "UNKNOWN. PLEASE DOCUMENT." that I wrote just to
shut doclint up. If you know how this works, please amend my
placeholders.
2016-11-11 11:48:17 -05:00
Ivan Masár
269af71afb
javadoc (doclint) and whitespace fixes
...
includes whitespace fixes as per Coding Conventions
2016-11-10 13:34:37 +01:00
Ivan Masár
db1641cfa9
fix JavaDoc @author
2016-11-10 13:34:37 +01:00
Ivan Masár
c92b1d8009
typo: xforwarderfor -> xforwardedfor
2016-11-01 16:19:41 +01:00
Mark H. Wood
5ff4ccfedc
After 6.0 release: move master to 7.0-SNAPSHOT
2016-10-28 10:15:54 -04:00
Pascal-Nicolas Becker
f53f3e45cc
Revert "prepare for next development iteration"
...
This reverts commit 543d2098ca
.
2016-10-24 17:30:24 +02:00
Pascal-Nicolas Becker
1cb94c2799
Revert "Also moving mirage2 module to 7.0-SNAPSHOT"
...
This reverts commit 5c4e7ac327
.
2016-10-24 17:30:20 +02:00
Pascal-Nicolas Becker
75260e6d17
Revert "Revert "Also moving mirage2 module to 7.0-SNAPSHOT""
...
This reverts commit 661db4c484
.
2016-10-24 17:11:43 +02:00
Pascal-Nicolas Becker
661db4c484
Revert "Also moving mirage2 module to 7.0-SNAPSHOT"
...
This reverts commit 5c4e7ac327
.
2016-10-24 17:11:34 +02:00
Pascal-Nicolas Becker
5c4e7ac327
Also moving mirage2 module to 7.0-SNAPSHOT
2016-10-24 16:51:24 +02:00
Pascal-Nicolas Becker
543d2098ca
prepare for next development iteration
2016-10-24 16:45:36 +02:00
Pascal-Nicolas Becker
c17f85e4b3
[maven-release-plugin] prepare for next development iteration
2016-10-24 14:40:29 +02:00
Pascal-Nicolas Becker
0fea174368
[maven-release-plugin] prepare release dspace-6.0
dspace-6.0
2016-10-24 14:40:21 +02:00
Ivan Masár
244ec0c214
DS-3363 CSV import error says "row", means "column"
2016-10-24 09:48:24 +02:00
Mark H. Wood
65b76da6e8
[maven-release-plugin] prepare for next development iteration
2016-10-14 13:19:39 -04:00
Mark H. Wood
37bd1743ed
[maven-release-plugin] prepare release dspace-6.0-rc4
dspace-6.0-rc4
2016-10-14 13:19:33 -04:00
Mark H. Wood
12d05985ee
Update third-party licenses
2016-10-14 12:35:07 -04:00
Mark H. Wood
a792d83b81
Merge pull request #1555 from 4Science/DS-3345
...
DS-3345 Add sql script from dspace 5.6
2016-10-12 12:51:23 -04:00
Mark H. Wood
f20a0cb562
Merge pull request #1557 from 4Science/DS-3357
...
DS-3357 rethrow AuthorizationException in the SubmissionControl
2016-10-12 12:14:02 -04:00
Pascal-Nicolas Becker
e70d1622a2
Merge pull request #1526 from lap82/DS-2604-porting-cc
...
DS-2604 port XMLUI's approach to query Creative Commons service (via REST) to JSPUI
2016-10-12 17:40:16 +02:00
Andrea Bollini
fdfcf04c29
DS-3357 rethrow AuthorizationException in the SubmissionControl
2016-10-10 17:14:56 +02:00
Andrea Bollini
5d4e7db302
DS-3345 Add sql script from dspace 5.6
2016-10-10 16:42:07 +02:00
Luigi Andrea Pascarelli
127f79f2ef
DS-3356 add turnoff authz system
2016-10-07 13:24:35 +02:00
Pascal-Nicolas Becker
bab9c563d2
Merge pull request #1551 from pnbecker/jsp.quickfix.2
...
Quickfix for dspace-admin/batchimport.jsp
2016-10-05 22:13:55 +02:00
Pascal-Nicolas Becker
dc3ee219a5
Quickfix for dspace-admin/batchimport.jsp
...
Obvious fix for dspace-admin/batchimport.jsp
2016-10-05 21:56:00 +02:00
Pascal-Nicolas Becker
49584dc5fd
Merge pull request #1550 from DSpace/jsp.quickfix.1
...
use BulkEditMetadataValue.getValue() instead of private field
2016-10-05 21:50:31 +02:00
Pascal-Nicolas Becker
34a3b1b729
use BulkEditMetadataValue.getValue() instead of private field
2016-10-05 21:37:18 +02:00
Tim Donohue
008ad12e71
Merge pull request #1540 from tuub/DS-3311-config
...
DS-3311: Changing default configuration of healthcheck
2016-09-29 09:42:03 -05:00
Pascal-Nicolas Becker
6b59c19ee9
DS-3311: Changing default configuration of healthcheck
2016-09-29 12:44:16 +02:00
Luigi Andrea Pascarelli
9e710912f3
Merge pull request #1539 from 4Science/DS-3346-for-6
...
DS-3346 change and remove deprecated setIgnoreAuthorization in favour…
2016-09-29 00:04:56 +02:00
Luigi Andrea Pascarelli
f577074e69
DS-3346 change and remove deprecated setIgnoreAuthorization in favour of turnOff/restore
2016-09-28 23:39:24 +02:00
Terry Brady
ebeda8cc29
Merge pull request #1536 from terrywbrady/ds3322
...
[DS-3322] Prevent concurrent modification exception in Undo Bulk Ingest
At +2, merging
2016-09-28 13:59:56 -07:00
Terry Brady
3afbff3b1b
Merge pull request #1511 from terrywbrady/ds-3312
...
[DS-3312] Prevent mvn error on xsl override
2016-09-28 13:59:26 -07:00
Tim Donohue
d8b065e0c8
Merge pull request #1513 from isido/fix-healthcheck
...
[DS-3311] Fix healthcheck
2016-09-28 15:10:22 -05:00
Terry Brady
27e557bd83
Prevent concurrent modification exception
2016-09-28 10:21:21 -07:00
Pascal-Nicolas Becker
4607bb90a6
Merge pull request #1515 from atmire/DS-3315
...
DS-3315: update node dependencies
2016-09-28 18:05:01 +02:00
Pascal-Nicolas Becker
97db817ef6
Merge pull request #1534 from tdonohue/DS-3317
...
DS-3317: Don't autoRelease artifacts to Maven Central
2016-09-28 17:28:30 +02:00
Pascal-Nicolas Becker
c92e83e628
Merge pull request #1535 from tuub/DS-3112
...
DS-3122 Set handle.canonical.prefix to the ${dspace.url}/handle.
2016-09-28 17:21:59 +02:00
Pascal-Nicolas Becker
4a33ca5d6f
DS-3122 Set handle.canonical.prefix to the ${dspace.url}/handle.
2016-09-28 17:01:00 +02:00
Tim Donohue
0f10f91e4c
DS-3317: Don't autoRelease artifacts to Maven Central
2016-09-26 12:37:35 -05:00