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
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
tworrall
f0844317a4
VIVO-441: template and .properties updates
2013-10-30 11:57:45 -04:00
tworrall
3c2f8190e0
Merge branch 'maint-rel-1.6' into develop
2013-10-30 11:36:53 -04:00
tworrall
5e83c482c7
VIVO-439 mailing address update
2013-10-30 11:35:52 -04:00
j2blake
6f2ec51ede
Merge branch 'maint-rel-1.6' into develop
2013-10-29 17:21:41 -04:00
j2blake
291d04c44f
Merge branch 'maint-rel-1.6' of git+ssh://github.com/vivo-project/VIVO into maint-rel-1.6
2013-10-29 17:21:09 -04:00
j2blake
fe60f7315c
VIVO-443 Use language-specific templates to create email
...
For some reason, the password-reset template was too long to do proper substitution on the last line. Removing some of the intermediate content fixed the problem, but without appropriate content. I had been unhappy with the @@file approach anyway, so I went back to language-specific templates for each type of message.
2013-10-29 17:19:34 -04:00
tworrall
76ba0f16e1
Merge branch 'maint-rel-1.6' into develop
2013-10-29 14:48:03 -04:00
tworrall
ace38832fe
list view updates
2013-10-29 14:47:41 -04:00
j2blake
05ba1d0f03
Merge branch 'maint-rel-1.6' into develop
...
Conflicts:
utilities/LoadTesting/scripts/_captureTomcatLogs
2013-10-29 11:49:37 -04:00
j2blake
a8908964f2
Refine the load-testing scripts
2013-10-29 11:47:12 -04:00
j2blake
d6fb302e2b
VIVO-444 clarify how the RDF files have moved.
2013-10-29 11:46:39 -04:00
Holly Mistlebauer
d18483dbed
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
2013-10-28 13:59:12 -04:00
Holly Mistlebauer
78d16e21e5
Holly made changes to the Selenium test cases within the CreatePeople test suite.
2013-10-28 13:58:49 -04:00
j2blake
b81503b6d0
Merge branch 'maint-rel-1.6' into develop
2013-10-28 11:59:06 -04:00
j2blake
7bff226f00
VIVO-396 Obtain preferred title from VCard
2013-10-28 11:58:00 -04:00
tworrall
69eeae813f
VIVO-411
2013-10-28 09:58:34 -04:00
tworrall
13feddac3d
VIVO-411
2013-10-28 09:56:55 -04:00
j2blake
f11d9ef100
Merge branch 'maint-rel-1.6' into develop
2013-10-26 18:02:59 -04:00
j2blake
042a48ea1f
VIVO-268 Restore data values to DataProperty RequestedAction classes.
2013-10-26 18:02:17 -04:00
j2blake
6d98124340
Fix the scan to reduce false positives.
...
Also, truncate the lines on output if over 100 characters.
2013-10-26 17:04:50 -04:00
j2blake
6fc09a9498
Fix the scan to reduce false positives.
...
Also, truncate the lines on output if over 100 characters.
2013-10-26 17:04:18 -04:00
