Commit graph

4407 commits

Author SHA1 Message Date
j2blake
96de00b737 Make DeveloperSettings a singleton, and other improvements.
By making it a singleton, we do need an explicit Setup operation. However, it means that we can refer to the settings in client code that doesn’t have access to a request or to the ServletContext.

Other refactorings to simplify the logic or make it more scalable.
2014-01-04 14:40:26 -05:00
j2blake
e377388c88 Merge branch 'feature/parseMultipartRequest' into develop 2013-12-20 17:13:55 -05:00
j2blake
03548ae64c VIVO-617 Adjust the client code to use the new file upload tools. 2013-12-20 17:11:30 -05:00
tworrall
b5244693bf Merge branch 'maint-rel-1.6' into develop 2013-12-20 13:28:44 -05:00
tworrall
7be66f9748 encode urls being used as parameters 2013-12-20 13:27:21 -05:00
tworrall
4b90951b35 Merge branch 'maint-rel-1.6' into develop 2013-12-19 13:33:36 -05:00
tworrall
76d79c5e53 minor js tweak; would not have been a blocker issue 2013-12-19 13:33:10 -05:00
tworrall
d34cd74fb9 Merge branch 'maint-rel-1.6' into develop 2013-12-19 10:37:01 -05:00
tworrall
97095eeaba data getter sparql queries in the n3 files were using a technique that apparently is no longer supported; updated those and corresponding templates. 2013-12-19 10:36:42 -05:00
tworrall
c40c7ad0e5 Merge branch 'maint-rel-1.6' into develop 2013-12-19 10:06:23 -05:00
tworrall
f5a8c5a7e6 data getter sparql queries in the n3 files were using a technique that apparently is no longer supported; updated those and corresponding templates. 2013-12-19 10:05:31 -05:00
tworrall
195fda4d3a Merge branch 'maint-rel-1.6' into develop 2013-12-18 11:51:19 -05:00
tworrall
ef9fd69285 put the page type select element into a separate template 2013-12-18 11:50:51 -05:00
tworrall
093359f992 Merge branch 'maint-rel-1.6' into develop 2013-12-16 11:57:40 -05:00
tworrall
d889016ce9 minor css tweak for style consistency 2013-12-16 11:57:02 -05:00
Holly Mistlebauer
82b408861c Holly made some additional minor test case changes after testing VIVO-645 against develop--testing for 1.6 is now completed. 2013-12-13 15:19:09 -05:00
Holly Mistlebauer
10beb8d560 Holly made the final, final RC 6 test case changes 2013-12-13 14:34:06 -05:00
Holly Mistlebauer
086587e78e Holly's final 1.6 changes, she hopes 2013-12-13 12:53:03 -05:00
hudajkhan
e1d804d32e Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-12-13 11:28:33 -05:00
Holly Mistlebauer
90b9fdcc9e Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-12-12 16:47:29 -05:00
Holly Mistlebauer
69d5ece4e9 Holly made changes to the test cases as a result of testing RC 5 2013-12-12 16:46:52 -05:00
tworrall
b0e6f9ff98 Merge branch 'maint-rel-1.6' into develop 2013-12-12 13:41:54 -05:00
tworrall
646776ebe9 corected a typo 2013-12-12 13:41:35 -05:00
Jon Corson-Rikert
80f53240a7 added restriction on “related technique” so that the property will appear for Material Entities (equipment and instruments). Made related technique visible and editable in property group overview. Put Technique into a class group (‘research’). Put SubnationalRegion into the class group “locations”. Put vivo:database in class group ‘research’ (not ero:Database). 2013-12-12 07:32:52 -05:00
tworrall
7bb6a803d0 Merge branch 'maint-rel-1.6' into develop 2013-12-11 16:26:26 -05:00
tworrall
5dd460d8de VIVO-643 create first and last names and vcard when adding a missing individual that is a foaf:Person 2013-12-11 16:25:56 -05:00
tworrall
77fa97ed40 Merge branch 'maint-rel-1.6' into develop 2013-12-11 12:42:13 -05:00
tworrall
0986361e77 VIVO-644 2013-12-11 12:41:57 -05:00
tworrall
4af9207baa Merge branch 'maint-rel-1.6' into develop 2013-12-11 12:01:13 -05:00
tworrall
d840c08d27 turned collation on for advisees faux property VIVO-640 2013-12-11 12:01:02 -05:00
tworrall
ff78326b45 Merge branch 'maint-rel-1.6' into develop 2013-12-11 11:48:47 -05:00
tworrall
c28a73b324 list view config change for VIVO-641 2013-12-11 11:48:27 -05:00
Holly Mistlebauer
d9f7fae757 Holly made final RC 4 changes to test cases 2013-12-10 18:20:03 -05:00
tworrall
6e7e882b98 Merge branch 'maint-rel-1.6' into develop 2013-12-10 17:07:29 -05:00
tworrall
c9d45ae965 VIVO-639 2013-12-10 17:06:51 -05:00
tworrall
8342c950d6 Merge branch 'maint-rel-1.6' into develop 2013-12-10 16:52:08 -05:00
tworrall
42c50be5d6 list view tweak for VIVO-632 2013-12-10 16:51:45 -05:00
tworrall
64bc8ff7c0 Merge branch 'maint-rel-1.6' into develop 2013-12-10 15:48:02 -05:00
tworrall
ba63872b8f VIVO-637 2013-12-10 15:47:21 -05:00
hudajkhan
f90d798937 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-12-10 15:40:45 -05:00
tworrall
87a688c1da Merge branch 'maint-rel-1.6' into develop 2013-12-10 14:16:38 -05:00
tworrall
dce8cc39af VIVO-592 2013-12-10 14:16:17 -05:00
hudajkhan
e583e1a98d Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-12-10 14:11:38 -05:00
tworrall
2e0c8a07b7 Merge branch 'maint-rel-1.6' into develop 2013-12-10 12:43:11 -05:00
tworrall
220194dc73 VIVO-637 date time generator changes for various date time properties 2013-12-10 12:42:45 -05:00
j2blake
64f9ba8cf9 Merge branch 'maint-rel-1.6' into develop 2013-12-10 11:38:18 -05:00
j2blake
3564cb78aa VIVO-581 Add a diagnostic page 2013-12-10 11:37:57 -05:00
hudajkhan
9a8b3b8262 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-12-10 10:29:27 -05:00
Jon Corson-Rikert
62ac5106da changed label from broader term to broader concept 2013-12-10 09:55:28 -05:00
Jon Corson-Rikert
c8d6132eb4 minor tweaks plus adding date/time value custom form annotations to date filed, date issued, globalcountdate, date expires that don’t q quite work yet 2013-12-10 08:08:38 -05:00