j2blake
|
46d9e3e092
|
Merge branch 'maint-rel-1.6' into develop
|
2013-11-04 12:55:39 -05:00 |
|
j2blake
|
50d788adb4
|
Refine the script that scans for obsolete URIs
|
2013-11-04 12:55:02 -05:00 |
|
j2blake
|
b0c3f9b77a
|
Merge branch 'maint-rel-1.6' into develop
|
2013-11-04 12:51:09 -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 |
|
hudajkhan
|
4eb0d287a2
|
search part of page needs to be broken out to include search box in jsp pages
|
2013-11-04 11:52:36 -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
|
0e48f4b7d5
|
Merge branch 'maint-rel-1.6' into develop
|
2013-11-04 11:26:12 -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
|
77b31ce76a
|
Merge branch 'maint-rel-1.6' into develop
|
2013-11-03 17:43:33 -05:00 |
|
tworrall
|
fbb2c069d9
|
VIVO-462
|
2013-11-03 17:43:04 -05:00 |
|
tworrall
|
06e1a2c255
|
VIVO-481, VIVO-477, VIVO-475 and VIVO-471
|
2013-11-03 17:21:21 -05:00 |
|
tworrall
|
bd14d15431
|
VIVO-481, VIVO-477, VIVO-475 and VIVO-471
|
2013-11-03 17:18:17 -05:00 |
|
hudajkhan
|
4e1315c1a9
|
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
|
2013-11-01 11:29:57 -04:00 |
|
hudajkhan
|
b71fb8045a
|
Merge branch 'maint-rel-1.6' into develop
Conflicts:
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java
|
2013-11-01 11:29:29 -04: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
|
a63e229fc2
|
Merge branch 'maint-rel-1.6' into develop
|
2013-11-01 10:58:39 -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
|
3ed3be1f1a
|
Merge branch 'maint-rel-1.6' into develop
|
2013-10-31 17:12:07 -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 |
|
hudajkhan
|
3875c81784
|
update to new individual to make sure type of new gets passed
|
2013-10-31 15:09:29 -04:00 |
|
hudajkhan
|
be7fd0cf21
|
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
|
2013-10-31 15:08:16 -04:00 |
|
tworrall
|
e8b1d667e7
|
Merge branch 'maint-rel-1.6' into develop
|
2013-10-31 14:43:03 -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 |
|
tworrall
|
1e6d419fea
|
VIVO-426 editor display
|
2013-10-31 11:36:37 -04:00 |
|
brianjlowe
|
9635331b17
|
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6
|
2013-10-31 10:46:54 -04:00 |
|
brianjlowe
|
77d1174135
|
resetting the order in startup_listeners to speed migration
|
2013-10-31 10:46:44 -04:00 |
|
brianjlowe
|
1edcd06c1c
|
adding "base root" annotation for VCard properties
|
2013-10-31 10:46:17 -04:00 |
|
tworrall
|
3ba871df7f
|
Merge branch 'maint-rel-1.6' into develop
|
2013-10-31 09:55:14 -04:00 |
|
tworrall
|
4706b4206e
|
fixed editing mode issue
|
2013-10-31 09:54:45 -04:00 |
|
hudajkhan
|
a430de2d24
|
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-30 16:29:24 -04:00 |
|
tworrall
|
86a9533a6b
|
Merge branch 'maint-rel-1.6' into develop
|
2013-10-30 16:20:02 -04:00 |
|
tworrall
|
239d075127
|
VIVO-425, VIVO-422 and VIVO-424
|
2013-10-30 16:19:30 -04:00 |
|
tworrall
|
8f1636aa8d
|
Merge branch 'maint-rel-1.6' into develop
|
2013-10-30 11:58:02 -04:00 |
|