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

5485 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Caruso
1b07173e7c Adding license 2013-07-10 16:49:01 -04:00
Brian Caruso
be734aa293 adding files that were missed from branch 2013-07-10 15:30:38 -04:00
Brian Caruso
68b916a185 Merge branch 'feature-vivo-57' into develop 2013-07-10 15:03:15 -04:00
Brian Caruso
9d1c7e009e Adding SimplePermission.DO_FRONT_END_EDITING.ACTIONS to DeletePropertyController. VIVO-57 2013-07-10 15:01:39 -04:00
Brian Caruso
5a85337afc removing unused method isGeneratedModelFromField from ProcessRdfForm 2013-07-10 15:00:51 -04:00
Brian Caruso
1b5181e456 moving RdfLiteralHash to different package 2013-07-10 12:50:29 -04:00
Brian Caruso
0eda150d62 Moving static methods from EditN3Utils to N3EditUtils. Removing EditN3Utils 2013-07-10 12:33:43 -04:00
Brian Caruso
9517f88aeb Changed 1.4 and 1.5 in install.txt to 1.6 2013-07-10 11:16:43 -04:00
Brian Caruso
0f20aad323 Changed install.txt to suggest httpd proxy instead of mod_jk VIVO-5 2013-07-10 11:14:00 -04:00
Brian Caruso
0e26d45a31 Removing unused N3EditFormController VIVO-50 2013-07-10 10:07:00 -04:00
Brian Caruso
a31e464a3c SolrQueryTest doesn't work with vivo, setting to @Ignore 2013-07-09 16:55:29 -04:00
Brian Caruso
45baa8633c Removed unused build.xml property. 2013-07-09 11:45:00 -04:00
Brian Caruso
674ca6f774 Adding test of Solr setup and indexing. The SolrSetup test will start a 
solr server, load RDF from test/testontologies/SolrQueryTestRDF, index
the individuals in the RDF and then run some test solr queries.
 2013-07-09 11:41:01 -04:00
Brian Caruso
1d5f53ab78 Adding solr client libraries to test task. 
Removing old version of solrj from lib
Adding new version of solrj to lib
 2013-07-09 11:39:00 -04:00
Brian Caruso
467256e3ba Merge branch 'develop' of github.com:vivo-project/Vitro into develop 2013-07-08 13:52:05 -04:00
Jim Blake
6641725042 Merge pull request #4 from vivo-project/feature/search-download 
Feature/search download
 2013-06-28 12:15:12 -07:00
tworrall
a56a80074d removing some unused image files 2013-06-25 15:52:36 -04:00
brianjlowe
dae9c0c12f improvements to superclass methods in VClassDaoJena to support VIVO-60 2013-06-24 16:47:46 -04:00
tworrall
aa9be9469c removed a superfluous <h4> tag to fix the Ontology List link 2013-06-24 10:46:01 -04:00
brianjlowe
e3fe0ac52b continuing work on VIVO-60 application ontology support for property/class combinations 2013-06-21 16:47:42 -04:00
j2blake
4341d72ec4 VIVO-18 Rename Log4J properties file 2013-06-21 15:39:15 -04:00
j2blake
c29461343a VIVO-140 For the request, wrap additional models in language-aware filters. 2013-06-21 14:52:06 -04:00
j2blake
ebcf6079a5 VIVO-140 Modify client code to get language-aware extract from VClassGroupCache 2013-06-21 14:51:33 -04:00
j2blake
24562b6746 VIVO-140 Modify VClassGroupCache to provide a language-aware extract 
With very little change in the method calls, client code can get the VClasses and VClassGroups with labels that are appropriate for the preferred language in the current request.
 2013-06-21 14:47:29 -04:00
brianjlowe
d2177ab3ce Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-06-20 12:45:14 -04:00
brianjlowe
54f43f56d3 ongoing work on VIVO-60 application ontology support for property/class combinations 2013-06-20 12:43:53 -04:00
j2blake
951e7af9b0 No longer used 2013-06-20 12:18:03 -04:00
j2blake
d977c4d52d Remove unused import statements. 2013-06-20 11:59:27 -04:00
j2blake
a42b4cbe25 VIVO-126 Default WADF on the request must include language filter. 
In this case, the application metadata model was not filtered.
 2013-06-18 14:32:12 -04:00
j2blake
4ee600a0d4 VIVO-80 Default WADF on the request must include language filter. 
In this case, the display model was not filtered.
 2013-06-18 11:32:48 -04:00
Stephen V. Williams
315894cc30 Update pagedResults - cleaned up bad merge results 2013-06-17 10:44:49 -05:00
j2blake
5de5a322a2 VIVO-139 Use the I18n framework wherever DisplayMessage is loaded. 2013-06-14 12:47:37 -04:00
j2blake
aa7c8024d0 VIVO-125 Improvements to I18n 
Do not clear the cache more than once per request. Improve the hooks for unit tests.
 2013-06-14 12:41:33 -04:00
tworrall
d83fcd6fd7 removed duplicate lines 2013-06-14 10:00:02 -04:00
j2blake
9c21ecc575 VIVO-125 Bring all_es.properties up to par with all.properties 2013-06-13 15:16:18 -04:00
brianjlowe
b26922242a work on VIVO-60 application ontology code for class/property combination configuration 2013-06-12 16:57:37 -04:00
tworrall
3ce6a224a3 fix for vivo-127 2013-06-12 16:04:42 -04:00
tworrall
f267df494d changed the way the limit search home page feature works so that it will support i18n 2013-06-12 15:25:36 -04:00
tworrall
b1014d1b2b vivo-66: add a link on menu ordering that returns the user to page management 2013-06-12 10:31:00 -04:00
j2blake
d731166ff4 VIVO-125 Continue to develop the googleSpanish text. 
Bring all_es.properties up to par with all.properties, in both Vitro and VIVO/Wilma
 2013-06-11 16:28:00 -04:00
tworrall
8af9c0005c fix for jira issue vivo-124 2013-06-11 16:15:42 -04:00
tworrall
f3acf5afe6 VIVO-65. for property groups, edit form was incorrect 2013-06-11 13:35:19 -04:00
tworrall
d74176f18d i18n updates to javascript files and related templates 2013-06-11 12:25:01 -04:00
j2blake
57c962e82a VIVO-82 FileServingServlet must use an existing WADF. 
Request-specific WebappDaoFactory objects are not initialized on image requests.
 2013-06-07 16:22:33 -04:00
j2blake
69ab12c4bc VIVO-82 Remove the vestiges of VitroRequestPrep 
Unused imports prevented the compiling of JSPs
 2013-06-07 15:43:22 -04:00
j2blake
b86a34b611 VIVO-73 Check for null Set from ServletContext.getResourcePaths() 2013-06-06 18:09:13 -04:00
j2blake
91277a1715 VIVO-120 VitroRequest.getFullWebappDaoFactory() is poorly named. 
In fact, it returns a reference to the unfilteredWebappDaoFactory, and this was changed (broken) by the work on VIVO-82.
 2013-06-06 17:33:02 -04:00
j2blake
ed95df1637 VIVO-82 Merge the filters that set up VitroRequest models 
VitroRequestPrep and WebappDaoFactorySDBPrep merge to RequestModelsPrep. WebappDaoFactorySparqlPrep goes away.
 2013-06-06 17:28:45 -04:00
j2blake
a19227188b VIVO-120 improve the error messages from OperationUtils.cloneBean() 
Add unit tests for the method and restructure the logic so a failure to create the clone is treated as seriously as a failure to load it with values. Previously  a failure to create resulted in a null return (with a log message) while a failure to load resulted in an exception (with a log message).
 2013-06-05 15:37:05 -04:00
j2blake
9ec06f224e Trivial changes 2013-06-04 14:21:21 -04:00