brianjlowe
55d59190e5
VIVO-325 skos:Concept migration
2013-10-10 14:37:55 -04:00
tworrall
db6e2dd358
VIVO-340 new custom form et al for advisee in and a refactored form for the advisor side
2013-10-10 10:14:55 -04:00
hudajkhan
73cb80152a
changed vocab service unavailable error to error executing search, updated gemet service to handle multiword terms
2013-10-09 15:47:47 -04:00
tworrall
343698b6eb
VIVO-330 rank was not being set as type int
2013-10-08 10:57:36 -04:00
tworrall
f2c8f55c94
js file wasn't referencing correct i18n tag
2013-10-07 11:36:06 -04:00
brianjlowe
a3d138698d
restoring hasCollaborator and affiliatedOrganization for 1.6
2013-10-04 15:45:23 -04:00
hudajkhan
61742f7ae0
for case when individual form is not person type
2013-10-04 15:42:11 -04:00
tworrall
36cdb97a05
fixed missing research activity bug
2013-10-03 15:05:19 -04:00
tworrall
791db61269
VIVO-112 ongoing updates and VIVO-256 ORCID iD changes
2013-10-03 13:13:49 -04:00
hudajkhan
0896b37c3c
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
2013-10-02 14:58:19 -04:00
hudajkhan
984e2f6f4c
updates for label, new individual form, external vocab search
2013-10-02 14:56:58 -04:00
tworrall
2f629b204d
VIVO-315: add error message for missing type selection
2013-10-02 11:56:36 -04:00
tworrall
7f8c7bfff8
VIVO-112: and the beat goes on...
2013-10-01 16:46:13 -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
hudajkhan
b211b3ecef
updates for label management
2013-09-26 13:58:12 -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
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
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
ba1c6c7075
updates for concept search service, adding LCSH search capability
2013-09-16 14:02:47 -04:00
brianjlowe
a60c4ff048
Grant and AdvisingRelationship migration
2013-09-13 11:32:55 -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
745a4a26e8
VIVO-256 migrate orcid to URI reference
2013-09-11 10:17:32 -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
tworrall
90206ebf93
Merge branch 'dev-isf' of https://github.com/vivo-project/VIVO into dev-isf
2013-09-09 13:32:45 -04:00
tworrall
e3de41dc64
VIVO-112: updates to handle grant roles correctly
2013-09-09 13:32:10 -04:00
j2blake
e3227af798
VIVO-262 Add languages to VIVO at build time.
...
Move the language-specific files out of the default build area. Add a build property that will cause the selected language(s) to be copied into the build area.
2013-09-09 12:23:36 -04:00
brianjlowe
40cd735752
last of the vcard migration (I hope)
2013-09-09 11:49:23 -04:00
tworrall
aeac0411d4
Merge branch 'dev-isf' of https://github.com/vivo-project/VIVO into dev-isf
2013-09-06 17:03:31 -04:00
tworrall
15168eb8ea
VIVO-112: updates for educational training and awards
2013-09-06 17:02:43 -04:00
brianjlowe
1c60c24002
VCard migration
2013-09-06 16:41:15 -04:00
hudajkhan
a9ebf8f94b
updates for concept search and label management
2013-09-05 15:45:49 -04:00
brianjlowe
5d2e44c08f
property link suppression annotations
2013-09-04 10:01:11 -04:00
hudajkhan
419af234c4
updates for label addition as well as beginning changes for concepts search service
2013-09-03 15:32:51 -04:00
brianjlowe
722307358f
subclasses of skos:Concept
2013-09-03 09:01:22 -04:00
tworrall
cae4fe03c1
VIVO-112: more changes for role related forms and addAuthorToPub
2013-08-29 12:35:35 -04:00