litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1782 commits 9 branches 0 tags 258 MiB
Commit graph

1272 commits

Author SHA1 Message Date
bjl23
44976b4b72 merging changes for NIHVIVO-959 fillExistingObjectPropertyStatements error 2010-07-23 18:06:22 +00:00
cdtank
32fa4851a6 1. Commented out servlet mapping for dummy vis servlet which contained links to various test individuals. 2010-07-23 16:05:03 +00:00
mb863
0f7d3cbaca Merged manually some changes 2010-07-23 15:52:13 +00:00
bjl23
89d9eaa431 merging debugging statement removal to trunk 2010-07-23 15:31:48 +00:00
jeb228
873a40678a NIHVIVO-961 Merge 5443 from the branch 2010-07-23 15:25:33 +00:00
jeb228
1da043245c Merge 5441 from the branch 2010-07-23 14:00:43 +00:00
ass92
1f4a99f770 Display statement correction. 2010-07-22 22:49:02 +00:00
ass92
b9498fc5f7 NIHVIVO-934,935 code corrections for Merge Individual tool. 2010-07-22 22:48:01 +00:00
bjl23
c2ad9176d0 fixing compile errors from merge problem with SelectListGenerator 2010-07-22 21:48:32 +00:00
rjy7
7758eca11b Merge r5431 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-22 21:33:32 +00:00
bjl23
4f3664b905 some merges back to the trunk that I forgot to commit earlier 2010-07-22 21:28:28 +00:00
nac26
4cd59ee32d merge from nihvivo-rel-1.1-maint branch: collation by subclass functional when property groups are enabled. Valid markup in either case NIHVIVO-846 2010-07-22 21:25:12 +00:00
bdc34
76304b76dc Merging to trunk. Pick list filtering. 2010-07-22 21:21:04 +00:00
bdc34
2eca05053e Merging to trunk. Fixing error when deleting properties on front end NIHVIVO-953 2010-07-22 21:15:57 +00:00
bdc34
8413938501 Merge to trunk. Adding cancel button to default object property form. NIHVIVO-951 2010-07-22 20:48:12 +00:00
ass92
fb26b874de Filed download correction for merge individuals tool. 2010-07-22 20:30:09 +00:00
jeb228
1236e6cf18 NIHVIVO-927 Merge 5418 from the branch. 2010-07-22 20:23:20 +00:00
jeb228
d3bba71a13 NIHVIVO-927 Merge 5404 from the branch. 2010-07-22 19:26:50 +00:00
rjy7
a82411b2f0 merge r5315 r5323:5325 r5333 r5359 r5381 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-22 18:47:44 +00:00
nac26
fa77c80a91 merge from nihvivo-rel-1.1-maint branch: moving the individual rendering changes back to the vitro 2010-07-22 18:38:29 +00:00
bdc34
23007ba45e MERGEING r5396 from nihvivo-rel-1.1-maint BY HAND . Fixing code to build search index at ontology update NIHVIVO-900 2010-07-22 18:34:48 +00:00
bdc34
e95fd811f0 Merged to trunk. Fixing code to build search index at ontology update NIHVIVO-900 2010-07-22 18:29:12 +00:00
nac26
1267a25203 merge from nihvivo-rel-1.1-maint branch: fixing some "thumnail" typos 2010-07-22 18:11:02 +00:00
ass92
ef712eb11a NIHVIVO-945 code change for generation of local names with positive integers. 2010-07-22 17:51:15 +00:00
ass92
035c4c3735 NIHVIVO-936 code change to keep local name intact for change namespace utility 2010-07-22 16:53:54 +00:00
rjy7
4b990e4649 Merge r5382 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-22 15:44:34 +00:00
jeb228
1c62224b6d NIHVIVO-927 Merge 5386 from branch. 2010-07-22 15:22:18 +00:00
bdc34
7911fa6490 Merged to trunk. Changed the way a new individual is created on the siteAdmin NIHVIVO-881 2010-07-22 15:19:15 +00:00
ass92
4a6aa63393 NIHVIVO-932 made namespace retrieval change in permanent uri tool 2010-07-22 15:17:07 +00:00
jeb228
724aa4d326 Merge 5379 2010-07-22 14:20:43 +00:00
jeb228
50cc897669 NIHVIVO-918 Merge 5377 from branch 2010-07-22 14:10:30 +00:00
bdc34
38130db941 Merging to Trunk. Changing addPublicationToPerson.jsp to skip form when trying to edit an existing authorship, NIHVIVO-912 2010-07-22 00:38:11 +00:00
rjy7
e3d09333c4 Merge r5371:5373 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-21 22:02:11 +00:00
jeb228
0459959ae7 NIHVIVO-701 Merge 5366 from branch 2010-07-21 19:40:40 +00:00
bdc34
12b933fa32 merging code to deal with duplicate international areas. 2010-07-21 18:47:00 +00:00
bdc34
0b97ec523b merging URL validation in defaultLinkForm.jsp 2010-07-21 18:44:34 +00:00
bdc34
30890a7b5f MERGED BY HAND r5362 from branch vivonih-rel-1.1-maint 
Removing search index rebuild at tomcat startup NIHVIVO-900
 2010-07-21 18:42:11 +00:00
jeb228
60f6f401f3 NIHVIVO-874 Merge 5357 from the branch. 2010-07-21 17:15:22 +00:00
bdc34
d565eca6b6 Merging from branch. Adding getRdfsLabel() to Individual and subclasses. NIHVIVO-836 2010-07-21 14:44:36 +00:00
rjy7
4bfeadf3ad Merging r5332 r5336:5338 r5341 r5349 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-20 23:24:01 +00:00
jeb228
68ece6f23b NIHVIVO-906 Merge 5340 Use the <c:url> tag to make the JavaScript location relative to the webapp context. 2010-07-20 19:23:03 +00:00
cdtank
a688d30ac5 1. Attempting to move vivio-specific vis code to "vivo package" 2010-07-20 17:48:30 +00:00
cdtank
4eea0c8b5e 1. Made wordings change 2010-07-19 21:54:51 +00:00
cdtank
106a5db1e1 1. Fixed a bug in the slugify method which was triggered when the string being fed was very small. Resolved it using apache commons lib. 
2. Also improved slugify logic.
 2010-07-19 21:40:49 +00:00
rjy7
a5f60a9f7f Merging r5308, r5320, r5322 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-19 21:37:59 +00:00
cdtank
ddae9bb311 1. Fixed a bug for an edge case in coauthorsip vis 2010-07-19 21:15:46 +00:00
cdtank
d3af6d949e 1. Made changes to logic for getting the counter for total unique co-authors sparkline. Per Micah's request. 
2. Word changes.
 2010-07-19 20:59:01 +00:00
cdtank
74edbcd45c 1. Made wording changes & also extension of graphml file to .xml 2010-07-19 19:35:17 +00:00
cdtank
382fd6ae80 1. Made changes to incorporate conditional wordings for side-bar in person level vis. 2010-07-19 19:14:36 +00:00
jeb228
c556264eeb NIHVIVO-862 Distinguish between two different DELETE functions: one comes directly from the Individual page, and returns directly to it. The other from the "edit" screen and returns to it, while preserving the exit page from the transaction for later use. 2010-07-19 19:11:30 +00:00