tworrall
e5195c6105
Merge branch 'maint-rel-1.6' into develop
2013-11-08 17:13:32 -05:00
tworrall
68d1129114
VIVO-514
2013-11-08 17:13:07 -05:00
brianjlowe
ee9d11fe40
Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop
2013-11-08 12:32:45 -05:00
brianjlowe
7a6b585eb9
Merge branch 'maint-rel-1.6' into develop
2013-11-08 12:32:01 -05:00
brianjlowe
1e60661a00
VIVO-510 fixes bug with spanish labels appearing on populated faux properties
2013-11-08 12:29:08 -05:00
j2blake
6d9a70df6f
Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop
2013-11-07 15:27:42 -05:00
j2blake
eee3db9f1c
squirrelly stuff with how-to-create-firefox-profile.txt
2013-11-07 15:27:32 -05:00
j2blake
fe39b61f37
Merge branch 'maint-rel-1.6' into develop
2013-11-07 14:50:09 -05:00
j2blake
b012acd968
Ignore this test - it may fail on a slow machine.
2013-11-07 14:49:12 -05:00
brianjlowe
a675abec2a
Merge branch 'maint-rel-1.6' into develop
2013-11-07 12:50:52 -05:00
brianjlowe
8185b04ea0
VIVO-503 add a null pointer check
2013-11-07 12:49:41 -05:00
brianjlowe
66dba4ef27
Merge commit '36c0545b9986917276999d399b01ac2ff0850099' into develop
2013-11-07 12:28:14 -05:00
brianjlowe
f972c901d1
Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop
2013-11-07 12:27:37 -05:00
brianjlowe
690072d00d
VIVO-502 fix bugs in editable property merge
2013-11-07 11:29:36 -05:00
brianjlowe
5b6e86ab01
VIVO-500 property deletion updates for faux props
2013-11-06 17:29:19 -05:00
j2blake
36c0545b99
VIVO-469 print progress messages while looking for URIs to re-index.
2013-11-06 15:57:21 -05:00
j2blake
93a3e4e1f8
Merge branch 'maint-rel-1.6' into develop
2013-11-06 13:08:03 -05:00
j2blake
bc0cf6be63
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:08 -05:00
brianjlowe
725b2e7a57
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6
2013-11-06 12:46:18 -05:00
brianjlowe
85e9e16659
supporting stub deletion annotation in faux properties
2013-11-06 12:45:59 -05:00
j2blake
1ed23a87fa
Merge branch 'maint-rel-1.6' into develop
2013-11-06 12:27:38 -05:00
j2blake
98f80dfd71
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:59 -05:00
j2blake
8906743b74
Merge branch 'maint-rel-1.6' into develop
2013-11-06 11:45:43 -05:00
j2blake
171f47d392
Merge branch 'maint-rel-1.6' of git+ssh://github.com/vivo-project/Vitro into maint-rel-1.6
2013-11-06 11:45:17 -05:00
j2blake
7f67b1b7da
VIVO-495 fix bug in query-binding code.
2013-11-06 11:43:33 -05:00
brianjlowe
c2e8541732
fixes bug retrieving property inverses
2013-11-06 11:03:17 -05:00
brianjlowe
9914d3e4b9
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6
2013-11-06 11:02:39 -05:00
brianjlowe
b276cd5049
VIVO-499 fixes bug in deduping applicable properties
2013-11-06 11:02:33 -05:00
j2blake
ef25ee4dd6
Make it easier to monitor the ABoxReasoner thread.
2013-11-06 09:23:43 -05:00
j2blake
a2ab207ef9
Merge branch 'maint-rel-1.6' into develop
2013-11-05 17:53:22 -05:00
j2blake
2a237f379b
VIVO-448 Change the "example_gadgets" file to use gadgets that are currently active.
2013-11-05 17:35:22 -05:00
j2blake
36c1ad6b6a
VIVO-448 ORNG was unable to parse our LOD response.
...
The date-time stamp on the document itself was not in the correct format.
2013-11-05 17:24:12 -05:00
brianjlowe
dc58791842
removed a debugging log statement
2013-11-05 15:53:11 -05:00
brianjlowe
447c677c39
VIVO-389 pellet exception
2013-11-05 12:39:45 -05:00
brianjlowe
93d941412f
quieting some migration log messages
2013-11-05 10:50:51 -05:00
brianjlowe
328abf20aa
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6
2013-11-05 10:49:16 -05:00
brianjlowe
60a86d94b2
VIVO-421 fixes bug with class drop downs
2013-11-05 10:49:11 -05:00
j2blake
c1995bec3f
Merge branch 'maint-rel-1.6' into develop
2013-11-04 15:02:52 -05:00
j2blake
2f78e09765
VIVO-452 Revise SparqlQueryDataGetter to use RDFService if possible.
2013-11-04 15:02:15 -05:00
brianjlowe
f75b1159e5
reenabling sparql constructs that shouldn't have been checked in as disabled
2013-11-04 14:55:57 -05:00
brianjlowe
644bdc42cf
Quieting ABoxUpdater log messages
2013-11-04 13:49:12 -05:00
brianjlowe
c27971a36e
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6
2013-11-04 13:33:03 -05:00
brianjlowe
be6bbdea6f
VIVO-459 change "show classes with restrictions on this property" to use languageNeutralWebappDaoFactory when finding classes
2013-11-04 13:32:57 -05:00
hudajkhan
cbd65f8639
breaking search portion of page out to include in jsp pages
2013-11-04 11:58:58 -05:00
hudajkhan
c45f4ce238
breaking search portion of page out to include in jsp pages
2013-11-04 11:54:20 -05:00
brianjlowe
878c00027e
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6
2013-11-04 11:29:13 -05:00
brianjlowe
1999537379
enabling display of faux subproperties without visible "parents"
2013-11-04 11:28:59 -05:00
tworrall
d43331a12c
Merge branch 'maint-rel-1.6' into develop
2013-11-03 17:14:19 -05:00
tworrall
01872dfde3
VIVO-435
2013-11-03 17:13:46 -05:00
j2blake
4d8bcc6fae
Merge branch 'maint-rel-1.6' into develop
2013-11-01 15:40:33 -04:00
