Commit graph

4467 commits

Author SHA1 Message Date
Holly Mistlebauer
d8738b3102 Holly update more test cases due to RC 2 testing... 2013-11-12 11:48:42 -05:00
hudajkhan
0a90d6a710 Merge branch 'maint-rel-1.6' into develop 2013-11-11 18:47:36 -05:00
hudajkhan
bb28dfa340 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-11-11 18:45:22 -05:00
hudajkhan
8a77103a05 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-11-11 18:44:30 -05:00
hudajkhan
c832112628 Merge branch 'maint-rel-1.6' into develop 2013-11-11 18:43:24 -05:00
hudajkhan
2ba253afb7 skos relates should show just concepts and not subclasses for select existing or add new 2013-11-11 18:42:31 -05:00
brianjlowe
33c27794f5 VIVO-519 offerCreateNew for hasPredecessorOrganization 2013-11-11 16:02:25 -05:00
tworrall
b47900cf1a Merge branch 'maint-rel-1.6' into develop 2013-11-11 10:58:19 -05:00
tworrall
dd6a6bdfdb updated dataset for new ISF properties and reverted test so it would not be ignored 2013-11-11 10:57:54 -05:00
tworrall
6d047d6883 Merge branch 'maint-rel-1.6' into develop 2013-11-11 10:34:56 -05:00
tworrall
f7c17ab657 VIVO-517 added Spanish language versions 2013-11-11 10:34:14 -05:00
j2blake
e0f43934bd Merge branch 'maint-rel-1.6' into develop 2013-11-11 09:44:24 -05:00
j2blake
9f31c3f08b VIVO-469 run the URL Finders from an RDFService, not an OntModel 2013-11-11 09:43:04 -05:00
Holly Mistlebauer
b2f6d6db00 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-11-10 18:35:02 -05:00
Holly Mistlebauer
fb26ee734f More RC 2 test case updates from Holly 2013-11-10 18:34:31 -05:00
j2blake
de08ce3b15 Merge branch 'maint-rel-1.6' into develop 2013-11-08 17:41:05 -05:00
j2blake
10631e1a29 KLUGE — ignore the broken test until Tim can deal with it on Monday. 2013-11-08 17:35:09 -05:00
tworrall
d891627415 VIVO-439, VIVO-507, VIVO-509, VIVO-512 2013-11-08 17:07:50 -05:00
tworrall
318dc65804 VIVO-439, VIVO-507, VIVO-509, VIVO-512 2013-11-08 17:06:59 -05:00
j2blake
4dabb9d69e Merge branch 'maint-rel-1.6' into develop 2013-11-08 13:54:00 -05:00
j2blake
082fe6cef3 Create more reasonable example for language property 2013-11-08 13:53:26 -05:00
Holly Mistlebauer
ec5e81f75c Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-11-08 11:04:59 -05:00
Holly Mistlebauer
1757eec6c8 Holly's first batch of test case changes for RC 2 2013-11-08 11:03:58 -05:00
tworrall
1ccfe928d3 Merge branch 'maint-rel-1.6' into develop 2013-11-07 14:24:48 -05:00
tworrall
f8f44bf4b3 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-11-07 14:24:02 -05:00
tworrall
25a4eec8d2 VIVO-504 2013-11-07 14:23:50 -05:00
brianjlowe
f26d3894b7 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-11-07 12:30:04 -05:00
brianjlowe
9fa5dca9d5 Merge branch 'maint-rel-1.6' into develop 2013-11-07 12:29:33 -05:00
brianjlowe
86ccde7d39 fix typo in PropertyConfig.n3 2013-11-07 12:25:39 -05:00
brianjlowe
ac60d04bad grant sparql bugfix 2013-11-07 11:49:23 -05:00
brianjlowe
6a7caf1cdd sparql query reordering for performance 2013-11-07 11:47:48 -05:00
tworrall
64fef64801 Merge branch 'maint-rel-1.6' into develop 2013-11-06 16:51:43 -05:00
tworrall
390c05ab3f inverse predicate method now working 2013-11-06 16:51:09 -05:00
tworrall
14e83ecc6c VIVO-491 cleaning up some minor address stuff 2013-11-06 16:14:54 -05:00
tworrall
631b0dc330 VIVO-491 cleaning up some minor address stuff 2013-11-06 16:13:46 -05:00
tworrall
7af3580e87 Merge branch 'maint-rel-1.6' into develop 2013-11-06 15:52:18 -05:00
tworrall
23e0a4d390 VIVO-472 updated the rich-export sparql queries 2013-11-06 15:51:33 -05:00
tworrall
a3051cdd75 Merge branch 'maint-rel-1.6' into develop 2013-11-06 14:03:20 -05:00
tworrall
4e7bfbf783 PropertyConfig.n3 changes for context node deletion 2013-11-06 14:02:51 -05:00
j2blake
a88a47f9c0 Merge branch 'maint-rel-1.6' into develop 2013-11-06 13:08:11 -05:00
j2blake
95ce8a5828 VIVO-483 Obsolete VIVO URIs in Vitro search code.
Break out the mechanism for building a list of Additional URI Finder instances. Override that in VIVO. Move AdditionalURIsForContextNodes to VIVO. References to obsolete URIs are in comments.
2013-11-06 13:07:25 -05:00
j2blake
0170b31b13 Merge branch 'maint-rel-1.6' into develop 2013-11-06 12:27:51 -05:00
j2blake
4a3937e78c VIVO-483 Adjust indexing code for the ISF
This class should not have been in Vitro, since it uses VIVO URIs and is never referenced in Vitro. Also, it needed updating to match the ISF.
2013-11-06 12:26:46 -05:00
j2blake
741ea08f98 A quick script to check the deployed language properties files. 2013-11-06 12:24:56 -05:00
brianjlowe
b83807a6cb VIVO-420 change VivoInformationResourceContextNodeFields.java to use foaf:Agent in getting related authors/editors instead of foaf:Person 2013-11-06 11:36:32 -05:00
brianjlowe
5b5bc34d1a VIVO-491 migrating hasGeographicLocation on Addresses 2013-11-06 11:31:17 -05:00
brianjlowe
2704258977 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-11-06 09:11:09 -05:00
brianjlowe
77b408e699 VIVO-496 and VIVO-497 hiding inheres in and cleaning up has expertise 2013-11-06 09:11:03 -05:00
j2blake
bdbe7523e6 Merge branch 'maint-rel-1.6' into develop 2013-11-05 18:25:38 -05:00
j2blake
badab0b5ae Modify counter.jsp to use ModelAccess 2013-11-05 18:25:06 -05:00