Commit Graph

4974 Commits

Author SHA1 Message Date
Mark H. Wood
db04ea2286 Fix SCM section: svn -> git, and zap outdated comment 2012-09-04 11:43:41 -04:00
Mark H. Wood
cc8d060a3c Set Java version to 1.6 (and encoding to UTF-8) 2012-09-04 11:35:39 -04:00
Mark H. Wood
2e1600fccf Reparent dspace-services to Sonaytpe oss-parent, and add up-to-date license checking 2012-09-04 11:30:32 -04:00
Ivan Masár
afff06b106 make an error message more understandable 2012-09-04 17:09:42 +02:00
Robin Taylor
aa93d4ffec Merge pull request #77 from bram-atmire/DS-1251
DS-1251 Make Mirage the default XMLUI theme
2012-09-04 01:25:16 -07:00
Robin Taylor
788ceb2504 Merge pull request #79 from robintaylor/dspace-DS-1208-1
[DS-1208] - fix recursive filtering of web.xml
2012-09-04 01:24:22 -07:00
robintaylor
0b0e84f8b2 [DS-1208] - fix recursive filtering of web.xml 2012-09-03 14:10:00 +01:00
helix84
946f58c996 Merge pull request #64 from lyncode/dspace-with-oai-2.0
[DS-1202] OAI 2.0 (a.k.a XOAI) integrated into DSpace 3.0
2012-09-03 01:40:01 -07:00
Lyncode
2442601073 OAI 2.0 (a.k.a XOAI) integrated into DSpace 3.0 (squashed) 2012-09-03 10:38:09 +02:00
Mark H. Wood
3e965555ab [DSRV-22] Detect indirect circular property references 2012-08-31 12:11:58 -04:00
KevinVdV
c4a9473201 Atmire dspace 3.0 workflow contribution 2012-08-28 15:53:05 +02:00
Bram Luyten
aff4fc8c94 DS-1251 Make Mirage the default XMLUI theme
commenting the reference theme and uncommenting the mirage theme in
xmlui.xconf
2012-08-28 14:39:31 +02:00
Tim Donohue
adb462994b Merge remote-tracking branch 'upstream/master' 2012-08-27 16:15:16 -05:00
Mark H. Wood
7f77bef891 Merge pull request #41 from mwoodiupui/DS-861
[DS-861] Salt PasswordAuthentication
2012-08-27 12:54:44 -07:00
KevinVdV
36a90c6313 [DS-1061] Filenames and BitstreamFormat detection break on filenames with equal signs in them 2012-08-23 16:45:42 +02:00
KevinVdV
a944fbe0d3 [DS-1130] Controlled vocabulary support for the XMLUI (fixing license) 2012-08-23 10:17:47 +02:00
KevinVdV
39f38215d2 Atmire dspace 3.0 workflow contribution 2012-08-23 08:50:47 +02:00
KevinVdV
61c597ae14 [DS-1130] Controlled vocabulary support for the XMLUI 2012-08-22 09:01:57 +02:00
Mark Diggory
deb732e3cb Fix License Headers 2012-08-20 17:21:40 -07:00
Mark Diggory
d25ef489dc Merge pull request #70 from atmire/dspace3-embargo-fixes2
[DS-895] Advanced Embargo Project : Fix JUnit Tests and Correct Database...
2012-08-20 17:06:09 -07:00
Fabio Bolognesi
4d09619dbb [DS-895] Advanced Embargo Project : Fix JUnit Tests and Correct Database Schema 2012-08-20 16:39:23 -07:00
KevinVdV
435e11bd23 Merge pull request #45 from atmire/DS-1229
[DS-1229] @mire discovery contribution
2012-08-20 01:27:09 -07:00
kevin
fbb2002e59 Merge branch 'DS-1229'
Conflicts:
	dspace-xmlui/dspace-xmlui-webapp/src/main/webapp/themes/Mirage/lib/css/style.css
2012-08-20 09:06:24 +02:00
kevin
06e27296f7 Merge remote-tracking branch 'origin/master' 2012-08-16 12:45:48 +02:00
Mark Diggory
1ec9741ac2 Merge pull request #66 from atmire/dspace3-embargo
[DS-895] Advanced Embargo Project, Database Schema Fixes
2012-08-16 03:13:33 -07:00
Mark Diggory
c8891b3008 [DS-895] Advanced Embargo Project, Database Schema Fixes 2012-08-16 03:06:52 -07:00
Mark Diggory
2d050f7af3 Merge pull request #43 from atmire/dspace3-embargo
[DS-895] Advanced Embargo Project
2012-08-16 02:20:32 -07:00
Fabio Bolognesi
4b9b206d8c [DS-895] Advanced Embargo Project 2012-08-16 02:13:51 -07:00
Robin Taylor
a0676ef5fc Merge pull request #56 from sedici/type-based-submission
[DS-1127] document-type based submission support
2012-08-15 12:46:58 -07:00
Tim Donohue
3f4da5ace1 Add license check exclusion for testEnvironment.properties 2012-08-15 09:10:58 -05:00
Mark Diggory
2e6e3d0835 Merge pull request #62 from robintaylor/DS-1208
[DS-1208] - add the new filtered values into testEnvironment.properties
2012-08-15 06:36:29 -07:00
Mark H. Wood
f4419374bb Revert "Fix CRLF line terminators"
This reverts commit ee6fe99d1e.
2012-08-15 09:02:53 -04:00
robintaylor
ac5ff4c81f [DS-1208] - change references to default.dspace.dir to be dspace.dir in selected poms 2012-08-15 10:25:48 +01:00
Mark Diggory
0a5d43470f Merge pull request #42 from steveswinsburg/DS-1211
DS-1211 upgrade to Servlet API 2.4 and other compatible dependencies
2012-08-14 16:28:55 -07:00
Mark Diggory
2c964a710d Merge pull request #31 from KevinVdV/DS-1136
[DS-1136] Breadcrumb trail incorrect for community/collection browse and statistics
2012-08-14 16:18:59 -07:00
Mark Diggory
6ea350efec Merge pull request #25 from KevinVdV/DS-1039
[DS-1039] Item view in Mirage theme broken when ORIGINAL or CONTENT bundle present and empty
2012-08-14 16:15:14 -07:00
Sands Fish
922fc71826 Merge pull request #24 from LongsightGroup/DS-1192
Merging & Closing: DS-1192 new property to skip XMLUI ip checks during login
2012-08-14 13:14:59 -07:00
Sands Fish
47a634f48e Merge pull request #32 from LongsightGroup/DS-1200
Merging:  DS-1200 add styling to statistics tables
2012-08-14 10:32:27 -07:00
Sands Fish
dc935c2e61 Merge pull request #23 from LongsightGroup/DS-1191-master
Merging:  DS-1191 provide a warning in the logs if resumeLogin fails because of ip mismatch
2012-08-14 08:21:13 -07:00
Sam Ottenhoff
78c58f7e72 change log.info to log.warn 2012-08-14 11:03:34 -04:00
robintaylor
2a7eed5c7d [DS-1208] - add the new filtered values into testEnvironment.properties 2012-08-14 10:35:21 +01:00
Andrea Bollini
b90e5514f0 changed .gitignore Eclipse section: no need to be so wide 2012-08-13 13:53:54 +02:00
Ivan Masár
203d9fad27 ignore project files created by Eclipse 2012-08-12 22:51:36 +02:00
Robin Taylor
1c87c25fda Merge pull request #59 from robintaylor/DS-1208
[DS-1208] - reinstate various comments in dspace.cfg
2012-08-10 07:31:59 -07:00
robintaylor
58e389dd96 [DS-1208] - reinstate various comments in dspace.cfg 2012-08-10 15:29:38 +01:00
kevin
d3e6db8d3f [DS-1240] Sword V2 doesn't support the configurable workflow 2012-08-10 14:36:09 +02:00
Robin Taylor
90e90a4041 Merge pull request #57 from robintaylor/DS-1208
[DS-1208] - rename build.properties.sample as build.properties
2012-08-10 01:51:37 -07:00
robintaylor
a73bf3b026 [DS-1208] - rename build.properties.sample as build.properties to avoid a Maven build failure 2012-08-10 09:46:06 +01:00
Robin Taylor
c37fdd3327 Merge pull request #40 from steveswinsburg/DS-1208
DS-1208 Build time filtering to allow multi developer/environment builds
2012-08-10 01:34:32 -07:00
Mark H. Wood
5129c095f3 Document configuration of the digest algorithm and provide a commented-out example. 2012-08-09 11:05:04 -04:00