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

6006 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
87fd9d9260 Merge branch 'maint-rel-1.6' into develop 2013-11-01 11:41:34 -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
j2blake
02525c7d6b VIVO-396 Obtain preferred title from VCard 2013-10-28 11:58:45 -04:00
j2blake
42a8ba4476 Merge branch 'maint-rel-1.6' into develop 2013-10-26 18:03:30 -04:00
j2blake
2026a40943 VIVO-268 Restore data values to DataProperty RequestedAction classes. 2013-10-26 18:02:29 -04:00
j2blake
a9fd7c3f6d Merge branch 'maint-rel-1.6' into develop 2013-10-25 17:52:03 -04:00
j2blake
8419ce184a VIVO-396 Refactoring JsonServlet and IndividualListController 
VIVO-dependent code must be isolated from the Vitro classes, and these classes must be disentangled first. At least some.
 2013-10-25 17:51:17 -04:00
tworrall
b4d90d4081 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6 2013-10-24 17:23:29 -04:00
tworrall
c95338c7ac Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 
git sucks sometimes!
 2013-10-24 17:22:19 -04:00
tworrall
f7cdf5907b Merge branch 'maint-rel-1.6' into develop 2013-10-24 17:21:29 -04:00
tworrall
efc35eea75 changes for VIVO-408 2013-10-24 17:21:13 -04:00
j2blake
4183a53be8 Merge branch 'maint-rel-1.6' into develop 2013-10-24 11:58:21 -04:00
j2blake
42dc5d477f VIVO-381 Adjust installation doc. Ant all comes before runtime.properties. 2013-10-24 11:57:29 -04:00
j2blake
46d52c2f3c Merge branch 'maint-rel-1.6' into develop 2013-10-24 11:04:28 -04:00
j2blake
b95b21299e VIVO-380 Check that Tomcat exists before trying to deploy to it. 2013-10-24 11:03:50 -04:00
tworrall
0a26bf254c Merge branch 'maint-rel-1.6' into develop 2013-10-23 13:12:06 -04:00
tworrall
4ce41fb6ed VIVO-397 2013-10-23 13:11:46 -04:00
j2blake
506d964172 Merge branch 'maint-rel-1.6' into develop 2013-10-23 09:58:58 -04:00
j2blake
3c89678522 Line-end characters 2013-10-23 09:58:15 -04:00
j2blake
876f1d65db VIVO-383 don't list every file graph at startup. 
Also, use shorter, relative paths when listing RDF files loaded.
 2013-10-23 09:51:20 -04:00
j2blake
8cba00a0c7 Line-end characters 2013-10-23 09:41:21 -04:00
hudajkhan
271c1e9063 updates for cancel link to accept parameter vivo-393 2013-10-22 14:11:11 -04:00
j2blake
9f9e833253 VIVO-377 Remove "classLocalName" from the search index. 
Brian Caruso and I could not find any place where it was being used.
 2013-10-17 15:10:36 -04:00
j2blake
8d1edc7bd2 Bring "Spanish" files up to date with English. 2013-10-17 12:39:27 -04:00