Holly Mistlebauer
|
9ce2b220e9
|
Holly made changes to ProxyEditing test cases...
|
2013-10-25 17:34:11 -04:00 |
|
tworrall
|
e44c2e5bc2
|
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
|
2013-10-25 17:10:06 -04:00 |
|
tworrall
|
e41a985076
|
Merge branch 'maint-rel-1.6' into develop
|
2013-10-25 17:09:27 -04:00 |
|
tworrall
|
e6bd71e6ba
|
updates for VIVO-413 and VIVO-409
|
2013-10-25 17:09:07 -04:00 |
|
Holly Mistlebauer
|
d3cb935d9b
|
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
|
2013-10-25 17:07:16 -04:00 |
|
Holly Mistlebauer
|
61d9ef146e
|
Holly made changes to SelfEditing test cases...
|
2013-10-25 17:06:54 -04:00 |
|
tworrall
|
2457e66219
|
Merge branch 'maint-rel-1.6' into develop
|
2013-10-25 16:36:26 -04:00 |
|
tworrall
|
f1abafa3aa
|
updates for VIVO-401 and VIVO-418 which were related issues
|
2013-10-25 16:35:44 -04:00 |
|
Holly Mistlebauer
|
ce2e6545c4
|
Another test case changed by Holly...
|
2013-10-25 15:55:21 -04:00 |
|
Holly Mistlebauer
|
2daa42671a
|
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
|
2013-10-25 11:08:55 -04:00 |
|
Holly Mistlebauer
|
70b3fea278
|
Holly made more test case changes.
|
2013-10-25 11:07:54 -04:00 |
|
j2blake
|
5491dc1ba1
|
Merge branch 'maint-rel-1.6' into develop
|
2013-10-25 09:53:01 -04:00 |
|
j2blake
|
55f43cfd0e
|
Tweak the formatting of supported browsers list.
|
2013-10-25 09:52:25 -04:00 |
|
tworrall
|
bb8bf800c4
|
Merge branch 'maint-rel-1.6' into develop
|
2013-10-24 17:18:50 -04:00 |
|
tworrall
|
cb611da8ad
|
issued credential was using dateTimeValue not dateIssued; also property config changes for VIVO-408
|
2013-10-24 17:18:13 -04:00 |
|
tworrall
|
1ec673d500
|
Merge branch 'maint-rel-1.6' into develop
|
2013-10-24 13:17:15 -04:00 |
|
tworrall
|
ae80d6c63d
|
miscellaneous cleanup but includes a fix for VIVO-404
|
2013-10-24 13:16:26 -04:00 |
|
j2blake
|
aba7f00b36
|
Merge branch 'maint-rel-1.6' into develop
|
2013-10-24 11:58:33 -04:00 |
|
j2blake
|
15880ea3b7
|
VIVO-381 Adjust installation doc. Ant all comes before runtime.properties.
|
2013-10-24 11:57:18 -04:00 |
|
Holly Mistlebauer
|
268ea5e73c
|
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
|
2013-10-23 17:55:11 -04:00 |
|
Holly Mistlebauer
|
ad29cc58bc
|
More Selenium test case changes from Holly...
|
2013-10-23 17:54:01 -04:00 |
|
j2blake
|
6a17e836eb
|
Merge branch 'maint-rel-1.6' into develop
Conflicts:
utilities/ISF-transition/obsoleteUris/event.rb
utilities/ISF-transition/obsoleteUris/known_exceptions.rb
utilities/ISF-transition/obsoleteUris/report.rb
|
2013-10-23 16:14:41 -04:00 |
|
j2blake
|
4e3f69fda7
|
Polish the obsolete_URI script.
|
2013-10-23 16:03:45 -04:00 |
|
Holly Mistlebauer
|
0810f6bf1b
|
Holly made changes to test cases in CheckMapOfScience test suite...
|
2013-10-23 14:27:09 -04:00 |
|
j2blake
|
1bf36caef7
|
A script that looks for obsolete URIs still in the code base.
|
2013-10-23 13:52:53 -04:00 |
|
tworrall
|
6da06bc7ba
|
Merge branch 'maint-rel-1.6' into develop
|
2013-10-23 12:26:56 -04:00 |
|
tworrall
|
1e2a9c575a
|
VIVO-395: modified css
|
2013-10-23 12:26:29 -04:00 |
|
tworrall
|
62ef361044
|
concluding merge
|
2013-10-23 11:49:20 -04:00 |
|
tworrall
|
cb7f873c1d
|
Merge branch 'maint-rel-1.6' into develop
|
2013-10-23 11:47:43 -04:00 |
|
tworrall
|
de17cb1fac
|
improve performance of home page data getter
|
2013-10-23 11:46:41 -04:00 |
|
j2blake
|
a575753a41
|
Merge branch 'maint-rel-1.6' into develop
|
2013-10-23 10:17:51 -04:00 |
|
j2blake
|
bd3af842f3
|
VIVO-382 move the VIVO copy of example.runtime.properties so it overrides the Vitro version.
|
2013-10-23 10:17:20 -04:00 |
|
tworrall
|
ed84094983
|
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
|
2013-10-23 09:57:19 -04:00 |
|
tworrall
|
100af67841
|
Merge branch 'maint-rel-1.6' into develop
|
2013-10-23 09:56:34 -04:00 |
|
tworrall
|
a50a7e006c
|
VIVO-394: change displayed label northern America to North America
|
2013-10-23 09:56:16 -04:00 |
|
tworrall
|
57d81b7536
|
VIVO-394: change displayed label northern America to North America
|
2013-10-23 09:51:41 -04:00 |
|
Holly Mistlebauer
|
3d57b9ceae
|
RC1 test case changes by Holly
|
2013-10-22 17:04:06 -04:00 |
|
Holly Mistlebauer
|
46cc823846
|
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
|
2013-10-22 17:02:33 -04:00 |
|
tworrall
|
e11ca12bac
|
Merge branch 'maint-rel-1.6' into develop
|
2013-10-22 16:58:37 -04:00 |
|
tworrall
|
3ac664dd7e
|
VIVO-400, VIVO-398 and VIVO-399
|
2013-10-22 16:57:42 -04:00 |
|
j2blake
|
54e3fd4c16
|
Update the LoadTesting framework.
Permit use of Git while still supporting Subversion. Improve the script structure and reduce dependence on hard-coded paths.
|
2013-10-22 15:43:05 -04:00 |
|
tworrall
|
d1c889b5d0
|
Merge branch 'maint-rel-1.6' into develop
|
2013-10-22 13:42:54 -04:00 |
|
tworrall
|
2d728af10b
|
minor performance update
|
2013-10-22 13:42:26 -04:00 |
|
tworrall
|
2d0389e9e9
|
Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
|
2013-10-22 13:16:32 -04:00 |
|
tworrall
|
272c4b2fc2
|
Merge branch 'maint-rel-1.6' into develop
|
2013-10-22 13:15:51 -04:00 |
|
tworrall
|
48cf67e98a
|
updates to list view queries and constructs; includes fix for VIVO-399
|
2013-10-22 13:14:58 -04:00 |
|
j2blake
|
701e946bd2
|
A script that looks for obsolete URIs still in the code base.
|
2013-10-21 17:01:57 -04:00 |
|
j2blake
|
a3dc250653
|
Merge branch 'develop' of git+ssh://github.com/vivo-project/VIVO into develop
|
2013-10-21 15:22:28 -04:00 |
|
j2blake
|
4f085bcdfe
|
Update the LoadTesting framework.
Permit use of Git while still supporting Subversion. Improve the script structure and reduce dependence on hard-coded paths.
|
2013-10-21 15:21:54 -04:00 |
|
tworrall
|
d0e57e586c
|
Merge branch 'maint-rel-1.6' into develop
|
2013-10-21 15:17:23 -04:00 |
|