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

2987 commits

Author SHA1 Message Date
brianjlowe
d65d4109fa Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-05-22 15:03:54 -04:00
j2blake
4928940849 VIVO-82 Use ModelAccess to store and get WebappDaoFactory references. 2013-05-21 17:46:20 -04:00
j2blake
c086a595e1 VIVO-82 Tweak the uses of ModelAccess to keep backward compatibility. 
Even if it appears to the untrained eye that the models are being misused.
 2013-05-21 17:46:19 -04:00
brianjlowe
067deb48d5 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-05-21 16:19:07 -04:00
tworrall
8e26a768b5 some i18n cleanup 2013-05-21 10:55:24 -04:00
brianjlowe
6464dc9eeb Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-05-21 10:23:12 -04:00
j2blake
dbcc75dc20 Fix so widgets can invoke I18N method. 2013-05-20 13:31:25 -04:00
brianjlowe
707d40e25c Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-05-20 10:03:35 -04:00
j2blake
9a7a385b87 VIVO-82 Use ModelAccess to access the DisplayTBox and the DisplayDisplay 2013-05-17 17:58:14 -04:00
j2blake
864c93432f VIVO-82 Use ModelAccess to get the OntModelSelectors 
Since the OntModelSelectors are facades over the OntModels stored in ModelAccess, remove any attempts to set the OntModelSelectors.
 2013-05-17 17:25:13 -04:00
j2blake
1d8da55fdb VIVO-82 Use ModelAccess to get or set the InferenceOntModel 
a.k.a the Inferred Full model
 2013-05-17 15:05:24 -04:00
brianjlowe
eebb205723 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-05-17 15:03:57 -04:00
brianjlowe
0b2896acc2 application ontology work 2013-05-17 15:03:36 -04:00
j2blake
9b7f6c92e6 VIVO-82 Use ModelAccess to get or set the BaseOntModel 
a.k.a the Base Full model, or AssertionsModel
 2013-05-17 13:19:46 -04:00
j2blake
4e4384bd3e VIVO-82 Use ModelAccess to get or set the JenaOntModel (Union Full model) 2013-05-17 12:28:48 -04:00
j2blake
0a15a6df7d VIVO-82 Use ModelAccess to get or set the JenaOntModel (Union Full model) 2013-05-17 11:41:47 -04:00
j2blake
1c95d4e4a9 VIVO-82 Use ModelAccess to get or set the UserAccounts model 2013-05-16 18:11:13 -04:00
j2blake
4764751905 VIVO-82 Use ModelAccess to get or set the Display Model 2013-05-16 18:05:50 -04:00
j2blake
416e98f5ab VIVO-82 Split WebappDaoSetup into ContentModelSetup and ModelMaker setup. 2013-05-16 16:42:57 -04:00
j2blake
0e34b459e5 VIVO-82 Refactoring WebappDaoSetup to clarify the model setup. 2013-05-16 14:04:04 -04:00
Stephen V. Williams
32395cbac2 Fixed controller for CSV output, added button and coorsponding js and png 2013-05-15 14:53:31 -06:00
Stephen V. Williams
96bed7ce03 first pass at creating a csv download option. TODO icons on page, debug failing load 2013-05-14 14:40:17 -06:00
j2blake
6123f41d95 VIVO-87 First attempt at a caching filter. 
Appears to work with Firefox cache and Chrome cache, except for language-dependent stuff.

Is that because it isn't configured correctly, or is it because Firefox and Chrome aren't attempting to keep more than one version of a page in their caches? Even if they do see a "Vary: Accept-Language" header?
 2013-05-14 16:37:29 -04:00
brianjlowe
ddf101d6ae adding license tag to ApplicationConfigurationOntologyUtils.java 2013-05-14 16:14:32 -04:00
brianjlowe
b5b39638a1 initial work on VIVO-60 
Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop

Conflicts:
	webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java
 2013-05-14 16:04:40 -04:00
brianjlowe
1ab53d0b02 initial work on VIVO-60 application ontology support for property/range combinations 2013-05-14 15:54:03 -04:00
j2blake
6d7f8e05c8 VIVO-84 Use language filtering on the display model 
This doesn't answer the questions:
1) How do we edit new pages or existing pages?
2) What is the generalized procedure for adding another language?
 2013-05-09 12:24:01 -04:00
j2blake
1b890a3767 NIHVIVO-3993 Get rid of NavigationController 
Written for release 1.1, but never was used.
 2013-05-07 16:11:44 -04:00
j2blake
c7b104ca40 Cleanup: remove unused imports and unneeded casts. 2013-05-07 13:27:44 -04:00
j2blake
a314892277 Language file not found should be debug, not info. 2013-05-06 10:21:19 -04:00
tworrall
257f0c4c08 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-05-02 12:32:31 -04:00
tworrall
1ca0904911 changes for the home page redesign 2013-04-30 14:47:31 -04:00
j2blake
8f1f084c5b Proof of concept - User accounts 2013-04-26 23:58:50 -04:00
j2blake
bf2ed5c339 Proof of concept - Image upload 2013-04-26 23:50:17 -04:00
j2blake
96336cfbfd Improve debug statements 2013-04-23 17:28:46 -04:00
j2blake
a0e7d70fd3 VIVO-12 Permit multi-language support in E-mails to users 
The Freemarker environment must have the request as a special attribute, so the I18nBundle can find the preferred languages.
 2013-04-23 17:18:39 -04:00
tworrall
556af80432 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-04-22 15:09:47 -04:00
tworrall
e7a04ae09b changes relating to issues raised by Scripps: author ordering and label editing 2013-04-22 15:09:07 -04:00
j2blake
df1839cea5 Fix the comment 2013-04-22 15:00:25 -04:00
j2blake
91f0935109 Security fix for release 1.5.2 
Secure the DeletePageController. It was accessible to anyone who knew the link.
 2013-04-15 12:23:14 -04:00
Brian Caruso
f243511526 Merge branch 'develop' of github.com:vivo-project/Vitro into develop 2013-03-18 13:59:13 -04:00
brianjlowe
811de3ec9f VIVO-33 fix to allow RDB models to be uploaded to via ingest tools 2013-03-11 17:08:07 -04:00
Brian Caruso
08f583e280 Merge remote-tracking branch 'origin' into develop 2013-03-05 17:15:58 -05:00
brianjlowe
0bb9d09815 modifications to SPARQL queries to allow data to be in the unnamed graph 2013-02-12 16:40:30 -05:00
j2blake
d2d20291b9 VIVO-12 NIHVIVO-4011 Improve LocaleSelectionFilter. Clean up comments. 2013-02-07 16:06:49 -05:00
j2blake
78488f194c Revise the language filtering from RDF. Create unit tests. 2013-02-07 15:37:58 -05:00
David Cliff
3acefc7151 Fix for HashMap out of order bug raised by Rohan Mathure 2013-02-04 13:16:26 -05:00
tworrall
589cc245a6 multiple updates and new files to support multiple foaf person profile pages 2013-01-31 11:14:28 -05:00
j2blake
b6bab121c5 VIVO-12 NIHVIVO-4011 Read properties files as UTF-8 2013-01-28 11:24:56 -05:00
j2blake
f350c28d24 VIVO-11 Add delimiters to Freemarker templates 
If enabled by an option in runtime.properties
 2013-01-25 16:29:17 -05:00