Commit Graph

2969 Commits

Author SHA1 Message Date
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
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
39f38215d2 Atmire dspace 3.0 workflow contribution 2012-08-23 08:50:47 +02:00
Fabio Bolognesi
4d09619dbb [DS-895] Advanced Embargo Project : Fix JUnit Tests and Correct Database Schema 2012-08-20 16:39:23 -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
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
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
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
robintaylor
58e389dd96 [DS-1208] - reinstate various comments in dspace.cfg 2012-08-10 15:29:38 +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
helix84
e634c6edf5 Merge pull request #26 from helix84/archaelogy-and-restoration
make the dspace-info.pl caveman work in a new era
2012-08-07 04:13:38 -07:00
KevinVdV
bf34b21bcf [DS-1229] @mire discovery contribution 2012-08-07 09:47:21 +02:00
robintaylor
033ebc6496 Add Google Analytics tracking property for jspui to dspace.cfg 2012-08-06 15:09:55 +01:00
Mark H. Wood
8bb7a3a50f Merge remote-tracking branch 'upstream/master' into DS-861 2012-08-02 16:48:09 -04:00
Steve Swinsburg
8a6b269153 DS-1211 upgrade to Servlet API 2.4, and other compatible dependencies 2012-07-12 16:54:23 +10:00
Mark H. Wood
f3f9433bfe [DS-861] Oops, forgot to add new files. 2012-07-11 13:04:24 -04:00
Mark H. Wood
95a04c0f39 [DS-861] Begin to add password salting. 2012-07-11 13:02:15 -04:00
Steve Swinsburg
fb69ec7ce2 DS-1209 all adjust files for the build time filtering 2012-07-10 16:21:54 +10:00
Steve Swinsburg
ad529f1584 DS-1209 adjust additions pom so that servlet-api is bundled into lib directory 2012-07-10 15:54:44 +10:00
Ivan Masár
c671278070 remove executable attr from regular files 2012-06-21 11:13:54 +02:00
Mark Diggory
77a685f269 Merge pull request #29 from LongsightGroup/DS-1197
DS-1197 remove mention of Manakin in default news-xmlui.xml
2012-06-20 09:11:03 -07:00
Sam Ottenhoff
38cc9f0fb5 DS-1197 remove mention of Manakin in default news-xmlui.xml 2012-06-20 11:59:19 -04:00
Mark H. Wood
d549bb3b0f Missing license comments 2012-06-19 10:59:10 -04:00
Ivan Masár
7474c6f880 make the dspace-info.pl caveman work in a new era 2012-06-15 15:15:48 +02:00
Ivan Masár
4e77d36bb3 fix another bunch of typos 2012-06-13 17:06:52 +02:00
Sam Ottenhoff
2058701ae2 DS-1192 new property to skip XMLUI ip checks during login 2012-06-08 16:41:04 -04:00
Mark Diggory
fa173cf102 Merge pull request #21 from mwoodiupui/DS-1043
[DS-1043] Split code installation out of fresh_install.
2012-06-07 21:34:14 -07:00
Mark Diggory
98199a0e72 Merge pull request #14 from helix84/sfx-button
[DS-820] SFX button + SFX in Mirage
2012-06-07 21:31:58 -07:00
Mark Diggory
bcfe56e5e1 Merge pull request #3 from mdiggory/additional-patch
[DS-981] API Project and build assembly restructure
2012-06-07 21:27:48 -07:00
Mark H. Wood
3a3475b02e [DS-1043] Split code installation out of fresh_install. 2012-06-07 11:51:09 -04:00
Ivan Masár
7799c3b263 DS-1178: XSLT stylesheet for OAI-PMH 2012-05-25 16:01:25 +02:00
Ivan Masár
959f9abedc DS-820: SFX button + SFX in Mirage 2012-05-23 10:31:19 +02:00
KevinVdV
32ad3c427c [DS-981] API Project and build assembly restructure 2012-05-16 21:34:28 +02:00
Mark Diggory
7ef850c8c7 Merge pull request #9 from robintaylor/DS-1160
[DS-1160] - Refactor InitializeDatabase to use Configuration Service rather than Configurationmanager...
2012-05-10 22:38:41 -07:00
Mark Diggory
eacbec7174 [DS-981] API Project and build assembly restructure 2012-05-09 17:15:49 -07:00
robin
824e526d1a [DS-1160] - Refactor InitializeDatabase to use Configuration Service rather than ConfigurationManager 2012-05-07 10:57:44 +01:00
Mark H. Wood
d6e20eba61 Catch up with current stock.
Merge remote branch 'stock/master' into testing-env

Conflicts:
	dspace-api/src/test/resources/dspace-test.cfg
	dspace-api/src/test/resources/dspaceFolder/config/dspace.cfg
	dspace-api/src/test/resources/dspaceFolder/config/input-forms.xml
	dspace-api/src/test/resources/dspaceFolder/config/item-submission.xml
	dspace-api/src/test/resources/dspaceFolder/config/modules/authentication-shibboleth.cfg
	dspace-api/src/test/resources/dspaceFolder/solr/statistics/conf/schema.xml
2012-05-04 10:30:16 -04:00
Robin Taylor
67558c447a Merge pull request #7 from robintaylor/master
[DS-1156] Refactor Browse related code out of InitializeDatabase into InitializeBrowseDatabase
2012-05-03 01:19:24 -07:00
Ivan Masár
b8cefdce04 fix typos and some whitespace
* fixes typos almost exclusively in comments and strings
* fixes whitespace where combination of tabs and spaces may break indentation
* doesn't touch typos in config property names to prevent breakage
2012-04-20 16:27:02 +02:00
Mark H. Wood
cbfbeea896 Merge branch 'master' of git@github.com:DSpace/DSpace.git into testing-env 2012-04-19 15:29:20 -04:00
Tim Donohue
6bf9b33e61 Fix bad reference in <parent> of dspace/modules/solr/pom.xml file. The 'dspace-pom' module no longer exists. Changed this to just point at org.dspace.modules (like everything else in dspace/modules/). 2012-04-16 16:10:22 -05:00
robin
3d4f40f4dc [DS-1156] Factor out Browse related code from InitializeDatabase into InitializeBrowseDatabase. 2012-04-12 14:31:32 +01:00
Mark H. Wood
3e64fbce90 take up POM fixes for move to GitHub 2012-04-02 13:51:28 -04:00
Mark Diggory
6611a69e74 [DS-1150] Migrate to GitHub : Correct SCM Locations and project URL 2012-03-31 13:01:43 -07:00
Mark H. Wood
928933f76f re-apply changes from modified SVN checkout 2012-03-29 16:46:39 -04:00
Tim Donohue
b49e6bafff Committing a slightly updated version of DSpace PDF Manual for 1.8.2 (just syncing Trunk with 1.8.x branch)
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6953 9c30dcfa-912a-0410-8fc2-9e0234be79fd
2012-02-24 15:52:19 +00:00