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

6288 commits

This branch
This branch
All branches
Author SHA1 Message Date
grahamtriggs
1ee0ef72a8 Merge pull request #38 from vivo-project/feature/1245-resolve-duplication 
[VIVO-1245] Reduce code duplication and class overwriting in VIVO
 2016-05-26 19:23:29 +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
5cbcab5bcc [VIVO-1245] Cleanup of ManageLabelsGenerator 2016-05-24 21:52:32 +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
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
Paul Friedman
bc6eda75b1 Use posix extensions for maven-assembly-plugin 
After encountering the following error when attempting to build the application with maven

  [ERROR] Failed to execute goal org.apache.maven.plugins:maven-assembly-plugin:2.5.5:single (default) on project vitro-home: Execution default of goal org.apache.maven.plugins:maven-assembly-plugin:2.5.5:single failed: group id '1162086330' is too big ( > 2097151 ). Use STAR or POSIX extensions to overcome this limit -> [Help 1]

set the tarLongFileMode option to posix as it says in the error message and in the FAQ

  https://maven.apache.org/plugins/maven-assembly-plugin/faq.html#tarFileModes
 2016-02-16 13:01:14 -06: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