Commit graph

61 commits

Author SHA1 Message Date
Graham Triggs
36db27b86c Refactor chaining to JSP pages to go through common methods. 2016-10-05 17:42:51 +01:00
grahamtriggs
d1a93743fc Merge pull request #49 from lawlesst/fix/filegraphsetup-turtle
[VIVO-1271] FileGraphSetup loads .ttl extension with TURTLE format rather than N3.
2016-09-21 19:10:20 +01:00
Graham Triggs
5af9f0b3a6 Revert "Split out selector implementation to address java compilation issue"
This reverts commit 70ba4cedab.
2016-09-19 13:43:34 +01:00
Graham Triggs
b103a7b3ce Revert "Split out selector implementation to address java compilation issue"
This reverts commit c35690e5e3.
2016-09-19 13:43:18 +01:00
Graham Triggs
c35690e5e3 Split out selector implementation to address java compilation issue 2016-09-18 21:19:21 +01:00
Graham Triggs
70ba4cedab Split out selector implementation to address java compilation issue 2016-09-18 21:03:24 +01:00
Graham Triggs
1a809c258d [VIVO-1270] Update JSON-LD serialisations 2016-09-09 19:56:50 +01:00
Graham Triggs
b8ef1046e2 [VIVO-1270] Updates to bulk handling 2016-09-09 18:53:16 +01:00
Graham Triggs
478ad12f15 [VIVO-1270] Replacement for BulkUpdateHandler - still need to test Union 2016-09-09 17:54:47 +01:00
Graham Triggs
50bef0d85e [VIVO-1270] Changes to adhere to the RDF 1.1 spec 2016-09-06 16:11:10 +01:00
Graham Triggs
a3c378bb25 [VIVO-1270] Initial commit of Jena 3 2016-09-02 19:59:10 +01:00
Ted Lawless
c77af47618 FileGraphSetup loads .ttl extensions with TURTLE format rather than N3. 2016-09-02 14:49:40 -04:00
Graham Triggs
591bca0c8d Make Idle Time configurable 2016-08-03 18:01:58 +01:00
Graham Triggs
04d361b80c Improve log usage in VitroBackgroundThread 2016-07-28 22:11:29 +01:00
Graham Triggs
2dbceba9f1 Make AltMetric enabled by default 2016-07-28 22:10:58 +01:00
Graham Triggs
83534d49be Minor HttpClient resource cleanups 2016-07-21 21:00:09 +01:00
Graham Triggs
809644f4b8 [VIVO-1082] Clean up pluginManagement 2016-07-06 06:47:56 +01:00
Graham Triggs
61f90dd1e6 [VIVO-1237] Add ability to generate meta tags 2016-07-05 17:52:03 +01:00
grahamtriggs
439b291628 [VIVO-1254] Merge pull request #44 from ardamose123/patch-1
SPARQL query fix in `IndividualSDB` class
2016-06-28 22:33:34 +01:00
Stephan Zednik
687d7e23ed combined conditional and removed commented code 2016-06-28 15:02:53 -06:00
Stephan Zednik
28f2f39be8 update containsNullOrEmpty() to check if list is empty
Also updated the method to use Apache Commons StringUtil::isBlank(String) function to test for blank values in the list.
2016-06-28 11:49:32 -06:00
Graham Triggs
4349724207 JavaDoc changes required to prevent the release process breaking 2016-06-23 20:08:14 +01:00
Graham Triggs
abac59cd18 Changes required for releasing to Maven Central 2016-06-23 18:54:13 +01:00
Ariel D. Moya Sequeira
fe56093224 SPARQL query fix in IndividualSDB class
This fixes an SPARQL query found in the IndividualSDB class, which triggers `NullPointerException`s when trying to use individuals retrieved using the `getRelatedIndividuals()` method. The defect was observed in the Vitro 1.8 release branch.

After fixing this, the `Individual` instances returned by the aforementioned method work correctly.
2016-06-20 15:05:02 -06:00
Graham Triggs
c87a66c949 [VIVO-1224] Suppress default "synthetic" model from the lists on the ingest pages 2016-06-03 15:24:49 +01:00
Graham Triggs
4df281bcd2 [VIVO-1230] Make contact form compatible with SMTP relays 2016-06-02 14:06:16 +01:00
Graham Triggs
e7336ab019 Fix error message (change erroneous UPDATE to SELECT) 2016-05-31 23:30:45 +01:00
Graham Triggs
28a834d6d0 [VIVO-1245] Cleanup IndividualJsonWrapper 2016-05-25 20:59:47 +01:00
Graham Triggs
f3b66a9d42 [VIVO-1245] Cleanup Template Model classes 2016-05-25 19:47:34 +01:00
Graham Triggs
0e37b6a69e [VIVO-1245] Remove SelectDataGetterUtils - can't find any uses 2016-05-25 18:56:14 +01:00
Graham Triggs
825c81002b [VIVO-1245] Cleanup of MenuManagementDataUtils 2016-05-25 18:38:33 +01:00
Graham Triggs
fbeed01a94 [VIVO-1245] Cleanup of NewIndividualFormGenerator, simplify configuration of generators and improve means of configuring in Freemarker 2016-05-25 17:06:21 +01:00
Graham Triggs
64eb1ca6c2 [VIVO-1245] Cleanup of ProcessDataGetterN3Map 2016-05-24 17:37:23 +01:00
Graham Triggs
b285e0d62b [VIVO-1245] Cleanup of DefaultAddMissingIndividualFormGenerator 2016-05-24 17:05:15 +01:00
Graham Triggs
38836c15c9 [VIVO-1245] Cleanup of IndividualSearchResult 2016-05-24 14:33:45 +01:00
Graham Triggs
f50d1d3e48 Merge branch 'writePerformance' of https://github.com/brianjlowe/Vitro into brianjlowe-writePerformance 2016-05-02 19:18:14 +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
73b1b12665 [VIVO-1241] Updated FreemarkerConfigurationImpl to override the correct getTemplate for Freemarker 2.3.23 2016-04-29 21:03:41 +01:00
Graham Triggs
8b088478f0 [VIVO-1240] Improve start up time with the graph equivalence test 2016-04-19 22:16:28 +01:00
grahamtriggs
75b8746026 Merge pull request #37 from OpenVIVO/develop
Add .nt to FileGraphSetup
2016-04-08 20:46:24 +01:00
Graham Triggs
2d5bfd19d0 Add .nt to FileGraphSetup 2016-04-08 20:43:07 +01:00
grahamtriggs
478e3b8217 Merge pull request #36 from OpenVIVO/develop
[VIVO-1238] Add N-TRIPLES support
2016-04-04 15:09:39 +01:00
Graham Triggs
b513ad1056 [VIVO-1238] Add N-TRIPLES support 2016-04-04 15:08:27 +01:00
grahamtriggs
4f9fe39ca3 Merge pull request #34 from OpenVIVO/develop
Suppress dependency that causes OpenJDK problem
2016-03-25 14:35:35 +00:00
Graham Triggs
acf54541a5 [VIVO-1234] Use alternative colour space that should work better with OpenJDK 2016-03-11 15:15:47 +00:00
grahamtriggs
bae17b4293 Merge pull request #33 from OpenVIVO/develop
VIVO-1234 JaiImageProcessor alpha channel problem
2016-03-10 23:28:47 +00:00
Graham Triggs
bbad114f85 [VIVO-1234] Use alternative method to change the colour space of an image and remove the alpha channel 2016-03-10 23:20:35 +00:00
Benjamin Gross
7c42bb3c9f [VIVO-1229] fix siteName and title variable mixup 2016-02-16 10:08:23 -07:00
brianjlowe
97658ad25f Merge remote-tracking branch 'upstream/develop' into writePerformance 2016-02-11 17:49:23 +02:00
brianjlowe
e4a8c4f102 move unit test to new location 2016-02-11 16:38:17 +02:00