Commit graph

18 commits

Author SHA1 Message Date
Ralph O'Flinn
b45d20c9e4 VIVO-1614 - Update to allow the TPF API to be toggled via the runtime.properties. (#127)
* Update to allow the TPF API to be toggled via the runtime.properties.

Resolves: https://jira.duraspace.org/browse/VIVO-1614
2019-08-02 13:20:15 -04:00
Ralph O'Flinn
d8649a60ad Merge branch 'sprint-search' into dev-search
# Conflicts:
#	home/src/main/resources/solr/README.txt
#	home/src/main/resources/solr/conf/admin-extra.html
#	home/src/main/resources/solr/conf/clustering/carrot2/kmeans-attributes.xml
#	home/src/main/resources/solr/conf/clustering/carrot2/lingo-attributes.xml
#	home/src/main/resources/solr/conf/clustering/carrot2/stc-attributes.xml
#	home/src/main/resources/solr/conf/currency.xml
#	home/src/main/resources/solr/conf/elevate.xml
#	home/src/main/resources/solr/conf/lang/contractions_it.txt
#	home/src/main/resources/solr/conf/lang/stoptags_ja.txt
#	home/src/main/resources/solr/conf/lang/stopwords_ar.txt
#	home/src/main/resources/solr/conf/lang/stopwords_ca.txt
#	home/src/main/resources/solr/conf/lang/stopwords_el.txt
#	home/src/main/resources/solr/conf/lang/stopwords_fi.txt
#	home/src/main/resources/solr/conf/lang/stopwords_hi.txt
#	home/src/main/resources/solr/conf/lang/stopwords_hu.txt
#	home/src/main/resources/solr/conf/lang/stopwords_lv.txt
#	home/src/main/resources/solr/conf/lang/stopwords_ro.txt
#	home/src/main/resources/solr/conf/mapping-FoldToASCII.txt
#	home/src/main/resources/solr/conf/schema-old.xml
#	home/src/main/resources/solr/conf/schema.xml
#	home/src/main/resources/solr/conf/solrconfig-old.xml
#	home/src/main/resources/solr/conf/solrconfig.xml
#	home/src/main/resources/solr/conf/stopwords-name.txt
#	home/src/main/resources/solr/conf/velocity/VM_global_library.vm
#	home/src/main/resources/solr/conf/velocity/jquery.autocomplete.css
#	home/src/main/resources/solr/conf/velocity/jquery.autocomplete.js
#	home/src/main/resources/solr/conf/velocity/main.css
#	home/src/main/resources/solr/conf/velocity/query_group.vm
#	home/src/main/resources/solr/conf/velocity/query_spatial.vm
#	home/src/main/resources/solr/conf/velocity/richtext_doc.vm
#	home/src/main/resources/solr/conf/xslt/example.xsl
#	home/src/main/resources/solr/conf/xslt/example_atom.xsl
#	home/src/main/resources/solr/conf/xslt/example_rss.xsl
#	home/src/main/resources/solr/conf/xslt/luke.xsl
#	home/src/main/resources/solr/conf/xslt/updateXml.xsl
#	home/src/main/resources/solr/solr.xml
#	home/src/main/resources/solr/solr_newversion.xml
2019-06-21 12:04:45 -05:00
gneissone
bd6140a8cc Remove trailing whitespace throughout project 2019-05-03 12:50:05 -04:00
Stefan-Wolff
129e1219a8 [VIVO-1528] Select an editor for input fields based on annotation (#76)
* provide WYSIWYG editor for range XMLLiteral only

* Update defaultDataPropertyForm.ftl

* add annotation based selection of the desired editor for editing values
of datatype properties in the frontend

* create new annotation vitro:editing to allow configuration of desired
editor for editing of related dataproperties

Resolves: https://jira.duraspace.org/browse/VIVO-1528
2018-12-07 09:14:36 -05:00
Andrew Woods
8a68ef8a3d [VIVO-1592] Remove embedded Solr (#83)
* Remove embedded Solr

Related to: https://jira.duraspace.org/browse/VIVO-1592

* Fix merge conflict in pom.xml files

Related to https://jira.duraspace.org/browse/VIVO-1592
2018-10-17 22:36:30 -04:00
Mike Conlon
111c0a8ee5
Merge pull request #73 from Asimq/develop
Moved password encryption from MD5 to a salted and secure hash - 1448
2018-05-23 13:49:04 -04:00
AsimA
aeb9754500 Fixed the styling 2018-05-18 16:40:08 +02:00
Asim
752f9d1229 Fixed the tests 2018-05-09 13:51:11 +02:00
Graham Triggs
afaed98291 [VIVO-1470] Cross-platform improvements for Maven (#68) 2018-05-02 12:49:53 +03:00
Asim
067e629a9c Changed Md5 password hashing to Argon2i password hashing 2018-04-23 10:02:51 +02:00
Jim Blake
8cba661a0e VIVO-1408 Use prefix to simplify JAVA class URIs 2018-01-10 08:51:41 -05:00
Graham Triggs
a610e0ed25 [VIVO-1397] Faster and more reliable Solr indexing 2017-10-10 13:06:44 +01:00
Graham Triggs
35ecf4ddc5 Remove deprecated solr config 2017-10-04 20:24:38 +01:00
Nate Prewitt
000da50219
updating license path 2017-05-06 14:40:28 -06:00
Graham Triggs
bfa46ef9fe Add Jena tools to home project 2017-03-29 22:14:19 +01:00
Graham Triggs
437bb9f515 [VIVO-1236] Add TwelveMonkeys ImageIO library for full OpenJDK image support 2016-05-02 14:12:25 +01:00
Graham Triggs
af77804dfe Move unnecessary files out of home directory 2015-11-25 13:58:02 +00:00
Graham Triggs
e1ff94ccaf Maven migration (first draft) 2015-11-19 23:47:12 +00:00