litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3403 commits 8 branches 1 tag 111 MiB
Commit graph

3403 commits

This branch
This branch
All branches
Author SHA1 Message Date
hlm7
313463d37e Holly forgot to commit these earlier... 2012-01-12 16:33:28 +00:00
manolobevia
94ebf8feaa NIHVIVO-3530: Removing another js. 2012-01-09 19:45:24 +00:00
manolobevia
59672b5156 NIHVIVO-3530: Deleted old custom forms jsp files. This is what I have done for VIVO: 
1-Deleted all the js, css, and js from VIVO/productMods/forms
2-Moved css and js to from VIVO/productMods/forms to VIVO/templates/freemarker/forms
3-Updated css and js path files for all the ftl files at VIVO/templates/freemarker/forms, which contains the new custom forms.
 2012-01-09 19:42:09 +00:00
hjkhjk54
8d9a59c1bf updates for nihvivo-3357: including update for javascript and freemarker template that allows inclusion of hard-coded URIS to exclude from autocomplete results. This allows the subject uri to be excluded from the results for an object property form (e.g. collaborators auto-complete will exclude the subject from showing up in the list of person results). 2012-01-09 18:58:31 +00:00
j2blake
9000616bcc NIHVIVO-3523 Merge the DisplayByRolePermission and EditByRolePermission code from branches/dev-permissions-NIHVIVO-3523 2012-01-09 16:21:12 +00:00
j2blake
bb220015d7 NIHVIVO-3523 catch up with the trunk 2012-01-09 15:50:14 +00:00
j2blake
1a54405cf1 NIHVIVO-3523 Create the DisplayByRolePermission, so we can use the PermissionsPolicy instead of DisplayRestrictedDataByRoleLevelPolicy, and these display restrictions can be assigned to arbitrary PermissionSets. 2012-01-06 21:58:12 +00:00
hjkhjk54
225a254b71 NIHVIVO-3357 - updated autocomplete generator and autocomplete template: generator returns empty list in case only owl:Thing returned, as Solr search doesn't create the index using this class, and updated freemarker template so that the type parameter for autocomplete is only passed in case the types list from the generator is not empty. Also added similar logic for parameter value for "multiple types" 2012-01-06 17:40:49 +00:00
tworrall
9d520d14b5 NIHVIVO-1049 and 2284: generator, template and js for mailingAddress 2012-01-05 15:12:02 +00:00
tworrall
47b47d0b69 removed the collate tags so that the subclass will be available to the list view in the event that collate by subclass is turned off 2012-01-05 14:55:29 +00:00
stellamit
5480a2d8ba updating from latest flora export 2012-01-04 20:16:39 +00:00
stellamit
51c0b6ec96 ontology files generated from the newly created flora editing environment and renamed for 1.5. Also, commenting out the knowledgebaseupdate in startup_listeners.txt 2012-01-04 20:14:44 +00:00
j2blake
e005f73768 NIHVIVO-3523 catch up with the trunk 2012-01-04 19:51:17 +00:00
j2blake
debaead351 NIHVIVO-3523 catch up with the trunk 2012-01-04 19:50:26 +00:00
j2blake
c4eaa221b4 Tweak the description of vitro.ocal.solr.ipaddress.mask 2011-12-31 16:32:43 +00:00
j2blake
e83651e643 NIHVIVO-3523 Merge the JSP fixes from branches/dev-permissions-NIHVIVO-3523 2011-12-21 23:18:30 +00:00
j2blake
7e62cd0848 NIHVIVO-3523 Oops. Some of the JSPs were using those RequestedAction classes that I converted to SimplePermissions. 2011-12-21 23:02:24 +00:00
j2blake
756c1fc8be NIHVIVO-3523 Merge the SimplePermission code from branches/dev-permissions-NIHVIVO-3523 2011-12-21 22:23:20 +00:00
j2blake
a19d05594d NIHVIVO-3523 Convert all simple ADMIN-only requested actions to SimplePermissions. 2011-12-21 20:46:42 +00:00
j2blake
83c1d151ec NIHVIVO-3523 Rewrite the PermissionRegistry to be immutable, and to distribute BrokenPermissions when someone asks for a Permission that doesn't exist. 2011-12-19 21:19:54 +00:00
j2blake
353ffe1891 NIHVIVO-3523 For the first iteration, let's implement MANAGE_MENUS as a SimplePermission. This version still needs the loader and the policy and... 2011-12-18 00:02:23 +00:00
j2blake
a87f08adff NIHVIVO-3523 Create a branch to implement the first cut at Permissions. 2011-12-17 23:53:53 +00:00
hlm7
373c6caa36 Final test case tweaks by Holly... 2011-12-16 17:28:13 +00:00
briancaruso
97326029a0 removing junk deploy properties files 2011-12-15 17:42:53 +00:00
briancaruso
3556603927 removing junk deploy properties files 2011-12-15 17:42:28 +00:00
j2blake
9dd516dcfa Merge 3888 from 1.4 maint branch 2011-12-15 16:12:34 +00:00
briancaruso
8275adc10f Mergin 3856 3851 3838 3830 3829 3828 3827 from vivo 1.4 branch 2011-12-14 22:20:23 +00:00
stellamit
9bb0904dd7 I don't know why my updates to the 1.4 branch are not showing up as candidates for merge. I'm checking the latest ontology files from 1.4 branch into trunk. 2011-12-14 22:12:16 +00:00
j2blake
a009f582f3 A re-worked version of the performance testing framework. 2011-12-14 22:01:35 +00:00
manolobevia
031dc3e004 NIHVIVO-3485: Fixing layout issues after associating a profile. 2011-12-14 02:20:35 +00:00
hjkhjk54
907a17fb45 updates for license info for semantic web service code integration. Removing VIVO license line from files with MIT license. NIHVIVO-3496 2011-12-13 22:13:19 +00:00
manolobevia
5382eac9cd NIHVIVO-3485: Fixing layout issues for associating a profile to an account in VITRO had created layout issues in vivo for this feature. It's fixed. 2011-12-13 21:46:55 +00:00
hjkhjk54
7a10b339fc updates for license info for semantic web service code integration. NIHVIVO-3496 2011-12-13 21:23:27 +00:00
hjkhjk54
cceaa0813e updates for license info for semantic web service code integration. NIHVIVO-3496 2011-12-13 21:10:10 +00:00
j2blake
020a306e83 Merge 3871 from 1.4 maint branch 2011-12-13 20:25:45 +00:00
hlm7
12d9817613 Holly tweaked some test cases... 2011-12-12 22:49:14 +00:00
stellamit
4ac91d8c0c updating merge history indicator 2011-12-12 18:27:19 +00:00
stellamit
9b18989c1d latest upgrade doc from 14 branch 2011-12-12 18:25:10 +00:00
tworrall
071728ac31 NIHVIVO-3472 modified bullet points 2 and 3 under XII so that they referred correctly to the current forms 2011-12-12 18:01:48 +00:00
stellamit
64fb63d304 checking in the very latest from the 14 branch 2011-12-12 17:35:30 +00:00
hlm7
d8245f3261 Holly made a minor tweak to this test case... 2011-12-12 17:33:55 +00:00
brianjlowe
5e835a3f23 NIHVIVO-3469 minor update to VIVO 1.4 upgrade doc 2011-12-12 17:22:41 +00:00
brianjlowe
01219a57e4 NIHVIVO-3469 minor updates to VIVO installation doc 2011-12-12 17:18:50 +00:00
stellamit
80666aa0a0 merging changes from 1.4 branch 2011-12-12 17:15:39 +00:00
manolobevia
403ffed9cc NIHVIVO-3476: Text on Manage web pages is not movable any more. 2011-12-12 16:41:42 +00:00
hlm7
99f1c693a0 Holly finished new Web of Science test suite... 2011-12-10 19:59:07 +00:00
hlm7
bb2ee6cfdc Most test case tweaking by Holly... 2011-12-10 19:14:35 +00:00
hlm7
eed6687345 Minor tweaking of some test cases by Holly... 2011-12-09 21:56:39 +00:00
hlm7
45dbd0be9a 2011-12-09 20:25:30 +00:00
hlm7
a1e5ae937c Holly add a test case to each test suite so that the index is rebuilt before starting. This will help the test suites run more smoothly repeatedly. 2011-12-09 20:24:55 +00:00