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

938 commits

Author SHA1 Message Date
rjy7
37c2990bba Merge r5484 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-26 18:40:28 +00:00
jeb228
d277692365 NIHVIVO-1013 Merge 5482 from the branch. 2010-07-26 17:51:35 +00:00
rjy7
b92982dcc0 Small modification to code to generate HARDCODED_LITERALS select list. 2010-07-26 15:59:02 +00:00
bdc34
367b0c4bfc Merge to trunk. Fixing logging for PropertyGroupDaoJena and downgrading log message NIHVIVO-1006 2010-07-26 15:29:49 +00:00
rjy7
3dadfff50b Modified disabled attribute of input tag to support values "disabled" and "true" 2010-07-26 15:15:06 +00:00
ass92
019545ccd9 removed unnecessary comments. 2010-07-25 08:59:08 +00:00
ass92
61d1c9e2df NIHVIVO 1001,1002 - code correction for permanent uri tool. 2010-07-25 08:54:24 +00:00
bdc34
60c71ee2ae Merge to trunk. Removing more portal filtering when there is only one portal. NIHVIVO-998 2010-07-24 21:57:54 +00:00
nac26
89f3bbfbd8 merge from nihvivo-rel-1.1-maint branch: removed unnecessary <br> 2010-07-24 21:52:47 +00:00
bdc34
0b186aaf20 Merge to trunk. Adding filtering to EntityMergedPropertyListcontroller NIHVIVO-984 2010-07-24 21:36:12 +00:00
rjy7
2be346ee67 Merge r5466 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-24 20:25:37 +00:00
rjy7
826679b073 Merge r5464 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-24 18:59:50 +00:00
rjy7
92d83f4ac2 Merge r5462 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-24 18:08:45 +00:00
bdc34
5671656d5d Merge to trunk. Fixing tab flag 1 filtering when there is only one portal. NIHVIVO-987 2010-07-23 21:04:08 +00:00
bdc34
ef3222d0d1 Merge to trunk. Removing debug statement. 2010-07-23 20:47:15 +00:00
bdc34
59801b8dcb Merge to trunk. Fixing error when deleting properties on front end NIHVIVO-953 2010-07-23 20:45:37 +00:00
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