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

568 commits

Author SHA1 Message Date
brianjlowe
90512bdc1c Merge remote-tracking branch 'origin/develop' into dev-isf 
Conflicts:
	webapp/rdf/displayDisplay/everytime/displayDisplay.n3
	webapp/web/i18n/all.properties
	webapp/web/templates/freemarker/lib/lib-properties.ftl
 2013-09-23 16:19:05 -04:00
hudajkhan
d5c1cc49c6 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-09-16 14:08:34 -04:00
hudajkhan
8fa8702462 updates to include method that checks whether uri exists or not 2013-09-16 14:07:52 -04:00
brianjlowe
73d54999d4 VIVO-151 remedies missing inverse property inference deletions 2013-09-13 15:01:57 -04:00
j2blake
48c8c5924a VIVO-293 Create language strings for search error messages. 2013-09-13 14:46:15 -04:00
brianjlowe
2d3295fa2b Merge commit 'afa5e8697aae74217538d4a1d65043e82d5b57f9' into dev-isf 2013-09-10 09:08:14 -04:00
j2blake
66078a71ab Add license line 2013-09-09 13:34:39 -04:00
brianjlowe
a520878b1d Merge commit 'f129f727a738c4af602b06be48c71bd549196e9e' into dev-isf 2013-09-09 12:55:10 -04:00
Brian Caruso
7d01b546a9 Adding ability to edit sameAs from profile page VIVO-111 2013-09-05 12:53:30 -04:00
brianjlowe
e3399d161d display permissions for domain-qualified predicates 2013-09-04 11:56:17 -04:00
brianjlowe
ca32a51740 support for edit permissions for qualified properties (almost finished) 2013-08-30 17:04:12 -04:00
Brian Caruso
7129912e43 Adding unit tests, adding easymock library, Fixed problem with URIs with localnames that start with a digit. VIVO-13 2013-08-30 14:19:13 -04:00
Brian Caruso
fd8dcf6dff fixing compile problem. issue-vivo-110 2013-08-29 14:56:20 -04:00
Brian Caruso
446df7c094 Adding more tests of SimpleReasoner with sameAs disabled. VIVO-110 2013-08-29 13:14:15 -04:00
brianjlowe
e3d6e37ab9 support for domain qualification in property config 2013-08-29 10:58:34 -04:00
Brian Caruso
05917378cc Adding ability to disable sameAs in SimpleReasoner. VIVO-110 2013-08-28 17:25:09 -04:00
Brian Caruso
314a4e638b Adding license text to new files 2013-08-28 14:08:05 -04:00
Brian Caruso
4c42128993 Merging with issue-vivo-101-sparqlupdate. Using develop licenser files that were in conflict. VIVO-255 VIVO-101 2013-08-28 11:37:50 -04:00
j2blake
d69bb824ac VIVO-274 move permission_config.n3 to rdf/auth/everytime 
Get rid of the PermissionSetsLoader, keep the smoke tests.
 2013-08-27 17:26:24 -04:00
Brian Caruso
50945d5af1 Adding JSON-LD to SPARQL form. Adding jsonld-java libraries. VIVO-255 2013-08-27 15:10:34 -04:00
Brian Caruso
45510fefca Changing Actions to remove OR support. Adding OR support to PolicyList VIVO-101 VIVO-63 2013-08-22 15:03:27 -04:00
Brian Caruso
f5161e14b7 Removing PageDataGetters and its related servlets and tests. VIVO-218 2013-08-05 12:41:15 -04:00
j2blake
1b1c28f216 VIVO-235 Reduce "deprecation" messages in the build 
The @SuppressWarnings("deprecation") annotation doesn't apply to an import statement, but it does apply if the class is fully-qualified when created.
 2013-08-01 16:07:55 -04:00
j2blake
c75c0d0f9f VIVO-235 Reduce "deprecation" messages in the build 
It's OK for these stub classes to implement deprecated methods in the interfaces, as long as they declare those methods with @Override and @Deprecated.
 2013-08-01 16:06:59 -04:00
j2blake
036d20b892 VIVO-227 Remove warning message from JsonServletTest 2013-08-01 15:24:33 -04:00
Brian Caruso
54f79f2ea7 Normalize line endings VIVO-101 2013-07-18 15:19:53 -04:00
Brian Caruso
e3b57fd0b6 Improved the option sorting code in IndividualTypeRetryController VIVO-154 2013-07-17 11:52:42 -04:00
Brian Caruso
926d154bce Added test to UrlBuilderTest for utf8 VIVO-168 2013-07-16 17:27:52 -04:00
Brian Caruso
7905b80df4 Adding initial search web service for updating uris. VIVO-98 2013-07-15 14:14:15 -04:00
Brian Caruso
1b07173e7c Adding license 2013-07-10 16:49:01 -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
a31e464a3c SolrQueryTest doesn't work with vivo, setting to @Ignore 2013-07-09 16:55:29 -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
467256e3ba Merge branch 'develop' of github.com:vivo-project/Vitro into develop 2013-07-08 13:52:05 -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
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
brianjlowe
b26922242a work on VIVO-60 application ontology code for class/property combination configuration 2013-06-12 16:57:37 -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
4928940849 VIVO-82 Use ModelAccess to store and get WebappDaoFactory references. 2013-05-21 17:46:20 -04:00
brianjlowe
1ab53d0b02 initial work on VIVO-60 application ontology support for property/range combinations 2013-05-14 15:54: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
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
Brian Caruso
08f583e280 Merge remote-tracking branch 'origin' into develop 2013-03-05 17:15:58 -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
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