Commit graph

4813 commits

Author SHA1 Message Date
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
j2blake
fd91aa4580 VIVO-70 Create a DocumentModifier to handle PreferredTitle
Preferred Title is no longer a property. Instead use Title from the VCard.
2013-10-11 15:46:31 -04:00
brianjlowe
c5a849e163 improvements to GroupedPropertyList : using context dao factory to determine applicable data properties, and then using request-specific dao factory to get language-correct versions of properties when editing 2013-10-11 14:57:24 -04:00
tworrall
da1ea283ba VIVO-313: vcards for organizations 2013-10-11 14:35:50 -04:00
tworrall
75603a25a1 VIVO-337: css change to prevent cutoff 2013-10-10 16:29:24 -04:00
tworrall
30b0844a1d VIVO-341: new custom form et all for preferred title 2013-10-10 14:53:01 -04:00
tworrall
aa72757cb8 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-10-10 14:51:45 -04:00
hudajkhan
51cdc922a2 adding ability to specify page permissions through page management 2013-10-10 14:24:54 -04:00
tworrall
bcdacf916c fixed i18n string error 2013-10-10 10:17:06 -04:00
j2blake
c9248b1f81 VIVO-333 External-auth login button should be language-sensitive.
Don't specify the text in the runtime.properties. Instead, get it from all.properties. Show the button if externalAuth.netIdHeaderName is specified.
2013-10-09 16:38:14 -04:00
brianjlowe
2417555e1c VIVO-326 collate by subclass for qualified properties 2013-10-09 14:28:18 -04:00
j2blake
5994979ebd VIVO-339 build script must provide multi-language support on Windows 2013-10-09 13:06:56 -04:00
hudajkhan
781c5105f1 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-10-09 12:52:26 -04:00
hudajkhan
2109c70f87 update to check if uri valid property uri before checking it exists as property 2013-10-09 12:52:05 -04:00
j2blake
2bf1498c0b Remove special characters from the test.
We are testing URL encoding and decoding, but the special characters can be expressed as Unicode (e.g., \u9999), so the file does not need to be stored as UTF-8 or equivalent.
2013-10-08 16:23:58 -04:00
j2blake
eee9d5ab97 minor cleanup 2013-10-08 16:22:37 -04:00
j2blake
7cccf19e45 VIVO-297 Use /display form of URLs on pages, not /individual form.
Individuals that don't belong to the default namespace still use the /individual form.
2013-10-08 16:22:21 -04:00
j2blake
b94cd7950d VIVO-301 make search facets language-sensitive
The search facets come from the VClassGroupCache which stores the English labels. Added a VClassGroupsForRequest object to supply language-specific names.
2013-10-08 14:54:56 -04:00
brianjlowe
e2c48e65f9 VIVO-303 picklist sorting 2013-10-08 14:33:38 -04:00
brianjlowe
946c40a13e Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-10-08 14:33:10 -04:00
hudajkhan
75e09ad3d4 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-10-08 12:35:04 -04:00
tworrall
cab112092d VIVO-331 updated css to accomodate longer text strings 2013-10-08 12:25:37 -04:00
tworrall
d89b5cfab5 VIVO-332 2013-10-08 11:38:31 -04:00
j2blake
593b01da24 VIVO-320 Fix error: models were reversed. 2013-10-08 10:41:54 -04:00
j2blake
542d1cfbdd VIVO-291 ant clean will delete the ref files in the Vitro home directory 2013-10-08 10:39:11 -04:00
brianjlowe
32be076e29 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-10-08 09:41:02 -04:00
brianjlowe
5293824fa2 work on VIVO-303 picklist sorting and display 2013-10-08 09:40:57 -04:00
hudajkhan
6be63135d4 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop
Conflicts:
	webapp/rdf/display/everytime/pageList.n3
2013-10-07 17:34:19 -04:00
hudajkhan
7c3c8f6c4e bugs in n3 files and manage labels logic when there are no labels (e.g. on individual page profile) 2013-10-07 17:26:34 -04:00
tworrall
6ba8de8a9d fixed additional uris for context node tests 2013-10-07 15:48:22 -04:00
j2blake
5dfe858a25 Fix typos in n3 files 2013-10-07 15:34:05 -04:00
j2blake
6dc8094827 VIVO-317 Provide an un-language-filtered WebappDaoFactory
Store it in VitroRequest. See that it matches the model-switching of the usual WebappDaoFactory.
2013-10-07 15:17:43 -04:00
tworrall
0837552f6e updated sparql queries to use new ISF properties 2013-10-07 11:37:06 -04:00
j2blake
967278217f VIVO-93 If they are using old Java, show ant.java.version 2013-10-04 16:04:57 -04:00
j2blake
8d34a16722 Merge branch 'develop' of git+ssh://github.com/vivo-project/Vitro into develop 2013-10-04 16:03:16 -04:00