litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/vivo-project/Vitro

Browse source
This commit is contained in:
chenejac 2022-08-26 16:05:42 +02:00
commit 3c2eb97104
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java
View file

@ -338,7 +338,7 @@ public class JSONReconcileServlet extends VitroHttpServlet {
} }
resultJson.put("type", typesJsonArr); resultJson.put("type", typesJsonArr);
resultJson.put("match", "false"); resultJson.put("match", false);
resultJsonArr.add(resultJson); resultJsonArr.add(resultJson);
} catch (Exception e) { } catch (Exception e) {

16
home/src/main/resources/config/example.runtime.properties
View file

@ -34,16 +34,16 @@ Vitro.defaultNamespace = http://vivo.mydomain.edu/individual/
vitro.local.solr.url = http://localhost:8983/solr/vitrocore vitro.local.solr.url = http://localhost:8983/solr/vitrocore
# #
# Email parameters which VIVO can use to send mail. If these are left empty, # Email parameters Vitro uses to send email. If these are left empty,
# the "Contact Us" form will be disabled and users will not be notified of # the "Contact Us" form will be disabled and users will not be notified of
# changes to their accounts. # changes to their accounts.
# Example: # Example:
# email.smtpHost = smtp.mydomain.edu # email.smtpHost = smtp.mydomain.edu
# email.replyTo = vitroAdmin@mydomain.edu # email.replyTo = vitroAdmin@mydomain.edu
# email.username = vivtroAdmin@mydomain.edu # email.username = vivtroAdmin@mydomain.edu
# email.password = secret # email.password = secret
# email.port = 25 or 465 or 587 # email.port = 25 or 587
# #
email.smtpHost = email.smtpHost =
email.replyTo = email.replyTo =