Commit graph

5006 commits

Author SHA1 Message Date
Graham Triggs
412d09fd6a Tenderfoot theming updates 2017-05-25 23:03:04 +01:00
Graham Triggs
691e9faf4c Use older D3 v3 for capability map (avoids complex upgrade to v4 for now) 2017-05-23 19:52:01 +01:00
Jim Blake
668ab0c10d VIVO-1319 Remove dependency on sourceforge.net JSON parser. (#53)
* VIVO-1247, remove duplicate code used with ConfigurationBeanLoader.

Now that the @Property annotation includes cardinality parameters, we can remove a lot of duplicate code.

* Use Jackson JSON library instead of net.sf.json

JSONNode, JSONArray, JSONObject become JsonNode, ArrayNode, and ObjectNode.
No direct replacement for HSONSerializer, so create JacksonUtils

Some of the message signatures are different, so adjust accordingly.
2017-05-22 19:59:29 +01:00
Graham Triggs
5c69f1081f Homepage updates 2017-05-19 23:11:15 +01:00
Jim Blake
5480778e10 Merge branch 'develop' of git://github.com/vivo-project/VIVO into develop 2017-05-15 21:31:04 -04:00
Graham Triggs
3fced3d550 Improve button position 2017-05-10 16:56:26 -04:00
Graham Triggs
847a480713 Co-investigator visualisation fix 2017-05-10 16:39:15 -04:00
Graham Triggs
92fc03ea75 Update Tenderfoot with latest Wilma text 2017-05-10 16:15:08 -04:00
Graham Triggs
14b4f7ba36 Improve spacing 2017-05-10 16:04:49 -04:00
Graham Triggs
fe153f0d46 Fix incorrect blockUI link 2017-05-10 16:04:27 -04:00
Graham Triggs
5f0ef22ed1 Merge branch 'develop' into feature/theming
# Conflicts:
#	webapp/src/main/webapp/js/d3.min.js
2017-04-30 19:31:41 +01:00
Graham Triggs
b68eb76008 Fix display of hidden items. 2017-04-30 18:21:11 +01:00
Steve McKay
bc5b119c12 [VIVO-1315] Plum print integration (#52) 2017-04-30 13:15:07 +01:00
Jim Blake
2e4af4c3f4 Merge branch 'develop' of git://github.com/vivo-project/VIVO into develop 2017-04-25 17:09:30 -04:00
Nate Prewitt
b0536a4721 Merge pull request #43 from nateprewitt/license
VIVO-1286 Updating License Info
2017-04-25 13:47:20 -06:00
Nate Prewitt
e49cef40fe
updating year in LICENSE 2017-04-21 17:18:35 -06:00
Nate Prewitt
76a60b2a94
adding missing licenses and updating listings 2017-04-21 17:13:35 -06:00
Nate Prewitt
35b01dda5f
moving license file front and center 2017-04-21 17:13:27 -06:00
Nate Prewitt
34afa4e43b
updating license path 2017-04-21 17:12:47 -06:00
Graham Triggs
2f405ac4d8 Homepage structure and footer changes. 2017-04-08 07:08:31 -06:00
Graham Triggs
4b7322e351 Hide past positions 2017-04-08 06:17:52 -06:00
Graham Triggs
5c75f676f1 Reposition rdf / qr buttons 2017-04-07 17:08:12 -06:00
Graham Triggs
dc13a18903 Reformat vis buttons 2017-04-07 16:47:32 -06:00
Graham Triggs
9e2f8439ef Cumulative publications graph 2017-04-07 15:25:48 -06:00
Graham Triggs
5449579543 Update D3 to v4 2017-04-07 11:36:29 -06:00
Graham Triggs
fe61343ce5 Person layout changes 2017-04-07 07:46:27 -06:00
Jim Blake
21a1df1c3a VIVO-1258 derive location of log files from CATALINA_BASE instead of CATALINA_HOME (#51) 2017-04-05 09:14:39 -04:00
Jim Blake
692badf678 Merge commit 'd98f5133183649779f19f8b7a6e65464353a438e' into develop
* commit 'd98f5133183649779f19f8b7a6e65464353a438e':
  [VIVO-1316] moving base lookup services for vocabulary services to Vitro (#50)
  Fix Altmetric badge display for publications with only PMID (#49)
  Testing Travis trusty (beta) environment
  VIVO-1248 extend SparqlQueryRunner, and combine with older attempts. (#36)
2017-03-12 20:11:38 -04:00
Graham Triggs
20fda7455b Updates to Tenderfoot individual display 2017-02-27 07:57:12 +00:00
Graham Triggs
7fd772c772 Updates to Tenderfoot individual display 2017-02-26 21:02:02 +00:00
Graham Triggs
7b7bffdc41 Updates to Tenderfoot individual presentation 2017-02-24 18:07:24 +00:00
Graham Triggs
d46dca75c3 Update to Tenderfoot 2017-02-19 22:12:56 +00:00
Graham Triggs
1774a07ffa Merge branch 'develop' into feature/theming 2017-02-15 19:27:47 +00:00
hudajkhan
d98f513318 [VIVO-1316] moving base lookup services for vocabulary services to Vitro (#50) 2017-02-10 15:55:41 +00:00
Steve McKay
72b2538019 Fix Altmetric badge display for publications with only PMID (#49) 2017-02-03 11:09:11 +00:00
Graham Triggs
f63ce1cbd0 Testing Travis trusty (beta) environment 2017-01-26 17:35:40 +00:00
Jim Blake
da0b68f001 VIVO-1248 extend SparqlQueryRunner, and combine with older attempts. (#36)
* VIVO-1247, remove duplicate code used with ConfigurationBeanLoader.

Now that the @Property annotation includes cardinality parameters, we can remove a lot of duplicate code.

* Ignore artifacts that Eclipse creates.

* VIVO-1248 Remove references to older SPARQL utils

edu.cornell.mannlib.vitro.webapp.utils.sparql package
edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryRunner
2017-01-03 13:19:48 -05:00
Jim Blake
b87bf74e4b Merge branch 'develop' of git://github.com/vivo-project/VIVO into develop 2017-01-03 13:03:20 -05:00
Jim Blake
15638f6ac1 VIVO-1247, remove duplicate code used with ConfigurationBeanLoader. (#47)
Now that the @Property annotation includes cardinality parameters, we can remove a lot of duplicate code.
2017-01-03 12:16:38 -05:00
Graham Triggs
877b54f4a6 Moved jaxrpc from Vitro 2016-12-24 12:07:11 +00:00
Graham Triggs
fe5db3142d Gemet moved to HTTPS 2016-12-24 10:54:56 +00:00
Graham Triggs
1b67e75e28 Fix StringUtils import (shouldn’t have been using the one in Axis) 2016-12-24 09:28:42 +00:00
Graham Triggs
c5c9997764 Fix StringUtils import (shouldn’t have been using the one in Axis) 2016-12-24 09:24:34 +00:00
Graham Triggs
ddff01d29f Remove Axis (only used by agrovocws) 2016-12-24 09:20:58 +00:00
grahamtriggs
fd00dfbc0d [VIVO-1312] Linked Data Fragments initial implementation (#48) 2016-12-23 21:55:28 +00:00
Graham Triggs
b83d4101a2 Update POM to require Java 8 (Jena 3.x does not support earlier versions) 2016-12-21 14:12:48 +00:00
Graham Triggs
c2b1cf8d73 Remove unused Agrovoc web services code 2016-12-21 09:59:09 +00:00
Graham Triggs
3a3cac9513 Change CSV parser 2016-12-20 08:47:21 +00:00
Graham Triggs
ce85c363dc Help Travis by caching Maven dependencies 2016-12-19 11:11:40 +00:00
Graham Triggs
06200d37ec Update commons-lang to 3.4 (same as used by Jena 3.1.1) 2016-12-17 20:11:03 +00:00