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

1910 commits

Author SHA1 Message Date
tworrall
4d5a567e36 VIVO-285: visualization updates for ISF 2013-09-30 09:29:19 -04:00
brianjlowe
4202f30ea7 VIVO-237 changed "attach to TBox" function to "attach snapshot to ontology" using in-memory copies so older ingest examples should still work while avoiding a performance hit. 2013-09-27 17:05:41 -04:00
tworrall
4179900ea4 VIVO-112: and the slog continues... 2013-09-25 17:09:41 -04:00
tworrall
e364911795 VIVO-289: fixed capitalization issues 2013-09-24 14:58:20 -04:00
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
tworrall
f76ee886d5 VIVO-112 2013-09-23 08:58:24 -04:00
brianjlowe
500bb456c3 changing behavior of reasoning wrt migration 2013-09-20 15:41:45 -04:00
tworrall
7ad1ac635f VIVO-300: some i18n cleanup 2013-09-19 10:22:48 -04:00
tworrall
3d81c5e1bb VIVO-300: some i18n cleanup 2013-09-19 09:53:16 -04:00
tworrall
9cff04ce95 VIVO-296 autocomplete on concepts will no longer include subclasses such as Award 2013-09-18 17:03:09 -04:00
tworrall
e739a94222 VIVO-112: ISF changes relating to vcard classes 2013-09-18 11:34:32 -04:00
j2blake
4b647b3d88 VIVO-293 Create language strings for search error messages. 2013-09-13 14:23:17 -04:00
j2blake
68a22fa349 VIVO-292 remove extra spaces 2013-09-13 14:06:27 -04:00
j2blake
d52b939743 Fix typo error from fc9ac52 2013-09-11 10:01:30 -04:00
brianjlowe
6570e3dcc6 merging develop into dev-isf 2013-09-10 09:08:55 -04:00
j2blake
f129f727a7 VIVO-262 Add languages to VIVO at build time. 
Move the language-specific files out of the default build area. Add a build property that will cause the selected language(s) to be copied into the build area.
 2013-09-09 12:23:54 -04:00
hudajkhan
8e0bf8c229 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-09-05 15:46:45 -04:00
hudajkhan
fc9ac52786 updates for multiple language labels and concept semantic types 2013-09-05 15:44:54 -04:00
tworrall
c478748abf fixed an i18n typo 2013-09-04 14:53:37 -04:00
hudajkhan
b8e114c4e8 url encoding the subject uri to allow for correct redirects later 2013-09-04 13:26:01 -04:00
hudajkhan
9ec7d11cab label management and concept semantic type 2013-09-04 12:22:46 -04:00
hudajkhan
3314e5a4b0 updates for label management 2013-09-03 15:34:02 -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
19cf28da88 Fixing type with Sparql Update page permissions. VIVO-101 VIVO-63 2013-08-22 16:41:04 -04:00
j2blake
9d1fef76ea VIVO-258 Add a "selected" flag to each Freemarker locale variable. 2013-08-22 10:56:49 -04:00
Brian Caruso
e6c2596a35 Changing PageController to use permissions on pages. VIVO-63 Adding Permissions to display model. 2013-08-21 16:03:53 -04:00
Brian Caruso
7a431478cb Adding authorization to SparqlUpdate, changing name of SparqlUpdateTestDataGetter to SparqlUpdate. Adding AND to Actions 2013-08-21 13:01:13 -04:00
j2blake
f2312a4067 VIVO-248 Move more RDF files into the home directory 
Files for initializing the display, displayTbox and displayDisplay models. Also restructure the RDFFilesLoader.
 2013-08-21 11:27:29 -04:00
j2blake
2c5ce8c5ce VIVO-248 Move filegraph RDF files into the home directory 2013-08-20 15:25:57 -04:00
Brian Caruso
e6a7ad34d3 merging develop to issue-vivo-101-sparqlupdate 2013-08-19 16:21:16 -04:00
j2blake
3f061da006 VIVO-246 Re-implement the FreemarkerConfiguration 
The Configuration must contain mutable information like the theme directory and the TemplateLoader. It must also be request-specific so it can have the correct Locale for language support. But we should only have one instance, so there is only one TemplateCache (alternatively, one TemplateCache per theme).

Previously, this was addressed by intercepting the Template processing and adding the request-based info to the Environment. However, this interception code needed to appear each time a Template was processed. This was sometimes overlooked, and at best introduced a bunch of duplicated code.

Instead, I extended the freemarker Configuration class to include a ThreadLocal that holds request-specific information.
 2013-08-08 13:22:16 -04:00
tworrall
98bb7236d1 replaced reference to the sirceforge wiki with a reference to the duraspace wiki 2013-08-06 14:31:26 -04:00
tworrall
37142c0231 VIVO-208: all fields now displayed when custom forms are rendered; customized 2-stage forms will still work as before 2013-08-05 15:12:24 -04:00
Brian Caruso
6a3e6f4f5b Merge branch 'develop' into issue-vivo-101-sparqlupdate 2013-07-31 13:53:39 -04:00
Brian Caruso
463453111d Adding proof of concept SPARQL update VIVO-101 2013-07-19 13:49:02 -04:00
tworrall
46ae630e95 VIVO-215: fix layout of search results page - the first search result was appearing up in the header as were the facets; standardize look of the download popup. Also ensure that longer headings that include types from the facet wrap to new line rather than overrun the search help link. 2013-07-18 16:56:56 -04:00
j2blake
345f99790f VIVO-212 Rename WADF access methods on VitroRequest 
Overlooked a reference in a JSP
 2013-07-18 15:31:42 -04:00
Brian Caruso
54f79f2ea7 Normalize line endings VIVO-101 2013-07-18 15:19:53 -04:00
tworrall
614d338257 moving some i18n() strings from vivo (wilma theme) to vitro 2013-07-17 15:52:17 -04:00
Brian Caruso
7620e43209 Merge branch 'develop' of github.com:vivo-project/Vitro into develop 2013-07-17 15:03:38 -04:00
Brian Caruso
38e6146390 Fixing RDF edit on session experation. VIVO-186 2013-07-17 15:03:28 -04:00
j2blake
8f336b3505 VIVO-213 smoke test to check JVM temp directory 
If it isn't set, if it isn't a directory, if we can't access it, if we can't create a temp file, complain.
 2013-07-17 13:01:08 -04:00
Brian Caruso
fb46e64725 Adding login via email/password parameters 2013-07-16 12:28:24 -04:00
Brian Caruso
7905b80df4 Adding initial search web service for updating uris. VIVO-98 2013-07-15 14:14:15 -04:00
Jim Blake
6641725042 Merge pull request #4 from vivo-project/feature/search-download 
Feature/search download
 2013-06-28 12:15:12 -07:00
tworrall
a56a80074d removing some unused image files 2013-06-25 15:52:36 -04:00
tworrall
aa9be9469c removed a superfluous <h4> tag to fix the Ontology List link 2013-06-24 10:46:01 -04:00
Stephen V. Williams
315894cc30 Update pagedResults - cleaned up bad merge results 2013-06-17 10:44:49 -05:00