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

4901 commits

This branch
This branch
All branches
Author SHA1 Message Date
tworrall
41c6c3fe81 correcting tinyMCE init parameter setting 2013-02-19 12:21:18 -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
tworrall
3003fdc346 removed unnecessary variable reference to individualLocalName 2013-02-12 09:52:04 -05:00
tworrall
1f66e0eca4 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 
I have no idea why this is a merge. My develop branch is behind and I want to push changes to git, and this form is what I got.
 2013-02-11 16:15:56 -05:00
tworrall
676ec502ac remove the Microsoft Office tags that get copied into the tinyMCE fields when users paste from a Office document. 2013-02-11 16:14:59 -05:00
tworrall
3e3986172c more refactoring for multiple profile view support 2013-02-08 16:17:41 -05:00
j2blake
d2d20291b9 VIVO-12 NIHVIVO-4011 Improve LocaleSelectionFilter. Clean up comments. 2013-02-07 16:06:49 -05:00
j2blake
e2f30577bd Merge branch 'develop' of git+ssh://github.com/vivo-project/Vitro into develop 
Conflicts:
	webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java
	webapp/test/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFServiceTest.java
 2013-02-07 15:49:56 -05:00
j2blake
78488f194c Revise the language filtering from RDF. Create unit tests. 2013-02-07 15:37:58 -05:00
j2blake
522068edd8 Revise the language filtering from RDF. Create unit tests. 2013-02-07 15:33:04 -05:00
j2blake
866c4435b6 Not ready for Java 1.7 constructs just yet. 2013-02-04 17:38:29 -05:00
j2blake
7c2de3a6f2 Clean up web.xml and create a unit test to keep it clean. 
VIVO-19
 2013-02-04 17:22:29 -05:00
Jim Blake
9bba099882 Merge pull request #2 from dgcliff/develop 
Fix for HashMap out of order bug raised by Rohan Mathure. VIVO-21
 2013-02-04 11:11:16 -08:00
David Cliff
3acefc7151 Fix for HashMap out of order bug raised by Rohan Mathure 2013-02-04 13:16:26 -05:00
tworrall
26ca991f6c added section tags around left-hand content containing the phot wrapper 2013-02-04 12:55:07 -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
Jim Blake
21e9698df2 Merge pull request #1 from drspeedo/develop 
upgrade apache solr from 3.1 to 3.6.2
 2013-01-09 08:05:50 -08:00
Stephen V. Williams
28be94dd16 upgrade apache solr from 3.1 to 3.6.2 2013-01-08 14:02:42 -07: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
1f8a534819 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2012-11-16 17:10:09 -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
1e5d954de4 Add the amplify JavaScript file to known_exceptions 2012-11-16 16:28:54 -05:00
tworrall
11a83c4c1c Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 
I haven't a clue what git is trying to do. I kind of miss svn at this point.
 2012-11-16 16:02:47 -05:00
tworrall
870db77408 Changes to support collapsible/expandable property groups on the profile pages. 2012-11-16 16:00:16 -05:00
tworrall
c9a27d7f11 Changes to support collapsible/expandable property groups on the profile pages. 2012-11-16 15:56:18 -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
d93068bdfa validateUpload.js is no longer used in Vitro, VIVO or vivoCornell 2012-11-13 17:19:45 -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
f26d353b1c Adding EditRequestAJAXController to web.xml 
Also updating .gitignore so .build items don't show up
 2012-11-09 09:49:09 -05:00
hudajkhan
36fc649b7a Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2012-11-08 17:03:27 -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