Commit graph

5220 commits

Author SHA1 Message Date
Graham Triggs
a8bd8829db Merge branch 'develop' into feature/theming
# Conflicts:
#	webapp/src/main/webapp/themes/vitro/templates/footer.ftl
#	webapp/src/main/webapp/themes/vitro/templates/googleAnalytics.ftl
#	webapp/src/main/webapp/themes/vitro/templates/head.ftl
2017-05-22 16:57:20 +01:00
Nate Prewitt
608aa1cf54 Merge pull request #59 from nateprewitt/license_update
[VIVO-1286] License update
2017-05-08 11:12:33 -06:00
Nate Prewitt
000da50219
updating license path 2017-05-06 14:40:28 -06:00
Graham Triggs
23c0ee372d Merge branch 'develop' into feature/theming 2017-04-30 19:27:15 +01:00
Steve McKay
6db6fabdac [VIVO-1315] Plum print integration (#57) 2017-04-30 13:11:10 +01:00
Graham Triggs
6d44d052f7 Merge branch 'develop' into feature/theming 2017-02-15 19:28:15 +00:00
Graham Triggs
be72c0d8b8 Remove COS dependency from JSP 2016-12-24 11:47:36 +00:00
grahamtriggs
68a462b05a [VIVO-1312] Implement Linked Data Fragment Server (#53)
* [VIVO-1312] Linked Data Fragments initial implementation

* [VIVO-1312] Use known ontologies in the prefixes config

* [VIVO-1312] Simplify SPARQL as when restricted to specific values, they don’t need ordering

* [VIVO-1312] Freemarker fixes

* [VIVO-1312] Remove blank nodes

* [VIVO-1312] Add access control header and standard prefixes for TPF

* [VIVO-1312] Render literals in form so that they will work on resubmit

* [VIVO-1312] Minor template update

* [VIVO-1312] Minor template update
2016-12-23 21:55:08 +00:00
Graham Triggs
17b323649d Remove unused Fedora connection 2016-12-19 19:08:13 +00:00
Graham Triggs
a13e353228 Update DWR XML DTD 2016-12-16 21:04:08 +00:00
Graham Triggs
1a292d8011 [VIVO-1309] [VIVO-1307] Update DWR to version 3.0.2 and remove dom4j 2016-12-16 18:47:17 +00:00
Graham Triggs
2efe4b4a87 Update ARQ URLs for Jena 3 2016-12-14 22:04:13 +00:00
grahamtriggs
20ac3a3514 [VIVO-1063] Update jQuery to 1.12.4 and associated upgrades (#51)
* Initial jQuery 1.12.4 upgrade

* Upgrade jQuery UI to 1.12.1

* Upgrade to qTip2

* Update property handling

* Update property handling

* Update jCrop script and fix rounding of floating point co-ordinates

* Fix missing confirmation message

* Return empty JSON so that jQuery doesn’t complain

* Fix JavaScript error
2016-12-13 19:57:05 +00:00
grahamtriggs
b97ee8dd26 [VIVO-1290] Multi-language improvements
* fix hard coded label "more..."

* fix hard coded label "pages"

* fix hard coded labels "pages" and "to"

* fix some hard coded page titles and messages

* show class names in list views corresponding to preferred languages

* translate page titles of search result page and login page
2016-11-14 14:45:40 +00:00
Graham Triggs
ed4e42c98f Update version numbers 2016-10-31 19:46:39 +00:00
Graham Triggs
4b610e64c9 Merge branch 'develop' into feature/theming 2016-10-05 22:38:23 +01:00
Graham Triggs
0957bcf758 [VIVO-1272] Inject JSP output to Freemarker instead of having a secondary layout 2016-10-05 22:36:26 +01:00
Graham Triggs
e2e3c8b041 Initial template refactoring (paused due to JSP) 2016-09-29 15:22:05 +01:00
Stefan Wolff
8c8985bdc2 fix some hard coded page titles and messages 2016-09-23 17:25:05 +02:00
Stefan Wolff
5539034f00 fix hard coded labels "pages" and "to" 2016-09-23 16:44:14 +02:00
Stefan Wolff
3ab448a926 fix hard coded label "pages" 2016-09-23 16:29:43 +02:00
Graham Triggs
a3c378bb25 [VIVO-1270] Initial commit of Jena 3 2016-09-02 19:59:10 +01:00
Graham Triggs
64eb5929a7 [VIVO-1255] Add required field indicator to range class 2016-07-20 18:54:03 +01:00
Graham Triggs
f954fdbde4 [VIVO-1251] Special chars in property group names 2016-07-07 08:21:12 +01:00
Graham Triggs
809644f4b8 [VIVO-1082] Clean up pluginManagement 2016-07-06 06:47:56 +01:00
Graham Triggs
61f90dd1e6 [VIVO-1237] Add ability to generate meta tags 2016-07-05 17:52:03 +01:00
Graham Triggs
6e520da662 [VIVO-1233] Wrap large buttons on ontology edit page 2016-06-01 15:29:57 +01:00
Graham Triggs
fbeed01a94 [VIVO-1245] Cleanup of NewIndividualFormGenerator, simplify configuration of generators and improve means of configuring in Freemarker 2016-05-25 17:06:21 +01:00
Graham Triggs
5cbcab5bcc [VIVO-1245] Cleanup of ManageLabelsGenerator 2016-05-24 21:52:32 +01:00
Graham Triggs
ca45b5e93d [VIVO-1222] Add revisionInfo to build 2016-05-23 15:11:16 +01:00
Graham Triggs
437bb9f515 [VIVO-1236] Add TwelveMonkeys ImageIO library for full OpenJDK image support 2016-05-02 14:12:25 +01:00
Tim Worrall
9f21c8c976 Update level on ARG_0000028 faux properties was not working correctly due to a bug in the edit link macro. 2016-04-29 13:01:35 -04:00
Graham Triggs
9ff3dd5e11 [VIVO-1226] bug fix for search help back link 2016-01-21 15:55:49 +00:00
Ted Lawless
11d8a91469 Move yasqe js to required location. 2016-01-06 14:20:43 -05:00
Graham Triggs
8b1919e69b Merge branch 'feature/yasqe' of https://github.com/lawlesst/Vitro into lawlesst-feature/yasqe 2015-12-02 15:05:00 +00:00
Graham Triggs
a3b238f870 Merge branch 'browse-columns' of https://github.com/gneissone/Vitro into gneissone-browse-columns 2015-12-02 14:08:16 +00:00
Benjamin Gross
7c9cadd981 tweak index page initHeight and don't add (cont'd) text if there aren't any more classes to show 2015-12-01 17:21:52 -07:00
Graham Triggs
f5b0494e3c Maven (second draft) 2015-11-20 21:21:11 +00:00
Graham Triggs
e1ff94ccaf Maven migration (first draft) 2015-11-19 23:47:12 +00:00
Ted Lawless
4808367ed5 Add YASQE - allows for syntax highlighting and prefix autocompletion. 2015-11-12 13:56:53 -05:00
Graham Triggs
3157b0941c Fix to regular expression replacement 2015-11-09 18:41:57 +00:00
Graham Triggs
dd76bb73a4 Faster Graph query for sprawl interface; add caching as it is still quite slow 2015-11-06 11:15:39 +00:00
grahamtriggs
cc300bf419 Minor correction to the range test in the form for choosing the title. 2015-11-04 16:23:27 +00:00
grahamtriggs
15bc18b69a Allow SPRAQL endpoint to have credentials on read as well as write; update Virtuoso normalisation of types 2015-11-04 11:03:07 +00:00
grahamtriggs
817e90716c [VIVO-1122] Fix to the way resources are consumed in the SPARQL clients, so that it doesn't leak / tie up HTTP connections. 2015-11-03 01:19:38 +00:00
grahamtriggs
046d445639 Enable new visualisations by default 2015-11-02 18:32:26 +00:00
grahamtriggs
6a4dfbb43f [VIVO-1031] Faster list filtering (for large lists) 2015-11-02 10:29:54 +00:00
grahamtriggs
c8818932a4 [VIVO-1031] Minor cleanup 2015-10-31 22:19:27 +00:00
grahamtriggs
a5084a614c Remove last use of graph wrapper from reinferencer 2015-10-31 19:01:51 +00:00
grahamtriggs
25874449dd Replace the other instance where the reinferencer was going through a serialisation that could easily be a direct write into a model. 2015-10-31 14:41:56 +00:00