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

6450 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
grahamtriggs
b0d0925101 Merge pull request #41 from vivo-project/feature/1230 
[VIVO-1230] Make contact form compatible with SMTP relays
 2016-06-02 15:00:44 +01:00
Graham Triggs
4df281bcd2 [VIVO-1230] Make contact form compatible with SMTP relays 2016-06-02 14:06:16 +01:00
grahamtriggs
1493711434 Merge pull request #40 from vivo-project/feature/1233 
[VIVO-1233] Wrap large buttons on ontology edit page
 2016-06-01 15:30:34 +01:00
Graham Triggs
6e520da662 [VIVO-1233] Wrap large buttons on ontology edit page 2016-06-01 15:29:57 +01:00
Graham Triggs
e7336ab019 Fix error message (change erroneous UPDATE to SELECT) 2016-05-31 23:30:45 +01:00
Jim Blake
ac6f8722d7 VIVO-1246 Move unit tests to the new location. 2016-05-31 12:25:52 -04:00
Jim Blake
d752989003 VIVO-1247, remove duplicate code used with ConfigurationBeanLoader. 
Now that the @Property annotation includes cardinality parameters, we can remove a lot of duplicate code.
 2016-05-29 16:12:43 -04:00
Jim Blake
efbc3e3da4 Merge branch 'develop' of git://github.com/vivo-project/Vitro into develop 2016-05-29 12:20:11 -04:00
Jim Blake
481a215206 VIVO-1246 improve the ConfigurationBeanLoader: 
Add cardinality parameters minOccurs and maxOccurs
Create README.md document in the edu.cornell.mannlib.vitro.webapp.utils.configuration package
Split large class of unit tests into separate classes by functionality
 2016-05-29 10:25:23 -04:00
Graham Triggs
607ce353ce Add initial travis configuration 2016-05-27 12:06:43 +01:00
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