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

4997 commits

Author SHA1 Message Date
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
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
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
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
02525c7d6b VIVO-396 Obtain preferred title from VCard 2013-10-28 11:58:45 -04:00
j2blake
2026a40943 VIVO-268 Restore data values to DataProperty RequestedAction classes. 2013-10-26 18:02:29 -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
efc35eea75 changes for VIVO-408 2013-10-24 17:21:13 -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
4ce41fb6ed VIVO-397 2013-10-23 13:11:46 -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
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
brianjlowe
65c913578b property labeling consistency in hierarchy and list displays 2013-10-17 10:43:53 -04:00
brianjlowe
7e20ef9e6e sorting checkboxes on property edit pages 2013-10-17 09:53:03 -04:00
brianjlowe
c201e7389f correcting typo in log message 2013-10-17 09:14:16 -04:00
j2blake
9f928d930f VIVO-364 Include build.properties in ConfigurationProperties 
The language-setup smoke tests assumed that we had access to build.properties.
 2013-10-16 17:21:41 -04:00
brianjlowe
63d9466674 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-10-16 16:17:31 -04:00
brianjlowe
bdaa8393ae Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-10-16 16:16:39 -04:00
j2blake
ed39756a19 VIVO-374 Unpack Literals properly for the search index. 2013-10-16 16:16:34 -04:00
brianjlowe
a2451984c2 VIVO-376 picklist sorting 2013-10-16 16:16:34 -04:00
tworrall
4e851d0c35 VIVO-372: check the domainUri to correctly display the manage icon 2013-10-16 15:53:44 -04:00
j2blake
8be60063e0 VIVO-364 Test for various language-setup problems. 2013-10-16 15:35:06 -04:00
j2blake
011594c7fc VIVO-371 RDF link should be based on /individual, not /display 
Removing Tim's "quick fix" in the template and fixing it in the TemplateModel.
 2013-10-16 14:29:20 -04:00
brianjlowe
8c438872dc changing temporary namespace 2013-10-16 14:11:53 -04:00
hudajkhan
b71316786f fix middle name property to be vivocore off subject 2013-10-16 12:58:40 -04:00
brianjlowe
4447fc3d63 sorting related classes on vclass edit page 2013-10-16 09:46:58 -04:00
brianjlowe
f8ab3d1016 improvement to annotation migration 2013-10-16 09:05:45 -04:00
j2blake
9901d50010 VIVO-350 Fix the ThumbnailURL query so we only get the desired result. 2013-10-15 17:27:39 -04:00
Brian Caruso
08dab8e52f Merge branch 'develop' of github.com:vivo-project/Vitro into develop 2013-10-15 16:08:49 -04:00
tworrall
5aa1d10028 VIVO-367 2013-10-15 16:04:14 -04:00
brianjlowe
1b0185758c Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-10-15 15:48:30 -04:00
brianjlowe
cd28028fb3 VIVO-366 change to annotation-to-PropertyConfig converter to deal with multiple values 2013-10-15 15:48:25 -04:00
j2blake
7fc2f07a77 Get language-correct labels whether editing or not. 2013-10-15 15:43:23 -04:00
j2blake
3b6d65176d VIVO-363 Write the exception to the log, first thing. 2013-10-15 12:59:57 -04:00
tworrall
dfc3163ac1 js file needed to reference jQuery instead of just $ 2013-10-15 10:27:31 -04:00
tworrall
e33070b3a8 VIVO-359 and VIVO-345 2013-10-14 16:29:01 -04:00
hudajkhan
2da5324c1a Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-10-14 15:47:10 -04:00
hudajkhan
29f41f61c7 adding solr data getter and some other changes 2013-10-14 15:46:47 -04:00
brianjlowe
9e09da9871 various migration improvements 2013-10-14 15:28:59 -04:00
brianjlowe
06bdb86f8a fixes bug in display hiding for qualified properties 2013-10-14 11:49:21 -04:00
Brian Caruso
0898330247 This adds content negotiation test and simplifies the use of vivo as a 
sparql endpoint.

Modify the servlet at auth/sparqlquery to accept the additional parameters:
email - email/username of a vivo login account
password - the clear text password for the account associated with the
email

Merge branch 'feature/content-negotiation-tests' into develop

Fixed as part of VIVO-355

Conflicts(related to line endings):
	webapp/config/example.runtime.properties
 2013-10-14 10:16:01 -04:00
Brian Caruso
26927d8ff4 Line ending for example file. 2013-10-14 10:09:53 -04:00
brianjlowe
ea0822600b preventing the inference recompute from being triggered by empty file graphs 2013-10-11 16:03:55 -04:00