Commit graph

4595 commits

Author SHA1 Message Date
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
Holly Mistlebauer
d8738b3102 Holly update more test cases due to RC 2 testing... 2013-11-12 11:48:42 -05:00
hudajkhan
0a90d6a710 Merge branch 'maint-rel-1.6' into develop 2013-11-11 18:47:36 -05:00
hudajkhan
bb28dfa340 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-11-11 18:45:22 -05:00
hudajkhan
8a77103a05 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-11-11 18:44:30 -05:00
hudajkhan
c832112628 Merge branch 'maint-rel-1.6' into develop 2013-11-11 18:43:24 -05:00
hudajkhan
2ba253afb7 skos relates should show just concepts and not subclasses for select existing or add new 2013-11-11 18:42:31 -05:00
brianjlowe
33c27794f5 VIVO-519 offerCreateNew for hasPredecessorOrganization 2013-11-11 16:02:25 -05:00
tworrall
b47900cf1a Merge branch 'maint-rel-1.6' into develop 2013-11-11 10:58:19 -05:00
tworrall
dd6a6bdfdb updated dataset for new ISF properties and reverted test so it would not be ignored 2013-11-11 10:57:54 -05:00
tworrall
6d047d6883 Merge branch 'maint-rel-1.6' into develop 2013-11-11 10:34:56 -05:00
tworrall
f7c17ab657 VIVO-517 added Spanish language versions 2013-11-11 10:34:14 -05:00
j2blake
e0f43934bd Merge branch 'maint-rel-1.6' into develop 2013-11-11 09:44:24 -05:00
j2blake
9f31c3f08b VIVO-469 run the URL Finders from an RDFService, not an OntModel 2013-11-11 09:43:04 -05:00
Holly Mistlebauer
b2f6d6db00 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-11-10 18:35:02 -05:00
Holly Mistlebauer
fb26ee734f More RC 2 test case updates from Holly 2013-11-10 18:34:31 -05:00
j2blake
de08ce3b15 Merge branch 'maint-rel-1.6' into develop 2013-11-08 17:41:05 -05:00
j2blake
10631e1a29 KLUGE — ignore the broken test until Tim can deal with it on Monday. 2013-11-08 17:35:09 -05:00
tworrall
d891627415 VIVO-439, VIVO-507, VIVO-509, VIVO-512 2013-11-08 17:07:50 -05:00
tworrall
318dc65804 VIVO-439, VIVO-507, VIVO-509, VIVO-512 2013-11-08 17:06:59 -05:00
j2blake
4dabb9d69e Merge branch 'maint-rel-1.6' into develop 2013-11-08 13:54:00 -05:00
j2blake
082fe6cef3 Create more reasonable example for language property 2013-11-08 13:53:26 -05:00
Holly Mistlebauer
ec5e81f75c Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-11-08 11:04:59 -05:00