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

5625 commits

This branch
This branch
All branches
Author SHA1 Message Date
j2blake
bf2ed5c339 Proof of concept - Image upload 2013-04-26 23:50:17 -04:00
j2blake
c59076a19a Improve the look of the language selection flags 2013-04-26 23:44: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
86b6555efe Test if the build script is using an old version of Ant or Java 
If not, print out some diagnostic information.
 2013-04-22 11:30:51 -04:00
Manolo Bevia
dc3d3873c8 Made home search and home stats theme agnostics. 2013-04-15 15:15:35 -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
j2blake
efdfaa9c8f directDownloadUrl should appear as a data property in the vitroPublic ontology. 2013-04-15 12:20:48 -04:00
Manolo Bevia
c19df41bfd Added new features for VITRO home page: 
-Filtered search based in class groups (It needs to be wired. Just added HTML/CSS/JS)
-Class group stats (It needs to be wired. Just added HTML/CSS/JS)
-Improveed UX for signing when there is external authorization

Removed search box located in header in homepage.
 2013-04-11 15:09:23 -04:00
j2blake
3997440944 Require Java 7 2013-04-10 17:04:46 -04:00
j2blake
f05d6c9a58 Check that there is a <servlet> for each <servlet-mapping> 2013-04-10 16:31:28 -04:00
j2blake
665a666b7f Remove <servlet-mapping> that have no matching <servlet> 2013-04-10 15:51:03 -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
j2blake
e1f2832fbd VIVO-25 Check that web.xml is container-neutral 
Create an Ant target that checks web.xml against the assembled webapp, looking for conditions that violate the Servlet spec or the JSP spec, but that Tomcat does not complain about. This will not be a main-stream target, but must be specifically invoked by developers or by Jenkins in order to be effective.
 2013-03-11 13:29:20 -04:00
j2blake
ba29b0e69a Reduce the logging level - the test should be silent. 2013-03-08 17:49:08 -05:00
j2blake
c53e53c526 VIVO-2 Fix the URIs of the JSTL taglibs. 2013-03-08 17:48:27 -05:00
Brian Caruso
08f583e280 Merge remote-tracking branch 'origin' into develop 2013-03-05 17:15:58 -05:00
tworrall
7241929be0 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 
I have no idea what just happened.
was behind. doing this merge to correct that so I can push a change.
 2013-02-19 12:22:43 -05:00
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