Commit graph

5440 commits

Author SHA1 Message Date
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
j2blake
c77a9786d1 VIVO-295 Fix the unit test.
I broke it by supporting application/json
2013-10-04 16:03:00 -04:00
hudajkhan
ea01cd7b39 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-10-04 15:42:26 -04:00
hudajkhan
16ea16b9e7 updates for page management and property deletion and seeing individual page when model is switched 2013-10-04 15:40:55 -04:00
j2blake
d6094eeb50 VIVO-295 Added a metadata section to LOD results.
Includes date and rights, among other things. While we're at it, support LOD requests with /n123/n123.jsonld
2013-10-04 15:37:17 -04:00
brianjlowe
d546a5ace3 VIVO-323 fixes SQLException adding class groups and property groups 2013-10-04 15:02:46 -04:00
brianjlowe
3a5fa4c551 various minor improvements 2013-10-04 14:27:52 -04:00
brianjlowe
aad1f023cc disabling knowledge base migration in plain vitro 2013-10-04 14:27:32 -04:00
j2blake
a4d007e05c VIVO-281 Fix a bug in the display filter. 2013-10-04 10:56:06 -04:00
Brian Caruso
bb6a256be3 Improving error messages from ContextNodeFields and PagedSearchController 2013-10-03 16:14:54 -04:00
hudajkhan
8eaba019a6 Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-10-03 12:48:19 -04:00
hudajkhan
c1c1f18750 remove duplicate license line 2013-10-03 12:46:59 -04:00
j2blake
bbae772a6a Make startup log messages more compact 2013-10-03 11:53:08 -04:00
j2blake
2fe7c30ef0 VIVO-308 Revise SelfEditorRelationshipPolicy to fit the ISF
Change the RelationshipChecker classes, and update the unit tests.
2013-10-03 11:52:25 -04:00
hudajkhan
4b0961b074 removing second license line 2013-10-02 15:20:35 -04:00
hudajkhan
61b0f5d9ea Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-10-02 14:58:15 -04:00
hudajkhan
3e5c770506 updates for page management security, labels 2013-10-02 14:58:01 -04:00
tworrall
d92adb7d71 VIVO-112: and the beat goes on... 2013-10-01 16:46:59 -04:00
j2blake
dc3fa33402 VIVO-305 Look in the full model for the matching property.
Looking in the abox means only looking in kb-2 and its sub-models (filegraphs). Looking in the full model means abox and tbox and all named graphs.
2013-10-01 15:52:21 -04:00
hudajkhan
8d520895ac Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop 2013-10-01 11:24:30 -04:00
hudajkhan
9fae5d7c3e updates for label management 2013-10-01 11:24:15 -04:00
brianjlowe
1db72b3397 various small fixes 2013-10-01 10:21:08 -04:00
Brian Caruso
e375dc33f6 Fixing type in previous commit. VIVO-63 2013-09-30 16:39:47 -04:00
Brian Caruso
6604b58f7c Merge branch 'develop' of github.com:vivo-project/Vitro into develop 2013-09-30 16:32:28 -04:00
Brian Caruso
dd2c9b8a7b Moving files to deal with vivo overrides. Adding permissions to pageList. VIVO-63 2013-09-30 16:30:41 -04:00
brianjlowe
8671bf3c5d switching vitro:example and vitro:shortDef to new IAO properties, and adding escaping to JSON strings in site admin listing pages 2013-09-30 15:51:31 -04:00
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
brianjlowe
9ef5e783a3 fixing model used by RestrictionOperationController 2013-09-27 16:40:34 -04:00
brianjlowe
9f2171c2a3 Changing VClassRetryController to use context dao factory 2013-09-27 16:16:25 -04:00
Brian Caruso
1658d7784a Adding email/pw auth to sparql query page 2013-09-27 16:04:06 -04:00
Brian Caruso
86156aaad4 Adding test for content negotiation 2013-09-27 16:03:28 -04:00
brianjlowe
688b858641 VIVO-266 and VIVO-24 improvements to restriction editing 2013-09-27 15:42:43 -04:00
brianjlowe
a719e6b706 minor data migration tweak 2013-09-27 14:17:38 -04:00
brianjlowe
cba46c4f72 fixes out of memory error with getRelatedRestrictions() 2013-09-27 10:53:18 -04:00
brianjlowe
9533717b32 switching the sparql query servlet back to using the unfiltered RDF service 2013-09-26 14:28:22 -04:00
hudajkhan
b970fb42d8 updates for label management 2013-09-26 13:58:44 -04:00
tworrall
4179900ea4 VIVO-112: and the slog continues... 2013-09-25 17:09:41 -04:00
hudajkhan
c58215a249 fixing test so changes to process method handled 2013-09-24 15:50:49 -04:00
hudajkhan
525267f40a Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop
Conflicts:
	webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForIndividualGenerator.java
2013-09-24 15:10:43 -04:00
hudajkhan
112b55d8bc updates for edit submission preprocessor, passing vreq, also beginning to add middle name to foaflabelpreprocessor 2013-09-24 14:59:31 -04:00
tworrall
e364911795 VIVO-289: fixed capitalization issues 2013-09-24 14:58:20 -04:00
hudajkhan
0ec8dcbce1 updates for labels and uri method in webappdaofactory 2013-09-24 13:44:12 -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
brianjlowe
32925441bc data migration improvements 2013-09-23 15:56:27 -04:00
Brian Caruso
03ceec5d81 Merge branch 'issue-VIVO-282-content-neogitation' into develop 2013-09-23 11:57:38 -04:00
Brian Caruso
cc95211afc minor changes to content negotiation for sparql servlet VIVO-282 2013-09-23 11:53:01 -04:00
Brian Caruso
dbf6f18e35 Adding content negotiation to sparql servlet VIVO-282 2013-09-23 11:53:01 -04:00
tworrall
f76ee886d5 VIVO-112 2013-09-23 08:58:24 -04:00