tworrall
|
7b6075d359
|
Merge branch 'maint-rel-1.6' into develop
|
2013-11-21 12:39:48 -05:00 |
|
tworrall
|
ef4a628b1a
|
VIVO-560: hide skos:Concept specific properties from the subclass pages
|
2013-11-21 12:39:15 -05:00 |
|
tworrall
|
8082e4dbbe
|
Merge branch 'maint-rel-1.6' into develop
|
2013-11-21 10:07:26 -05:00 |
|
tworrall
|
5a115960b6
|
VIVO-554: hiding add, update, delete links on the activity side of roles
|
2013-11-21 10:06:46 -05:00 |
|
j2blake
|
f3999dd48f
|
Merge branch 'maint-rel-1.6' into develop
|
2013-11-20 17:07:04 -05:00 |
|
j2blake
|
38cb86715c
|
VIVO-541 Rearrange the links on the site admin page.
|
2013-11-20 17:05:38 -05:00 |
|
Jon Corson
|
6459a1837a
|
Changed to modify user-facing labels
|
2013-11-20 15:59:15 -05:00 |
|
tworrall
|
08969ad593
|
Merge branch 'maint-rel-1.6' into develop
|
2013-11-20 15:14:05 -05:00 |
|
tworrall
|
23314367c5
|
VIVO-558
|
2013-11-20 15:13:48 -05:00 |
|
tworrall
|
a1c8200a54
|
Merge branch 'maint-rel-1.6' into develop
|
2013-11-20 14:52:08 -05:00 |
|
tworrall
|
d99490a95d
|
VIVO-556: properties appearing twice
|
2013-11-20 14:51:14 -05:00 |
|
tworrall
|
b3a252274d
|
Merge branch 'maint-rel-1.6' into develop
|
2013-11-20 12:38:36 -05:00 |
|
tworrall
|
bf5511157f
|
fixed template issue
|
2013-11-20 12:37:45 -05:00 |
|
tworrall
|
e100d805bc
|
VIVO-552 updates for vivo:Contract
|
2013-11-19 16:59:47 -05:00 |
|
tworrall
|
04e66272e9
|
VIVO-552 updates for vivo:Contract
|
2013-11-19 16:58:41 -05:00 |
|
tworrall
|
6aa8ed4ddd
|
Merge branch 'maint-rel-1.6' into develop
|
2013-11-19 16:23:18 -05:00 |
|
tworrall
|
6927e7b86d
|
update geo focus map to use localName first, then label
|
2013-11-19 16:22:29 -05:00 |
|
brianjlowe
|
2474be9072
|
VIVO-550 and VIVO-551 migration improvements
|
2013-11-19 16:08:46 -05:00 |
|
tworrall
|
d584cd2756
|
Merge branch 'maint-rel-1.6' into develop
|
2013-11-19 11:58:15 -05:00 |
|
tworrall
|
7eacddcea6
|
VIVO-422
|
2013-11-19 11:57:46 -05:00 |
|
brianjlowe
|
3387eeda69
|
VIVO-545 geographic domains/ranges/restrictions
|
2013-11-19 09:53:59 -05:00 |
|
brianjlowe
|
2ae32542a2
|
Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6
|
2013-11-18 14:29:33 -05:00 |
|
brianjlowe
|
9168e7c761
|
VIVO-539 fixes bug related to excessive duplication of certain webpage links after migration
|
2013-11-18 14:29:26 -05:00 |
|
tworrall
|
1b3817afb2
|
Merge branch 'maint-rel-1.6' into develop
|
2013-11-18 11:07:17 -05:00 |
|
tworrall
|
7c535e8899
|
VIVO-537
|
2013-11-18 11:06:43 -05:00 |
|
j2blake
|
e56a08fec6
|
Merge branch 'maint-rel-1.6' into develop
|
2013-11-17 13:21:29 -05:00 |
|
j2blake
|
3ab396dcc7
|
VIVO-453 language filtering defaults to “false
|
2013-11-17 13:19:49 -05:00 |
|
j2blake
|
24dc0f212a
|
VIVO-541 First cut at the developer panel.
|
2013-11-17 11:51:56 -05:00 |
|
j2blake
|
64685d84b6
|
VIVO-541 First cut at the developer panel.
|
2013-11-17 11:50:26 -05:00 |
|
hudajkhan
|
417e449b87
|
Merge branch 'maint-rel-1.6' into develop
|
2013-11-15 16:28:34 -05:00 |
|
hudajkhan
|
2fe37e551a
|
updating department display on home page to not repeat index and removing some spaces in the research category uri checks
|
2013-11-15 16:28:24 -05:00 |
|
j2blake
|
0a9226a81a
|
Merge branch 'maint-rel-1.6' into develop
|
2013-11-14 17:06:43 -05:00 |
|
j2blake
|
be3f22bca6
|
VIVO-523 Change the way the example language files are presented.
|
2013-11-14 17:04:22 -05:00 |
|
j2blake
|
805491e52f
|
In the build, apply “skipinfo” consistently.
|
2013-11-14 11:14:32 -05:00 |
|
brianjlowe
|
bcf395732e
|
VIVO-527 VIVO-526 VIVO-528 property visibility and annotations
|
2013-11-14 10:38:51 -05:00 |
|
brianjlowe
|
b917858b1f
|
Merge branches 'maint-rel-1.6' and 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6
|
2013-11-14 09:52:16 -05:00 |
|
brianjlowe
|
15c59932dd
|
VIVO-435 changed domain/range of cites/citedBy and removed odd individuals that came in with the ISF
|
2013-11-14 09:52:11 -05:00 |
|
tworrall
|
6d3bd2f003
|
Merge branch 'maint-rel-1.6' into develop
|
2013-11-14 09:37:01 -05:00 |
|
tworrall
|
31d67162e9
|
VIVO-520: PropertyConfig additions to address missing properties
|
2013-11-14 09:36:13 -05:00 |
|
tworrall
|
5349418f49
|
Merge branch 'maint-rel-1.6' into develop
|
2013-11-13 13:34:15 -05:00 |
|
tworrall
|
65b13dc91d
|
organization property changes including new custom form et al (VIVO-518)
|
2013-11-13 13:33:47 -05:00 |
|
tworrall
|
a5dc8287e5
|
Merge branch 'maint-rel-1.6' into develop
|
2013-11-13 11:37:54 -05:00 |
|
tworrall
|
812e07baea
|
VIVO-525: setting type on new journals
|
2013-11-13 11:36:45 -05:00 |
|
Holly Mistlebauer
|
0610b794e2
|
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
|
2013-11-12 16:45:57 -05:00 |
|
Holly Mistlebauer
|
6bbafedc70
|
Holly's final test case updates for RC 2...
|
2013-11-12 16:45:40 -05:00 |
|
tworrall
|
910c8d407d
|
Merge branch 'maint-rel-1.6' into develop
|
2013-11-12 12:51:13 -05:00 |
|
tworrall
|
74fabb0552
|
fix jenkins build
|
2013-11-12 12:50:53 -05:00 |
|
tworrall
|
7696e0ecc4
|
Merge branch 'maint-rel-1.6' into develop
|
2013-11-12 12:25:15 -05:00 |
|
tworrall
|
e3cef828fa
|
VIVO-518 and some other cleanup
|
2013-11-12 12:23:44 -05:00 |
|
Holly Mistlebauer
|
328d023b43
|
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
|
2013-11-12 11:49:10 -05:00 |
|