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
brianjlowe
b4f9e71084
VIVO-288 re-adding roleContributesTo and contributingRole
2013-09-11 11:01:40 -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
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
j2blake
42fd5bee01
Clarify instructions on setting up runtime.properties
2013-09-06 10:19:09 -04:00
hudajkhan
a9ebf8f94b
updates for concept search and label management
2013-09-05 15:45:49 -04:00
hudajkhan
14ddc38177
updates for concept semantic type in external vocab search
2013-09-04 12:21:54 -04:00
brianjlowe
5d2e44c08f
property link suppression annotations
2013-09-04 10:01:11 -04:00
j2blake
508f88a7c5
VIVO-272 Refactor scripts: get_permission_and_go()
2013-09-03 17:07:31 -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
j2blake
8ed2523a7d
VIVO-272 Do proper merge and tag of the final release
2013-09-02 13:09:40 -04:00
j2blake
f72913a2f1
VIVO-272 Create scripts to build a release from GitHub.
2013-09-02 11:10:13 -04:00
brianjlowe
1743dc6dd5
support for edit permissions for qualified properties
2013-08-30 17:04:59 -04:00
tworrall
cae4fe03c1
VIVO-112: more changes for role related forms and addAuthorToPub
2013-08-29 12:35:35 -04:00
tworrall
59431742e1
VIVO-112: another round of updates to support the ISF changes
2013-08-28 16:58:02 -04:00
brianjlowe
978c9ccd5f
added domain and range to bearer_of and removed has_role and has_function
2013-08-28 10:08:54 -04:00
j2blake
1994ab03a1
VIVO-274 move permission_config.n3 to rdf/auth/everytime
...
Get rid of the PermissionSetsLoader, keep the smoke tests.
2013-08-27 17:26:35 -04:00
tworrall
027f9b6966
VIVO-112: updates to property config and a java class to correct property names
2013-08-27 15:38:52 -04:00
brianjlowe
74cd0e062d
updated realizedBy/realizes properties
2013-08-27 11:13:52 -04:00
brianjlowe
f0ba88badc
Merge branch 'dev-isf' of https://github.com/vivo-project/VIVO into dev-isf
2013-08-27 10:34:08 -04:00
brianjlowe
de05954218
ongoing work on ISF support
2013-08-27 10:33:22 -04:00
tworrall
35d136fec3
VIVO-112 ISF changes relating to custom forms and list views
2013-08-26 16:58:49 -04:00
Jim Blake
fbdbf5eb9d
Merge pull request #7 from vivo-project/feature/concept2departments
...
Feature/concept2departments
Thanks, Stephen, and thanks to Tim, for reviewing.
2013-08-26 12:25:45 -07:00
j2blake
c1801fc2a2
VIVO-4 remove the license substitution code from the license scanner
...
Now, it only scans.
2013-08-26 14:57:05 -04:00
Stephen V. Williams
4c99e948f4
Merge branch 'develop' into feature/concept2departments
2013-08-26 09:41:59 -06:00
Stephen V. Williams
957b6345e7
Merge branch 'develop' of github.com:vivo-project/VIVO into develop
2013-08-26 09:41:23 -06:00
Stephen V. Williams
2e9e64ebe9
fix links to use context appropriate title instead of 'research area' and 'organization'
2013-08-26 09:40:44 -06:00
tworrall
fe7106e22b
fixed bug that disabled tabs when navigating from the home page map while not logged in
2013-08-23 17:06:33 -04:00
tworrall
dfa1abd2ec
VIVO-263: corrected counts on map display and updated us-states.rdf file to include relationship between states and the US.
2013-08-23 16:30:04 -04:00
tworrall
621be26e73
VIVO-263: corrected counts on map display and updated us-states.rdf file to include relationship between states and the US.
2013-08-23 16:27:10 -04:00
brianjlowe
43d92a8cd8
VCard migration (in progress)
2013-08-23 11:03:04 -04:00
brianjlowe
0312ebd448
ISF filegraph improvements
2013-08-23 11:02:39 -04:00
hudajkhan
706e0ae1c1
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
...
Conflicts:
.gitignore
2013-08-22 15:54:37 -04:00
