Commit graph

3896 commits

Author SHA1 Message Date
brianjlowe
2704258977 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-11-06 09:11:09 -05:00
brianjlowe
77b408e699 VIVO-496 and VIVO-497 hiding inheres in and cleaning up has expertise 2013-11-06 09:11:03 -05:00
j2blake
badab0b5ae Modify counter.jsp to use ModelAccess 2013-11-05 18:25:06 -05:00
j2blake
6940771720 VIVO-448 Correct the installation instructions for ORNG.
The change from deploy.properties to build/runtime.properties wasn't handled correctly.
2013-11-05 17:51:09 -05:00
tworrall
4e4459a42a Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-11-05 16:27:00 -05:00
tworrall
30c8b89436 VIVO-492 2013-11-05 16:24:34 -05:00
brianjlowe
ef3ac5008d VIVO-494 hiding "realizes" 2013-11-05 16:08:22 -05:00
brianjlowe
5adf4a587f object property cleanup 2013-11-05 15:50:11 -05:00
brianjlowe
8d8df54219 fixes a vcard bug 2013-11-05 15:26:07 -05:00
brianjlowe
d52ce0aad8 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-11-05 15:25:32 -05:00
brianjlowe
da690ebf9d VIVO-434 restoring "documentation for" 2013-11-05 15:25:27 -05:00
tworrall
82f603a0f1 VIVO-490 thank you very much and please tip your waitress 2013-11-05 13:33:15 -05:00
brianjlowe
ed47a43973 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-11-05 13:24:53 -05:00
brianjlowe
d81ae17045 VIVO-493 hiding "has participant" / "participates in" 2013-11-05 13:24:46 -05:00
tworrall
ba1712572e Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-11-05 11:07:47 -05:00
tworrall
2d05f1d814 VIVO-476 2013-11-05 11:06:26 -05:00
brianjlowe
bb4145e565 VIVO-388 fixes vivo:middleName migration bug 2013-11-05 10:45:57 -05:00
brianjlowe
a68ef819ee VIVO-403 safeguards against duplicate context node creation in migration 2013-11-05 10:01:46 -05:00
tworrall
6ef8cb6b80 VIVO-429 and VIVO-486 2013-11-05 09:57:09 -05:00
j2blake
b435a487bf VIVO-473 Fix "short views" test case to work with ISF 2013-11-04 16:57:05 -05:00
brianjlowe
aeb89a9adf Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-11-04 15:17:16 -05:00
brianjlowe
2de7bab3b2 VIVO-391 permitting migration of standalone advisee and advising relationship 2013-11-04 15:17:10 -05:00
tworrall
6fd299301c VIVO-485 convert datagetter to ajax call 2013-11-04 14:45:43 -05:00
j2blake
50d788adb4 Refine the script that scans for obsolete URIs 2013-11-04 12:55:02 -05:00
j2blake
9f854b6490 VIVO-482 replace core:URLLink with card:URL 2013-11-04 12:50:19 -05:00
j2blake
35ec65eebe VIVO-415 OpenSocial template was in Wilma - should be in VIVO. 2013-11-04 12:48:13 -05:00
hudajkhan
5f71827f93 search part of page needs to be broken out to include search box in jsp pages 2013-11-04 12:00:23 -05:00
brianjlowe
8dbf9969c2 VIVO-408 hiding dateTimeValue property 2013-11-04 11:50:54 -05:00
brianjlowe
11a37ed078 VIVO-457 additional property visibility 2013-11-04 11:46:26 -05:00
brianjlowe
7ce0bcafe2 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-11-04 11:35:56 -05:00
brianjlowe
cad30a359d VIVO-460 offerCreateNew settings for various properties 2013-11-04 11:35:28 -05:00
tworrall
3d66980416 VIVO-461 new custom form, list view, etc for organization for training 2013-11-04 11:25:36 -05:00
brianjlowe
9d4945487f Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-11-04 09:40:26 -05:00
brianjlowe
7083778345 VIVO-480 removing some obsolete URIs 2013-11-04 09:40:19 -05:00
tworrall
fbb2c069d9 VIVO-462 2013-11-03 17:43:04 -05:00
tworrall
bd14d15431 VIVO-481, VIVO-477, VIVO-475 and VIVO-471 2013-11-03 17:18:17 -05:00
hudajkhan
c080c0484c updating field options constructor 2013-11-01 11:24:05 -04:00
hudajkhan
27a814c0a6 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-11-01 11:22:35 -04:00
j2blake
fe81ba5927 VIVO-465 Adjust the Vitro.reconcile.defaultTypeList to suit the ISF 2013-11-01 10:57:55 -04:00
hudajkhan
c1c7a5ab31 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-11-01 10:22:00 -04:00
brianjlowe
d666a076bf VIVO-392 use vcard:Kind for non-agents 2013-11-01 09:32:40 -04:00
brianjlowe
c19cc34671 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-11-01 09:27:07 -04:00
brianjlowe
6ebb58c746 VIVO-390 re-add subjectAreaFor 2013-11-01 09:26:53 -04:00
j2blake
a7e53d9ac0 Polish the obsolete_URI script, so it can be used to scan an active workspace, not just a released directory. 2013-10-31 17:11:11 -04:00
brianjlowe
354fe56def Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-10-31 16:56:25 -04:00
brianjlowe
9f5103fac2 property domains and restrictions for reproducedIn and numPages, VIVO-389 and VIVO-421 2013-10-31 16:55:32 -04:00
hudajkhan
750e7c3f86 update to new individual to make sure type of new gets passed 2013-10-31 16:03:12 -04:00
hudajkhan
f1587409f2 updates for restricting broader/narrower term to adding individuals with most specific type of concept, and updates to isPersonType for new individual form 2013-10-31 16:02:26 -04:00
tworrall
f614f6cee4 VIVO-440 orcid id change 2013-10-31 14:42:33 -04:00
tworrall
c04a7aac76 VIVO-426 editor display 2013-10-31 11:40:17 -04:00