Commit graph

1740 commits

Author SHA1 Message Date
j2blake
e0a255c8b2 Merge from 1.5 branch: NIHVIVO-3977 Incorporate improvements in OpenSocial for 1.5.1. Also, make shinding_orng_tables.sql re-runnable. 2012-10-01 16:53:43 +00:00
j2blake
9cdffd0c09 Merge from 1.5 branch: NIHVIVO-3973 If the Solr index is not available, do not offer the user the ability to re-index. Show an error message instead. 2012-09-26 16:02:27 +00:00
j2blake
eb1d4b9631 Merge from branch: NIHVIVO-3930 Add logic to the template: if totalToDo is 0, we are still preparing the list of records to index. Don't show the counts, or an estimated time. 2012-09-25 20:35:32 +00:00
hjkhjk54
0b3d14ebab Updates for enabling the association of sparql queries with OWL classes and allowing the individual response builder to retrieve data (using data getters) and make that data available to the templates. Additionally, I'm adding a new data post processor that allows 'duplicate' results (or results with the same object uri for the main subject uri) to be returned - this relates to work being done by Frances for Vitro. This post processor will need to be explicitly included for it to be used. 2012-09-24 16:14:51 +00:00
briancaruso
bfad0384bd Remove number of individuals to display controll from property editing form NIHVIVO-3921 2012-09-21 17:50:56 +00:00
tworrall
fb483663bf merging r10056 to the trunk 2012-09-19 15:25:42 +00:00
tworrall
794602c22a merging 10043 into the trunk 2012-09-07 17:10:04 +00:00
j2blake
0a72583712 Merge from 1.5 branch: NIHVIVO-3954 Add OpenSocial bug fixes from Eric Meeks: make compound key in app_registry table, show sandbox login, ensure that randomly assigned Gadget ID is not negative, modify JS to find out whose page we are on. 2012-09-07 15:41:57 +00:00
tworrall
5d950625c2 merging r10033 to the trunk 2012-09-06 14:52:54 +00:00
tworrall
c83ff876c5 merging r10022 to the trunk 2012-08-29 19:51:27 +00:00
tworrall
3d2188ec66 merging r10018 to the trunk 2012-08-28 16:06:02 +00:00
hjkhjk54
b0f4e7e820 updates for page management and adding rdfs prefix to menu.n3 2012-08-20 19:26:32 +00:00
hjkhjk54
34858fcadb updates for page management as well as some changes to schema.xml to enable addition of dynamic fields (for datastar but also present if others would like to employ it) - some additional debug lines to ContextNodeFields. 2012-08-16 21:17:40 +00:00
tworrall
cdd10b24f1 merging r10009 to the trunk 2012-08-13 16:14:28 +00:00
tworrall
4f56554901 merging r10004 to the trunk 2012-08-07 19:54:50 +00:00
hjkhjk54
059094be4c Updates for handling single and double quotes in html and sparql data getters 2012-08-06 19:30:47 +00:00
hjkhjk54
8225bcf91f updates for handling single and double quotes as well as enabling self contained template option for page management 2012-08-03 15:24:58 +00:00
tworrall
6a63de6144 merging 9989 to the trunk 2012-08-03 14:29:56 +00:00
tworrall
1b75b2a93f merging r9990 into the trunk 2012-08-01 14:07:08 +00:00
tworrall
473680c3d2 merging 9985 to the trunk 2012-07-19 15:49:18 +00:00
tworrall
8c17a65fc3 merging 9981 to the trunk 2012-07-18 19:06:38 +00:00
tworrall
4dfed87eca merging 9979 to the trunk 2012-07-17 21:03:10 +00:00
tworrall
00cbf83d69 merging 9973 to the trunk 2012-07-12 14:59:50 +00:00
tworrall
65d2e45ab0 merging 9971 to the trunk 2012-07-12 14:48:30 +00:00
tworrall
a34e021a1b merging 9968 into the trunk 2012-07-11 18:56:19 +00:00
tworrall
46d5b47e92 merging 9966 to the trunk 2012-07-11 16:40:14 +00:00
tworrall
018678463d merging 9961 to trunk 2012-07-10 14:51:08 +00:00
brianjlowe
a3817292a5 merge r. 9959 from maint-rel-1.5 : NIHVIVO-3893 change interface text from 'SDB models' to 'main store models' in ingest tools when using models from main quad store 2012-07-10 14:16:54 +00:00
brianjlowe
eace91759a NIHVIVO-3877 and NIHVIVO-3872 using RDFService for aspects of import and export 2012-07-06 15:05:29 +00:00
tworrall
ae8319dd5a in the class groups list, added a link to hide/show the classes for each group 2012-07-05 14:31:40 +00:00
tworrall
de276020aa converted prperty groups listing to new design, like class groups and class hierarchy 2012-07-03 15:33:52 +00:00
j2blake
19fa66cf81 NIHVIVO-3829 Change the name of the default INDEX short view template to conform to the new convention. 2012-07-01 15:42:14 +00:00
tworrall
4b192ef8eb rename class attribute 2012-06-28 19:12:47 +00:00
tworrall
86627facb3 adusted font style and size for text areas on property edit page 2012-06-28 17:13:17 +00:00
tworrall
bbd616b227 minor ui adjustments 2012-06-28 15:59:48 +00:00
tworrall
b3d3a870ac NIHVIVO-if all grants or pubs are hidden, the manage link should still be displayed 2012-06-27 19:17:34 +00:00
briancaruso
d7b3f0e3f1 Removing debugging message from ftl NIHVIVO-3827 2012-06-26 21:11:54 +00:00
j2blake
b223feedb2 NIHVIVO-3484 If an expected image file is not found, serve the "missing link" image instead. 2012-06-26 20:47:53 +00:00
hjkhjk54
2a3181536c updates for code cleanup, also fixed error in internalClassDataGetter introduced after previous update removing JSON Object as constructor for ProcessInternalClassDataGetter. Added space to sparql query for other ProcessDataGetter classes - although code was working without that. 2012-06-26 17:48:50 +00:00
j2blake
54807074a1 NIHVIVO-3772 Incorporate the most recent changes from Eric (2012-06-25) 2012-06-26 16:24:54 +00:00
jcorson-rikert
5981f30047 minor tweaks to display; removing comments from vclass console (no way to populate) 2012-06-26 12:15:28 +00:00
jcorson-rikert
32cd580d81 More changes to ontology editing forms and console pages based on help from Manolo 2012-06-26 03:11:49 +00:00
hjkhjk54
ac3b58874f adding sortable icon for menu ordering in vitro 2012-06-25 21:08:46 +00:00
tworrall
4cf370e116 page management - added edit icon to page list template 2012-06-25 20:23:08 +00:00
tworrall
7ea00cd5a8 pagemanagement - added cancel button to main content type sections 2012-06-25 19:59:18 +00:00
hjkhjk54
c46b148535 Updates for page management, including updating link to menu ordering on page list, updating internal class server side logic to correctly instantiate objects when editing an internal class page (previously json object was passed but wasn't needed so removed from constructor), also updated client-side script to correctly populate internal class/class group section and other client-side interactions 2012-06-25 17:34:25 +00:00
jcorson-rikert
9c7e231324 Changes to vclass, object property, and data property editing forms (JSPs) and controllers, plus one new vitro.css class 2012-06-25 17:01:41 +00:00
tworrall
c36d9565a1 ftl and css changes for page management 2012-06-25 14:52:46 +00:00
tworrall
ffce3efe91 NIHVIVO-760 added noscript message to menu pages 2012-06-25 01:59:15 +00:00
hjkhjk54
e3f9caced1 updates for page management - page deletion as well as changing menu management to menu ordering 2012-06-25 00:19:33 +00:00