Commit graph

3846 commits

Author SHA1 Message Date
tworrall
f2c8f55c94 js file wasn't referencing correct i18n tag 2013-10-07 11:36:06 -04:00
j2blake
57a75757ce VIVO-299 Notify the installer that "Terms of Use" will be referenced in RDF. 2013-10-04 16:36:21 -04:00
brianjlowe
f6bbc93617 fixing some geopolitical labels 2013-10-04 16:21:56 -04:00
brianjlowe
a3d138698d restoring hasCollaborator and affiliatedOrganization for 1.6 2013-10-04 15:45:23 -04:00
hudajkhan
d4a91d3a83 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-10-04 15:42:30 -04:00
hudajkhan
61742f7ae0 for case when individual form is not person type 2013-10-04 15:42:11 -04:00
brianjlowe
3fc5dfb41f VIVO-316 orcid domain and custom form annotation 2013-10-04 14:26:20 -04:00
tworrall
58bb33c5f7 VIVO-112 more updates 2013-10-04 12:42:55 -04:00
Brian Caruso
140288a65e Fixing problem with VivoISFBasicFields 2013-10-04 12:32:58 -04:00
Brian Caruso
dbc8730c35 Fixing problem with VivoISFMemberFields 2013-10-04 11:44:25 -04:00
brianjlowe
e21b3e7077 labels 2013-10-03 16:38:24 -04:00
Brian Caruso
601a0674ab license text 2013-10-03 16:27:26 -04:00
Brian Caruso
0d60501f43 Merge branch 'develop' of github.com:vivo-project/VIVO into develop 2013-10-03 16:13:12 -04:00
Brian Caruso
d58b031132 Adding DocumentModifiers to add values from ISF context nodes to Solr Documents. 2013-10-03 16:07:30 -04:00
tworrall
36cdb97a05 fixed missing research activity bug 2013-10-03 15:05:19 -04:00
tworrall
48b8f3797f added languageCount variable and comments per changes to the foaf-person-2stage template 2013-10-03 13:41:38 -04:00
tworrall
33b83179a7 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-10-03 13:14:08 -04:00
tworrall
791db61269 VIVO-112 ongoing updates and VIVO-256 ORCID iD changes 2013-10-03 13:13:49 -04:00
j2blake
b9bf8bb27c VIVO-308 Revise SelfEditorRelationshipPolicy to fit the ISF
Change the RelationshipChecker classes, and update the unit tests.
2013-10-03 11:52:40 -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
brianjlowe
b5ea3f879d removing unneeded ontology declarations to clean up ontology listing page 2013-10-01 10:20:31 -04:00
Brian Caruso
b82429924e Merge branch 'develop' of github.com:vivo-project/VIVO into develop 2013-09-30 16:31:11 -04:00
Brian Caruso
2a239e87a3 Moving files to deal with vivo overrides. Adding permissions to pageList. VIVO-63 2013-09-30 16:31:04 -04:00
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