litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6077 commits 9 branches 0 tags 258 MiB
Commit graph

6077 commits

This branch
This branch
All branches
Author SHA1 Message Date
Graham Triggs
ca45b5e93d [VIVO-1222] Add revisionInfo to build 2016-05-23 15:11:16 +01:00
Graham Triggs
a484532b01 [VIVO-1242] Merge branch 'brianjlowe-writePerformance' into develop 2016-05-03 11:18:39 +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
721a7fb892 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2016-04-29 21:03:57 +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
Tim Worrall
9f21c8c976 Update level on ARG_0000028 faux properties was not working correctly due to a bug in the edit link macro. 2016-04-29 13:01:35 -04: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
6480478002 Merge pull request #35 from OpenVIVO/develop 
Update JSTL dependencies
 2016-03-28 15:41:51 +01:00
Graham Triggs
aa3b011479 Update JSTL dependencies 2016-03-28 15:39:58 +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
df7c74206a [VIVO-1236] Remove dependency from compile that causes problems with OpenJDK 2016-03-25 14:34:38 +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
Graham Triggs
c7ca626121 Updated Freemarker 2016-03-07 21: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
brianjlowe
724d8df369 Merge branch 'writePerformance-1.8' into writePerformance 2016-02-11 16:30:19 +02:00
Graham Triggs
9ff3dd5e11 [VIVO-1226] bug fix for search help back link 2016-01-21 15:55:49 +00:00
Ariel D. Moya Sequeira
950aecf7ab Adds UTF-8 charset to emails 2016-01-20 15:51:10 +00:00
Ariel D. Moya Sequeira
8660ed91eb Adds UTF-8 charset to emails 2016-01-20 15:51:09 +00:00
Ariel D. Moya Sequeira
9a2cc3a9cc Adds UTF-8 charset to emails 2016-01-20 15:51:08 +00:00
Ariel D. Moya Sequeira
074d9f98cf Adds UTF-8 charset to emails 2016-01-20 15:51:07 +00:00
grahamtriggs
3fb5f80119 Merge pull request #27 from lawlesst/fix/yasqe-js 
Move yasqe js to required location.
 2016-01-07 14:02:23 +00:00
Ted Lawless
11d8a91469 Move yasqe js to required location. 2016-01-06 14:20:43 -05:00
brianjlowe
64cfc4a370 improvements to RDFServiceGraph triple batching 2015-12-20 18:44:11 +02:00
brianjlowe
6e3a256596 fix to allow for batch handling of more complex SPARQL updates 2015-12-19 18:43:16 +02:00
Graham Triggs
f3fb439c15 Change DWR dependency to an unreleased version, due to session errors 2015-12-17 19:34:17 +00:00
Graham Triggs
661b1e7c88 Add JSP dependencies 2015-12-17 16:22:18 +00:00
brianjlowe
de9d40694f moving IndividualURIQueue to its new mavenized home 2015-12-14 20:00:30 +02:00
brianjlowe
5d33da415d remove obsolete files 2015-12-14 17:26:53 +02:00
brianjlowe
01281d2034 Merge branch 'develop' into writePerformance 
Conflicts:
	api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ABoxJenaChangeListener.java
	api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaChangeListener.java
	api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/ListeningGraph.java
 2015-12-14 17:19:32 +02:00
brianjlowe
ce1ec1158f remove obsolete code 2015-12-13 14:09:56 +02:00
brianjlowe
ace972dd73 minor fixes 2015-12-12 23:27:36 +02:00
brianjlowe
17fab2894c misc. cleanup / minor fixes 2015-12-12 22:58:06 +02:00
brianjlowe
e85e8a4e22 remove obsolete import 2015-12-12 22:04:45 +02:00
brianjlowe
539bffd6bf change to listener interface to simplify things and avoid sharing the reasoner's individual queue between concurrent writing threads 2015-12-12 21:51:50 +02:00
brianjlowe
295ddbfad1 add/remove ABox portion of mixed RDF through RDFService 2015-12-11 20:37:56 +02:00
brianjlowe
d13fdf8124 bulk graph clear from ingest tools 2015-12-11 19:02:10 +02:00
brianjlowe
5ae16cf9e5 clean up / remove unneeded methods in SimpleReasoner 2015-12-11 17:35:03 +02:00
Michael Conlon
14b1027943 correct links 2015-12-11 09:48:00 -05:00
brianjlowe
f0992605ce passes sameAs unit tests 2015-12-10 18:34:54 +02:00
brianjlowe
a4649a7751 log level change 2015-12-09 22:10:00 +02:00
brianjlowe
6e99b1c707 reverting a small rearrangement of VClassGroupCache to avoid changing the unit test 2015-12-09 22:08:00 +02:00