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

6465 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
e13eefb3ac clean overlays from web apps 2016-06-26 15:45:29 +01:00
Graham Triggs
d06ecc167c Add GPG version 2016-06-26 15:37:21 +01:00
Graham Triggs
b0fd0c6b9e Remove unnecessary dependencies 2016-06-24 20:31:19 +01:00
Graham Triggs
4c215840e8 Add Jim Blake 2016-06-24 16:36:13 +01:00
Graham Triggs
83a9395a2d Add John Fereira 2016-06-24 14:03:20 +01:00
Graham Triggs
0c68c2df55 Add doclint disable for Java 1.8 2016-06-23 22:41:22 +01:00
Graham Triggs
d2147171b2 Add developer information 2016-06-23 22:22:05 +01:00
Graham Triggs
1e06025ccc Add GPG signing 2016-06-23 21:51:35 +01:00
Graham Triggs
94ea5c8dfa Ensure staged deployments are not automatically closed 2016-06-23 21:35:03 +01: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
Jim Blake
41ff46e771 VIVO-1246 The documentation was in the wrong place. 2016-06-21 14:06:04 -04:00
Jim Blake
0709ca504e Merge branch 'develop' of git://github.com/vivo-project/Vitro into develop 
# By Graham Triggs
# Via grahamtriggs (2) and Graham Triggs (1)
* 'develop' of git://github.com/vivo-project/Vitro:
  [VIVO-1224] Suppress default "synthetic" model from the lists on the ingest pages
  [VIVO-1230] Make contact form compatible with SMTP relays
  [VIVO-1233] Wrap large buttons on ontology edit page
  Fix error message (change erroneous UPDATE to SELECT)
 2016-06-21 10:09:02 -04: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
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