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

5328 commits

This branch
This branch
All branches
Author SHA1 Message Date
j2blake
171f47d392 Merge branch 'maint-rel-1.6' of git+ssh://github.com/vivo-project/Vitro into maint-rel-1.6 2013-11-06 11:45:17 -05:00
j2blake
7f67b1b7da VIVO-495 fix bug in query-binding code. 2013-11-06 11:43:33 -05:00
brianjlowe
c2e8541732 fixes bug retrieving property inverses 2013-11-06 11:03:17 -05:00
brianjlowe
9914d3e4b9 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6 2013-11-06 11:02:39 -05:00
brianjlowe
b276cd5049 VIVO-499 fixes bug in deduping applicable properties 2013-11-06 11:02:33 -05:00
j2blake
ef25ee4dd6 Make it easier to monitor the ABoxReasoner thread. 2013-11-06 09:23:43 -05:00
j2blake
2a237f379b VIVO-448 Change the "example_gadgets" file to use gadgets that are currently active. 2013-11-05 17:35:22 -05:00
j2blake
36c1ad6b6a VIVO-448 ORNG was unable to parse our LOD response. 
The date-time stamp on the document itself was not in the correct format.
 2013-11-05 17:24:12 -05:00
brianjlowe
dc58791842 removed a debugging log statement 2013-11-05 15:53:11 -05:00
brianjlowe
447c677c39 VIVO-389 pellet exception 2013-11-05 12:39:45 -05:00
brianjlowe
93d941412f quieting some migration log messages 2013-11-05 10:50:51 -05:00
brianjlowe
328abf20aa Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6 2013-11-05 10:49:16 -05:00
brianjlowe
60a86d94b2 VIVO-421 fixes bug with class drop downs 2013-11-05 10:49:11 -05:00
j2blake
2f78e09765 VIVO-452 Revise SparqlQueryDataGetter to use RDFService if possible. 2013-11-04 15:02:15 -05:00
brianjlowe
f75b1159e5 reenabling sparql constructs that shouldn't have been checked in as disabled 2013-11-04 14:55:57 -05:00
brianjlowe
644bdc42cf Quieting ABoxUpdater log messages 2013-11-04 13:49:12 -05:00
brianjlowe
c27971a36e Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6 2013-11-04 13:33:03 -05:00
brianjlowe
be6bbdea6f VIVO-459 change "show classes with restrictions on this property" to use languageNeutralWebappDaoFactory when finding classes 2013-11-04 13:32:57 -05:00
hudajkhan
cbd65f8639 breaking search portion of page out to include in jsp pages 2013-11-04 11:58:58 -05:00
brianjlowe
878c00027e Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6 2013-11-04 11:29:13 -05:00
brianjlowe
1999537379 enabling display of faux subproperties without visible "parents" 2013-11-04 11:28:59 -05:00
tworrall
01872dfde3 VIVO-435 2013-11-03 17:13:46 -05:00
j2blake
56b8343088 VIVO-452 LoggingRDFService may still require config properties after the main thread has shut down. 2013-11-01 15:39:55 -04:00
tworrall
be4f867f1f Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6 2013-11-01 11:42:07 -04:00
tworrall
8e61b7d874 VIVO-463 2013-11-01 11:41:00 -04:00
hudajkhan
20278bde17 updates to allow individuals with most specific type in dropdown to exclude subject and any objects for object property 2013-11-01 11:23:48 -04:00
hudajkhan
90fc8f7ffa Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6 2013-11-01 10:41:41 -04:00
hudajkhan
9cee22ace9 updates to individual solr field options 2013-11-01 10:41:22 -04:00
j2blake
7022df040b VIVO-428 corrected method calls left over from the first proof of concept. 2013-11-01 10:36:56 -04:00
hudajkhan
03cc412c39 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6 2013-11-01 10:22:21 -04:00
j2blake
999e0c9008 Merge branch 'maint-rel-1.6' of git+ssh://github.com/vivo-project/Vitro into maint-rel-1.6 2013-10-31 16:16:02 -04:00
j2blake
d3a90915a6 VIVO-452 refine the LoggingRDFService. 2013-10-31 16:14:24 -04:00
brianjlowe
dc8324900d Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6 2013-10-31 16:12:23 -04:00
brianjlowe
7f1adbf5a1 VIVO-458 default form property faux property retrieval and change to QueryUtils.java to use RDFService 2013-10-31 16:12:12 -04:00
hudajkhan
cbfb904159 updates for individuals via solr field options 
Conflicts:
	webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaSolrQueryOptions.java
 2013-10-31 15:57:36 -04:00
hudajkhan
6a1c67a81d updates for deletion and setting up method of getting field options for individuals with a certain most specific type 
Conflicts:
	webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaSolrQueryOptions.java
 2013-10-31 15:54:19 -04:00
hudajkhan
11a35739ae Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6 2013-10-31 15:49:31 -04:00
hudajkhan
01374e5502 updates for individuals via solr field options 
Conflicts:
	webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaSolrQueryOptions.java
 2013-10-31 15:48:42 -04:00
hudajkhan
15e0fc0e39 updates for individuals via solr field options 2013-10-31 15:08:58 -04:00
hudajkhan
39d7818ba1 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-10-31 15:08:25 -04:00
j2blake
b821750734 Merge branch 'maint-rel-1.6' into develop 2013-10-31 12:42:29 -04:00
j2blake
3ba960e6ac VIVO-452 First cut at a LoggingRDFService. 
This will add instrumentation to the queries against the RDFService. Developers may enable logging, and optionally may restrict output by class, and may enable stack trace info on logging output.
 2013-10-31 12:41:41 -04:00
brianjlowe
91a9a12688 Merge remote-tracking branch 'origin/maint-rel-1.6' into develop 2013-10-31 11:07:07 -04:00
brianjlowe
754c8004ae Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6 
Conflicts:
	webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java
 2013-10-31 10:45:51 -04:00
brianjlowe
e1b7638202 various performance tweaks 2013-10-31 10:43:25 -04:00
hudajkhan
d82c8940bb updates for deletion and setting up method of getting field options for individuals with a certain most specific type 2013-10-30 16:33:33 -04:00
Brian Caruso
b3a0b4cef8 Removing unused code and fixing NPE in IndividualRequestAnalysisContextImpl.java VIVO-229 2013-10-30 16:24:02 -04:00
j2blake
ccb6e9b21a Merge branch 'maint-rel-1.6' into develop 2013-10-29 17:21:31 -04:00
j2blake
5a8f09352d VIVO-443 Use language-specific templates to create email 
For some reason, the password-reset template was too long to do proper substitution on the last line. Removing some of the intermediate content fixed the problem, but without appropriate content. I had been unhappy with the @@file approach anyway, so I went back to language-specific templates for each type of message.
 2013-10-29 17:19:51 -04:00
j2blake
7a72858f7a Merge branch 'maint-rel-1.6' into develop 2013-10-28 11:59:17 -04:00