brianjlowe
|
f7e2663a01
|
annotation property changes and VIVO-310 adding missing inverse property axiom
|
2013-09-30 16:02:41 -04:00 |
|
tworrall
|
83b3f755d5
|
VIVO-285: visualization updates for ISF
|
2013-09-30 09:30:34 -04:00 |
|
brianjlowe
|
d71c995e0e
|
various migration fixes
|
2013-09-27 13:44:21 -04:00 |
|
brianjlowe
|
b8cff8458a
|
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
|
2013-09-26 14:27:31 -04:00 |
|
brianjlowe
|
9870934fa2
|
cleaning up some ontology files
|
2013-09-26 14:27:25 -04:00 |
|
hudajkhan
|
b211b3ecef
|
updates for label management
|
2013-09-26 13:58:12 -04:00 |
|
brianjlowe
|
59686f8ce9
|
removing extraneous file
|
2013-09-26 13:02:42 -04:00 |
|
tworrall
|
b67e60bfb3
|
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
|
2013-09-25 17:09:02 -04:00 |
|
tworrall
|
50c53a62e6
|
VIVO-112: and the slog continues...
|
2013-09-25 17:08:41 -04:00 |
|
Brian Caruso
|
597204ea67
|
Merge branch 'develop' of github.com:vivo-project/VIVO into develop
|
2013-09-24 16:00:12 -04:00 |
|
hudajkhan
|
1bed89b00b
|
fixing bugs
|
2013-09-24 15:39:43 -04:00 |
|
Brian Caruso
|
5dc1a0952d
|
Merge branch 'develop' of github.com:vivo-project/VIVO into issue-vivo-111
|
2013-09-24 15:34:43 -04:00 |
|
hudajkhan
|
b6b96d12a7
|
updates for edit submission preprocessor, passing vreq
|
2013-09-24 14:58:50 -04:00 |
|
hudajkhan
|
91fd8a4c1b
|
updates for concepts and labels
|
2013-09-24 13:44:58 -04:00 |
|
brianjlowe
|
213f8ffd91
|
Merge remote-tracking branch 'origin/develop' into dev-isf
|
2013-09-23 16:05:13 -04:00 |
|
brianjlowe
|
1149ab273b
|
data migration work
|
2013-09-23 15:57:28 -04:00 |
|
tworrall
|
fca87953d2
|
VIVO-112
|
2013-09-23 09:04:22 -04:00 |
|
brianjlowe
|
4047b4e8a9
|
data migration work
|
2013-09-20 15:42:17 -04:00 |
|
brianjlowe
|
5f0bd4a74c
|
awarded degree sparql construct fixes
|
2013-09-19 16:05:30 -04:00 |
|
brianjlowe
|
6d77fc7871
|
various and sundry data migration changes
|
2013-09-19 14:18:49 -04:00 |
|
tworrall
|
aca312b7cc
|
VIVO-300: some i18n cleanup
|
2013-09-19 10:38:51 -04:00 |
|
tworrall
|
a98eb8ac38
|
VIVO-300: some i18n cleanup
|
2013-09-19 09:52:41 -04:00 |
|
tworrall
|
2ce772afeb
|
Merge branch 'dev-isf' of https://github.com/vivo-project/VIVO into dev-isf
|
2013-09-18 17:01:47 -04:00 |
|
tworrall
|
3d527acce9
|
VIVO-112 and VIVO-298
|
2013-09-18 17:01:26 -04:00 |
|
brianjlowe
|
702890a26f
|
annotation data migration
|
2013-09-18 16:22:09 -04:00 |
|
tworrall
|
c5d0bc21e8
|
VIVO-112: ISF changes relating to vcard classes
|
2013-09-18 11:33:31 -04:00 |
|
hudajkhan
|
bdbc10e960
|
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
|
2013-09-16 14:08:48 -04:00 |
|
hudajkhan
|
ba1c6c7075
|
updates for concept search service, adding LCSH search capability
|
2013-09-16 14:02:47 -04:00 |
|
j2blake
|
5b8309bcbc
|
VIVO-262 Complete the push script. Add more checking to extract_files.
|
2013-09-13 17:24:59 -04:00 |
|
brianjlowe
|
80ff85385e
|
adding some inverse property axioms
|
2013-09-13 15:00:49 -04:00 |
|
j2blake
|
9dcf9d50e1
|
Remove superfluous noise from the log.
|
2013-09-13 14:29:10 -04:00 |
|
brianjlowe
|
a60c4ff048
|
Grant and AdvisingRelationship migration
|
2013-09-13 11:32:55 -04:00 |
|
j2blake
|
331869b526
|
VIVO-281 Make extended linked data a configurable option.
|
2013-09-12 16:46:50 -04:00 |
|
brianjlowe
|
fd8de955f5
|
awardedDegree migration
|
2013-09-12 10:44:03 -04:00 |
|
tworrall
|
7fe3d8ea70
|
Merge branch 'dev-isf' of https://github.com/vivo-project/VIVO into dev-isf
|
2013-09-11 15:50:41 -04:00 |
|
tworrall
|
e05f5d6fb4
|
VIVO-112: ISF updates for advising relationship plus a couple of fixes
|
2013-09-11 15:50:15 -04:00 |
|
brianjlowe
|
4a434ddacb
|
re-adding hasResearchArea and researchAreaOf
|
2013-09-11 12:30:06 -04:00 |
|
Holly Mistlebauer
|
ffc968b1ca
|
Holly updated 3 test cases.
|
2013-09-11 11:36:06 -04:00 |
|
brianjlowe
|
b4f9e71084
|
VIVO-288 re-adding roleContributesTo and contributingRole
|
2013-09-11 11:01:40 -04:00 |
|
Holly Mistlebauer
|
e032ceeca4
|
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
|
2013-09-11 10:26:01 -04:00 |
|
Holly Mistlebauer
|
fe25fa8048
|
Holly updated the test case AdminLoginLogout.html.
|
2013-09-11 10:22:42 -04:00 |
|
brianjlowe
|
745a4a26e8
|
VIVO-256 migrate orcid to URI reference
|
2013-09-11 10:17:32 -04:00 |
|
brianjlowe
|
17b90964d0
|
adding AdviseeRole and AdvisorRole
|
2013-09-10 13:36:48 -04:00 |
|
brianjlowe
|
20db43038f
|
adding AdviseeRole and AdvisorRole and some domains and ranges
|
2013-09-10 13:36:31 -04:00 |
|
tworrall
|
fbf2c4b651
|
VIVO-112: more updates for educational training and a change for organizationHasPositionHistory
|
2013-09-10 11:33:20 -04:00 |
|
brianjlowe
|
c367ce4fd6
|
moving PropertyConfigSupp.n3 to the right directory
|
2013-09-10 10:24:28 -04:00 |
|
brianjlowe
|
5c14c1355d
|
Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf
Conflicts:
productMods/WEB-INF/filegraph/tbox/geopolitical.tbox.ver1.1-11-18-11.owl
productMods/WEB-INF/filegraph/tbox/isDefinedBy-1.5.owl
productMods/WEB-INF/filegraph/tbox/scires-1.5.owl
productMods/WEB-INF/filegraph/tbox/vivo-bibo-1.5.owl
productMods/WEB-INF/filegraph/tbox/vivo-c4o-1.5.owl
productMods/WEB-INF/filegraph/tbox/vivo-core-1.5.owl
productMods/WEB-INF/filegraph/tbox/vivo-dcelements-1.5.owl
productMods/WEB-INF/filegraph/tbox/vivo-dcterms-1.5.owl
productMods/WEB-INF/filegraph/tbox/vivo-event-1.5.owl
productMods/WEB-INF/filegraph/tbox/vivo-fabio-1.5.owl
productMods/WEB-INF/filegraph/tbox/vivo-foaf-1.5.owl
productMods/WEB-INF/filegraph/tbox/vivo-pws-1.5.owl
productMods/WEB-INF/filegraph/tbox/vivo-skos-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/geopolitical.tbox.ver1.1-11-18-11.owl
productMods/WEB-INF/ontologies/update/oldVersion/isDefinedBy-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/scires-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-bibo-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-c4o-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-core-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-dcelements-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-dcterms-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-event-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-fabio-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-foaf-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-pws-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-skos-1.5.owl
productMods/templates/freemarker/body/partials/individual/individual-positions.ftl
rdf/abox/filegraph/us-states.rdf
rdf/tbox/filegraph/geopolitical.tbox.ver1.1-11-18-11.owl
rdf/tbox/filegraph/isDefinedBy-1.5.owl
rdf/tbox/filegraph/scires-1.5.owl
rdf/tbox/filegraph/vivo-bibo-1.5.owl
rdf/tbox/filegraph/vivo-c4o-1.5.owl
rdf/tbox/filegraph/vivo-core-1.5.owl
rdf/tbox/filegraph/vivo-dcelements-1.5.owl
rdf/tbox/filegraph/vivo-dcterms-1.5.owl
rdf/tbox/filegraph/vivo-event-1.5.owl
rdf/tbox/filegraph/vivo-fabio-1.5.owl
rdf/tbox/filegraph/vivo-foaf-1.5.owl
rdf/tbox/filegraph/vivo-pws-1.5.owl
rdf/tbox/filegraph/vivo-skos-1.5.owl
|
2013-09-10 09:09:42 -04:00 |
|
j2blake
|
69a45e573a
|
VIVO-262 Document the language support configuration
|
2013-09-09 14:24:07 -04:00 |
|
j2blake
|
4202f1a0a6
|
VIVO-262 Document the language support configuration
|
2013-09-09 14:19:04 -04:00 |
|
tworrall
|
90206ebf93
|
Merge branch 'dev-isf' of https://github.com/vivo-project/VIVO into dev-isf
|
2013-09-09 13:32:45 -04:00 |
|