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

2963 commits

Author SHA1 Message Date
brianjlowe
b5b39638a1 initial work on VIVO-60 
Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop

Conflicts:
	webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java
 2013-05-14 16:04:40 -04:00
brianjlowe
1ab53d0b02 initial work on VIVO-60 application ontology support for property/range combinations 2013-05-14 15:54:03 -04:00
j2blake
6d7f8e05c8 VIVO-84 Use language filtering on the display model 
This doesn't answer the questions:
1) How do we edit new pages or existing pages?
2) What is the generalized procedure for adding another language?
 2013-05-09 12:24:01 -04:00
j2blake
1b890a3767 NIHVIVO-3993 Get rid of NavigationController 
Written for release 1.1, but never was used.
 2013-05-07 16:11:44 -04:00
j2blake
c7b104ca40 Cleanup: remove unused imports and unneeded casts. 2013-05-07 13:27:44 -04:00
j2blake
a314892277 Language file not found should be debug, not info. 2013-05-06 10:21:19 -04:00
tworrall
257f0c4c08 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-05-02 12:32:31 -04:00
tworrall
1ca0904911 changes for the home page redesign 2013-04-30 14:47:31 -04:00
j2blake
8f1f084c5b Proof of concept - User accounts 2013-04-26 23:58:50 -04:00
j2blake
bf2ed5c339 Proof of concept - Image upload 2013-04-26 23:50:17 -04:00
j2blake
96336cfbfd Improve debug statements 2013-04-23 17:28:46 -04:00
j2blake
a0e7d70fd3 VIVO-12 Permit multi-language support in E-mails to users 
The Freemarker environment must have the request as a special attribute, so the I18nBundle can find the preferred languages.
 2013-04-23 17:18:39 -04:00
tworrall
556af80432 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-04-22 15:09:47 -04:00
tworrall
e7a04ae09b changes relating to issues raised by Scripps: author ordering and label editing 2013-04-22 15:09:07 -04:00
j2blake
df1839cea5 Fix the comment 2013-04-22 15:00:25 -04:00
j2blake
91f0935109 Security fix for release 1.5.2 
Secure the DeletePageController. It was accessible to anyone who knew the link.
 2013-04-15 12:23:14 -04:00
Brian Caruso
f243511526 Merge branch 'develop' of github.com:vivo-project/Vitro into develop 2013-03-18 13:59:13 -04:00
brianjlowe
811de3ec9f VIVO-33 fix to allow RDB models to be uploaded to via ingest tools 2013-03-11 17:08:07 -04:00
Brian Caruso
08f583e280 Merge remote-tracking branch 'origin' into develop 2013-03-05 17:15:58 -05:00
brianjlowe
0bb9d09815 modifications to SPARQL queries to allow data to be in the unnamed graph 2013-02-12 16:40:30 -05:00
j2blake
d2d20291b9 VIVO-12 NIHVIVO-4011 Improve LocaleSelectionFilter. Clean up comments. 2013-02-07 16:06:49 -05:00
j2blake
78488f194c Revise the language filtering from RDF. Create unit tests. 2013-02-07 15:37:58 -05:00
David Cliff
3acefc7151 Fix for HashMap out of order bug raised by Rohan Mathure 2013-02-04 13:16:26 -05:00
tworrall
589cc245a6 multiple updates and new files to support multiple foaf person profile pages 2013-01-31 11:14:28 -05:00
j2blake
b6bab121c5 VIVO-12 NIHVIVO-4011 Read properties files as UTF-8 2013-01-28 11:24:56 -05:00
j2blake
f350c28d24 VIVO-11 Add delimiters to Freemarker templates 
If enabled by an option in runtime.properties
 2013-01-25 16:29:17 -05:00
j2blake
bb6b2fa970 VIVO-12 NIHVIVO-4011 Provide config and GUI for selecting Locale 2013-01-24 16:21:36 -05:00
hudajkhan
1ba6204815 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-01-17 11:55:12 -05:00
hudajkhan
dad9430c2f updates to dynamic fields etc. for search, enable parameter to remove space for dynamic field 2013-01-17 11:53:41 -05:00
j2blake
c2a1195fec VIVO-2 Modify the build so installers can create a container-neutral VIVO. 
Split deploy.properties into build.properties and runtime.properties, with runtime.properties going into the Vitro home directory. Modify ConfigurationProperties to locate the Vitro home directory, either by System property or JNDI Environment variable, or from build.properties, and to read from both build.properties and runtime.properties. Revise the install and upgrade documents for VIVO and Vitro. Change comments and error messages that referred to deploy.properties by name. Change vitro.home.directory to vitro.home
 2013-01-16 14:54:33 -05:00
j2blake
6901a67670 VIVO-10 Add the ability to associate a DataGetter with a Freemarker template. 2013-01-15 12:59:58 -05:00
j2blake
caf16c392b NIHVIVO-4011 Create the I18n framework for multi-language support. 2013-01-09 18:16:37 -05:00
j2blake
885bbabdae Use developer.defeatFreemarkerCache=true 
Previously was Environment.build=development
 2013-01-09 12:59:31 -05:00
hudajkhan
28ce7ce277 For JIRA issue NIHVIVO-4026, checking query model resource is not null before accessing it 2013-01-07 17:35:00 -05:00
hudajkhan
4c4334d6f4 updating edit request dispatch controller to utilize edit configuration generator from session if it exists 2012-12-03 17:10:25 -05:00
hudajkhan
1d880ea29d enable default object property form to calculate range options based on all vclasses for subject 2012-11-29 15:27:48 -05:00
brianjlowe
cd7fe20cac Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 
um, just mergin' in the remote changes before a push?
 2012-11-27 12:59:16 -05:00
brianjlowe
6f2bda9178 added GRAPH-less pattern to type query in IndividualSDB to support triple stores that supply inferences in the unnamed graph 2012-11-27 12:57:13 -05:00
hudajkhan
eea4681c60 Updates to DateTimeValueGenerator to allow it to be extended into subclasses for other predicates 2012-11-16 17:09:21 -05:00
j2blake
81b0b2c145 NIHVIVO-3940 remove the implementation of /individual/prefix/localname 
This has been broken since before release 1.3 and nobody has missed it.
 2012-11-15 14:28:22 -05:00
j2blake
4422fd07b9 NIHVIVO-4017 Get the Application Bean from the context WebappDaoFactory 
Since this was caught by a filter, the request is not likely to have
a WebappDaoFactory in it.
 2012-11-15 12:01:47 -05:00
j2blake
24a5784110 NIHVIVO-4017 Always get the ApplicationBean from the DAO. 
Don't store the ApplicationBean in the request or in the context, and
don't look for it there.
 2012-11-15 11:43:19 -05:00
j2blake
6b743f8b36 Remove intentional error - Jenkins has responded correctly. 2012-11-14 16:33:34 -05:00
j2blake
ccdd37b023 An intention compile-error to break the build 2012-11-14 16:10:54 -05:00
j2blake
e10274aaf7 NIHVIVO-4010 Log requests for invalid file-based URLs as INFO, not WARN. 
When a request comes in like /file/n1645/Ashdown_Susan_1.jpg, and either
there is no such entity, or it is not a FileBytestream, or its name is
different from requested, continue to serve the Missing Link image, but
log the error with an INFO message, not a WARN message.
 2012-11-14 11:25:17 -05:00
j2blake
b0a5961f4d Merge branch 'develop' of git+ssh://github.com/vivo-project/Vitro into develop 2012-11-09 13:24:46 -05:00
hudajkhan
60d9c23118 Updates to enable extensions of DateTimeInterval for Datastar temporal coverage support and adding ajax mechanism for modifying edit configuration 2012-11-08 16:54:31 -05:00
j2blake
fd3111dba1 Delete unused LoginTemplateHelper classes 
LoginTemplateHelper and LoginTemplateHelperBase have been succeeded by
LoginWidget, etc.
 2012-11-02 12:25:35 -04:00
hudajkhan
d192419f1c Update to enable multiple VClasses to be searched 
When searching for individuals beloging to institutional internal class,
the code was only retrieving the first Vclass Id when it needed to
retrieve both the internal class VClassId and the regular classId to
search for individuals that had both types.
 2012-10-31 15:46:15 -04:00
Brian Caruso
8f8e9762f8 Changes to Solr indexing building. 
Added method to SolrSetup to make IndividualToSolrDocument.
Changed ThumbnailImageURL to use RDFServiceFactory.
 2012-10-30 14:52:21 -04:00