jeb228
|
98e5283ab1
|
NIHVIVO-962 Merge 5539 from branch
|
2010-07-29 13:30:55 +00:00 |
|
jeb228
|
c0ee32b498
|
NIHVIVO-962 Merge 5538 from branch
|
2010-07-29 13:30:00 +00:00 |
|
jeb228
|
be57b724ec
|
NIHVIVO-962 Merge 5537 from branch
|
2010-07-29 13:28:52 +00:00 |
|
jeb228
|
6bb9980fc3
|
NIHVIVO-962 Merge 5536 from branch
|
2010-07-29 13:27:35 +00:00 |
|
rjy7
|
e6a65f5ad0
|
NIHVIVO-564 Dump directive
|
2010-07-28 17:48:03 +00:00 |
|
rjy7
|
5359909ae7
|
Added linebreak at end of script and stylesheet tags, for readability in html source.
|
2010-07-28 16:20:10 +00:00 |
|
rjy7
|
f4b6f3e941
|
NIHVIVO-564 Change datatype of Script and Stylesheet collections from List to LinkedHashSet, to prevent duplication while retaining ordering.
|
2010-07-28 15:16:14 +00:00 |
|
rjy7
|
3317419fcf
|
NIHVIVO-564 Enable adding stylesheets in dump ftls
|
2010-07-28 15:07:55 +00:00 |
|
rjy7
|
067f896a1f
|
Add license text
|
2010-07-28 13:08:45 +00:00 |
|
sjm222
|
dcd7f10b58
|
merging in revision 5523, changing object property sort method to account for nulls
|
2010-07-27 22:18:36 +00:00 |
|
rjy7
|
b9ac586c20
|
NIHVIVO-564 Work on dump directive
|
2010-07-27 22:00:13 +00:00 |
|
rjy7
|
83938a2c19
|
NIHVIVO-564 Work on dump directive
|
2010-07-27 21:49:40 +00:00 |
|
rjy7
|
7f8b9159db
|
Simple refactoring: changed name of freemarker base classes
|
2010-07-27 18:58:27 +00:00 |
|
jeb228
|
ff1e81fe65
|
NIHVIVO-1026 merge 5508 from the branch.
|
2010-07-27 17:25:08 +00:00 |
|
bdc34
|
2de4504d1b
|
Fixing compile error. NIHVIVO-1000
|
2010-07-27 15:55:10 +00:00 |
|
bdc34
|
f4409580b4
|
Cleanup of webapp context root. Removing many unused jsp files and some unused controllers. NIHVIVO-1000
|
2010-07-27 15:31:19 +00:00 |
|
rjy7
|
ee782cdfd7
|
NIHVIVO-825 Allow adding a list of scripts or stylesheets with a single call to add() or addFromTheme()
|
2010-07-27 15:15:45 +00:00 |
|
ass92
|
bde19b82ac
|
code modification for permanent uri tool to retrieve default namespace.
|
2010-07-26 19:55:40 +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 |
|
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 |
|
bjl23
|
44976b4b72
|
merging changes for NIHVIVO-959 fillExistingObjectPropertyStatements error
|
2010-07-23 18:06:22 +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
|
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 |
|
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 |
|
jeb228
|
1236e6cf18
|
NIHVIVO-927 Merge 5418 from the branch.
|
2010-07-22 20:23:20 +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 |
|
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 |
|