Commit graph

2217 commits

Author SHA1 Message Date
tlw72
416552483d Reworked again to make this work for user-defined menus 2011-01-17 18:13:47 +00:00
mb863
f529c53130 Photo Upload was broken in two lines. Now It is fixed 2011-01-17 17:57:52 +00:00
mb863
7e971dbef3 NIHVIVO-1710: Fixed spacing for additional links 2011-01-17 16:29:30 +00:00
tlw72
0cf2822237 Add check for research to eliminate awkward heading when there is none 2011-01-17 16:02:38 +00:00
rjy7
16b1067363 Fix links display in vitro individual.ftl - change from an include to a macro call 2011-01-17 15:54:20 +00:00
mb863
d357222b2a NIHVIVO-1706: changed jQuery selector for adding alert feedback when deleting individual photos in individual templates. 2011-01-17 15:47:50 +00:00
jeb228
a7ef580161 Record the manual merges of r7031, r7040, r7052 from the release 1.2 maintenance branch. 2011-01-17 15:09:30 +00:00
jeb228
f71db9b54f Merge r7038 from the release 1.2 maintenance branch 2011-01-17 15:03:49 +00:00
jeb228
651eead784 Merge r7043, r7046, 7050, 7067 from the release 1.2 maintenance branch 2011-01-17 15:01:47 +00:00
jeb228
940fe03123 Merge r7065, r7066 from the release 1.2 maintenance branch 2011-01-17 14:58:37 +00:00
sjm222
4855cab148 changing the method for removing obsolete annotations 2011-01-17 14:52:35 +00:00
mb863
c97822efcd NIHVIVO-1493: Moved user feedback alerts css to vitro.css 2011-01-17 03:03:54 +00:00
mb863
b47f16cc94 NIHVIVO-1706: Added confirmation alert for photo deletion in image upload and individual templates 2011-01-17 02:44:22 +00:00
nac26
adbdee50ed Merged r7063 from nihvivo-rel-1.2-maint branch 2011-01-17 02:33:41 +00:00
nac26
1d2b6b821f NIHVIVO-1760 Updated logic for data checking templates. Will only suggest logging in if no authenticated session exists. 2011-01-17 02:28:45 +00:00
rjy7
5731e19a43 Merge r7061 from nihvivo-rel-1.2-maint 2011-01-17 01:31:02 +00:00
rjy7
3bcb46de1b Fix typo 2011-01-17 01:29:23 +00:00
nac26
4aa1aebd3a Merged r7059 from nihvivo-rel-1.2-maint branch 2011-01-16 23:14:16 +00:00
nac26
cbf08df272 Added check for no data. When there is no content a message is displayed instead of rendering a blank index page. 2011-01-16 23:13:06 +00:00
nac26
9d9a900d33 Merged r7057 from nihvivo-rel-1.2-maint branch 2011-01-16 22:53:21 +00:00
nac26
12561a2d73 NIHVIVO-1073 Added check for no data. Primarily used for initial state after new installation. 2011-01-16 22:50:21 +00:00
bjl23
f6676d58b7 NIHVIVO-1752 bugix for backend object property editing (merge from nihvivo 1.2 maint branch) 2011-01-16 22:18:11 +00:00
bjl23
ffdedd21bb NIHVIVO-1752 bugix for backend object property editing 2011-01-16 22:16:56 +00:00
bjl23
df8628b47a NIHVIVO-1735 and NIHVIVO-1753 bugfixes for baseOntModel setup and initial reasoning (merge from 1.2 maint branch) 2011-01-16 21:25:05 +00:00
bjl23
6883148154 NIHVIVO-1735 and NIHVIVO-1753 bugfixes for baseOntModel setup and initial reasoning 2011-01-16 21:23:14 +00:00
nac26
58027d5d95 Merged r7051 from the trunk 2011-01-16 19:29:52 +00:00
nac26
3a5a01ee57 NIHVIVO-1458 Login form is hidden once again if JavaScript is disabled. Autofocus on login form also makes a triumphant return. 2011-01-16 19:26:15 +00:00
sjm222
9f62fdfe2b migration logging improvements 2011-01-16 17:10:52 +00:00
rjy7
c6afc196c8 Merge r7047-7048 from nihvivo-rel-1.2-maint 2011-01-16 14:30:25 +00:00
rjy7
a3a5f361d5 NIHVIVO-1722, NIHVIVO-1380 Some refactoring of code that creates a link to an individual's rdf 2011-01-16 14:23:38 +00:00
rjy7
86ba0ea192 NIHVIVO-1722 Fix rdf url for individual in non-default namespace 2011-01-16 04:55:23 +00:00
sjm222
e11df64aee improvements to logging 2011-01-16 00:59:25 +00:00
rjy7
c2e69fe9e1 Record-only merge of r7044 from nihvivo-rel-1.2-maint 2011-01-15 22:26:37 +00:00
rjy7
e707b564d8 Merge r7034-7036 from trunk 2011-01-15 22:23:38 +00:00
sjm222
99e1668862 improving logging in the update code; refactored some class names; added an additional sparql construct to delete data 2011-01-15 15:38:48 +00:00
rjy7
f70aad23f6 Record only merge of r7041 from nihvivo-rel-1.2-maint 2011-01-15 05:28:58 +00:00
rjy7
eb7a3933e4 Merge r7033, r7037 from trunk 2011-01-15 04:55:38 +00:00
bjl23
dd82ea3927 merging WebappDaoFactorySDB improvement back from the trunk 2011-01-15 00:55:05 +00:00
bjl23
d3e54a5841 simpler solution to NIHVIVO-1708 2011-01-15 00:24:15 +00:00
bdc34
f8eae4cd46 changing type of vclassgroup objects passed to template NIHVIVO-1674 2011-01-14 23:23:19 +00:00
rjy7
c06645ce88 Modify messages displayed when a collated property doesn't have a valid config for collation, and downgrade from an error to a warning 2011-01-14 23:11:50 +00:00
mb863
57ff8a0ca0 NIHVIVO-641: Removed arrow from headers and fixed individual list display. 2011-01-14 22:37:26 +00:00
mb863
b4b3c1300b NIHVIVO-1719; Fixed formatting for radio buttons 2011-01-14 22:36:11 +00:00
mb863
8e1f314157 NIHVIVO-1723: Fixed alignment of letter OR in external authentication 2011-01-14 22:33:57 +00:00
rjy7
9ac7796c67 NIHVIVO-1667 Don't display an add link for data properties whose display limit has already been reached. 2011-01-14 22:22:44 +00:00
jeb228
fcbcd67fb4 NIH VIVO Release 1.2 maintenance branch 2011-01-14 22:18:30 +00:00
bjl23
1e2070299d removing obsolete validator class 2011-01-14 22:00:37 +00:00
mb863
d7209cf2d8 Changed loginUtils.js to the head and change comment for fading error alerts to fade IN 2011-01-14 22:00:30 +00:00
ass92
2aee2e581c improvement on rdb and sdb switch. 2011-01-14 21:40:28 +00:00
rjy7
e9be56a37f NIHVIVO-1718 Removing the back end keyword forms, since: they are buggy; the property is not displayed on the individual page;
and the property will be removed in v1.3.
2011-01-14 21:39:44 +00:00