stellamit
c01980c795
updates for VIVOONT-351, VIVOONT-391, VIVOONT-398 and VIVOONT-402
2011-05-31 18:00:53 +00:00
ryounes
e187afe200
Record-only merge of r2867 and r2822; these changes were made independently on the trunk.
2011-05-31 15:07:55 +00:00
tankchintan
c79c6cf968
1. More updates to the map of science vis.
2011-05-28 00:05:42 +00:00
brianjlowe
1c594395aa
NIHVIVO-2440 Remove RDB support
2011-05-27 20:37:39 +00:00
j2blake
3e29f4b9cc
NIHVIVO-2279 Hard-coded loading for our four favorite PermissionSets.
2011-05-27 19:04:47 +00:00
kongchinhua
99fe63de67
Add license header
2011-05-27 01:24:03 +00:00
kongchinhua
a8e3c85629
fixed filter issue
2011-05-27 00:59:54 +00:00
kongchinhua
d07238287e
Integration between science map widget and data table widget
2011-05-26 23:31:39 +00:00
tankchintan
80fc455b9d
1. Added license for datable helper js.
2011-05-26 17:28:21 +00:00
tankchintan
ca08343379
1. Added front-end for map of science vis.
...
2. Added Data tables for disciplines/sub-disciplines in the vis.
3. added support for different csv downloadables.
4. Added new updated libraries for DataTables plugin.
2011-05-26 17:11:16 +00:00
ryounes
3fdc267806
NIHVIVO-2623 Upgrade to Freemarker 2.3.18
2011-05-25 20:08:41 +00:00
j2blake
93a5806924
NIHVIVO-2279 Implement CreatePassword - start to separate into user vs. admin functions.
2011-05-25 20:03:19 +00:00
stellamit
f808ce21a6
starting directory structure for sparql queries for NIHVIVO-1275
2011-05-25 17:43:14 +00:00
manolobevia
261f9a0fb1
Removed extra licensing line: /* $This file is distributed under the terms of the license in /doc/license.txt$ */
2011-05-25 16:09:42 +00:00
ryounes
2d450029fb
NIHVIVO-2437 Switch to Solr index and controllers
2011-05-25 15:46:46 +00:00
manolobevia
44c5371749
NIHVIVO-2588: Updated identity.ftl in wilma to accommodate the new user menu (when logged in) in header links. My account and My profile don't link to any URL yet. Rebecca will need to provide the $profileURL to be used for the "My profile" link, and Jim Blake will need to provide $accountURL to be used for the "My account Link.
2011-05-25 02:35:36 +00:00
manolobevia
a9bc9fcfda
NIHVIVO-2280. Worked on markup and styles for account main page, add account, and edit account. Work in progress.
2011-05-25 02:30:07 +00:00
anupsawant
96cbaed66c
2011-05-24 19:36:59 +00:00
j2blake
9593b175a8
NIHVIVO-2279 Implement FreemarkerEmailFactory and standardize on it. Change the parameters used to enable e-mail.
2011-05-24 19:30:55 +00:00
ryounes
8f65033e34
NIHVIVO-2460, NIHVIVO-2643 Add Solr versions of JSONServlet and JSONReconcileServlet (not yet migrated from Lucene to Solr) and corresponding commented-out servlet mappings.
2011-05-24 19:18:14 +00:00
ryounes
d18b02782e
Changes to QR code generation to support swapping in a different model in IndividualController: fixed NPEs, and change getQrCode() to doQrCode() so it's invoked only when the template asks for it.
2011-05-24 19:00:30 +00:00
anupsawant
ab2bfcdeb8
updated from trunk
2011-05-24 18:46:54 +00:00
anupsawant
8b6cc3e5b0
2011-05-24 18:30:10 +00:00
ryounes
c15bdb8f3d
NIHVIVO-2460 Solr-based RDF generation on individual list page
2011-05-24 15:09:54 +00:00
anupsawant
2d0ee79e34
merged from trunk version
2011-05-23 14:03:24 +00:00
stellamit
f355754216
NIHVIVO-2493 updating version number to 1.3 in ontology file names
2011-05-20 20:57:58 +00:00
stellamit
4a211d9975
starting setting up files for NIHVIVO-2426 (knowledge base migration)
2011-05-20 20:38:04 +00:00
stellamit
22ab56f42d
disabling knowledge base update during development of migration task for 1.3
2011-05-20 20:00:48 +00:00
anupsawant
6150e68542
made changes to web.xml to comment out pagesearchcontroller and to use solrpagesearchcontroller
2011-05-20 19:02:34 +00:00
j2blake
791bc52560
Tweak the output of the load test result-merge utility
2011-05-20 16:09:14 +00:00
anupsawant
99e674c334
Fri 11 AM merged with latest copy of trunk
2011-05-20 15:00:06 +00:00
anupsawant
a29a0536d6
Thu 5:11 PM commit after resolving conflicts after merge from trunk
2011-05-19 21:12:24 +00:00
mbarbier
5c22e19580
TestFileController.java: Added some comments
2011-05-19 20:18:03 +00:00
tankchintan
e564857261
1. Initial integration of maop of science front-end with the backend.
2011-05-19 19:03:35 +00:00
stellamit
619a906e42
the hasRole/roleOf properties to go with editor role and reviewer role
2011-05-19 15:37:23 +00:00
stellamit
00e6d212f0
updates for VIVOONT-384(editor and reviewer role linking to information resource) and VIVOONT-400 (turn on offer create for eligible for and turn off offer select for dateTimeValue and subproperties)
2011-05-19 15:18:55 +00:00
kongchinhua
e6ea91b8be
First check in of map of science visualization
2011-05-19 15:16:56 +00:00
ryounes
c365f9a39a
NIHVIVO-2460 Initial setup for migrating IndividualListController to Solr
2011-05-18 22:47:15 +00:00
tankchintan
43a391a0ae
1. Added download file in csv format for map of science info.
2011-05-18 22:02:00 +00:00
j2blake
2ab43d907a
NIHVIVO-2279 Add more functions to the UserAccount controller.
2011-05-18 21:47:39 +00:00
tankchintan
69311ae53f
1. Addition of new scimaps vis related jar file.
...
2. COmpleted the task of providing subdiscipline activity for an entity & other metadata to the front-end in the json format.
3/ Minor refactor of utility functions.
2011-05-18 19:58:40 +00:00
deepakkoni
1d0b7f4fbb
updating the branch dev-search_relevance(r2947) with changes from the trunk(r2837).
2011-05-18 18:28:01 +00:00
stellamit
42d4a2ae86
updates for VIVOONT-266, VIVOONT-389, VIVOONT-355 and VIVOONT-397
2011-05-18 17:44:25 +00:00
mbarbier
09daaa58ac
testfile.ftl and TestFileController.java: modifications for calling a script instead of directly calling Harvester
2011-05-17 20:57:54 +00:00
j2blake
bcdc7ee981
VIVO-304 clean up old login-related files.
2011-05-17 18:11:31 +00:00
j2blake
da42c915c6
NIHVIVO-2299 Remove old unused identifier factories: SelfEditing2RoleIdentifierFactory and UserToIndIdentifierFactory
2011-05-13 16:30:39 +00:00
tankchintan
ddae764181
1. Testing new svn credentials.
2011-05-13 14:07:52 +00:00
cdtank
0e3ccec947
1. Improved the json response structure for the scimaps vis.
2011-05-12 22:19:58 +00:00
ryounes
f4d89253a8
NIHVIVO-2458, NIHVIVO-2459 Add commented-out servlet definitions of new solr-based servlets for autocomplete and json data services.
2011-05-12 21:36:28 +00:00
cdtank
f0cae04b19
1. Fix for misbehaving VOs for science maps vis.
2011-05-12 21:28:47 +00:00