Commit graph

4741 commits

Author SHA1 Message Date
Jim Blake
f4d75d838f Merge branch 'develop' of github.com:vivo-project/VIVO into develop
# By Graham Triggs (5) and grahamtriggs (1)
# Via Graham Triggs (1) and grahamtriggs (1)
* 'develop' of github.com:vivo-project/VIVO:
  [VIVO-1236] Remove parameter for determining Vitro location, which causes problems with Maven 3.0.3
  Fix issue with renamed prefix in SPARQL query for visualisations
  [VIVO-1121] Remove Flash visualisations
  [VIVO-1249] Add capability maps for research areas (#35)
  [VIVO-1232] Allow direct links to specific property tabs
  [VIVO-1243] Add generator tag to Wilma theme
2016-06-21 10:28:11 -04:00
Graham Triggs
324d75db11 [VIVO-1236] Remove parameter for determining Vitro location, which causes problems with Maven 3.0.3 2016-06-20 19:45:53 +01:00
Graham Triggs
da9057ff9b Fix issue with renamed prefix in SPARQL query for visualisations 2016-06-20 18:55:10 +01:00
Graham Triggs
7a2d415cfa [VIVO-1121] Remove Flash visualisations 2016-06-20 18:54:35 +01:00
grahamtriggs
ee7b974ac5 [VIVO-1249] Add capability maps for research areas (#35)
* Initial capability map implementation

* Add autocomplete

* Make headers update the info panel

* Ajax retrieval of person details - reduce memory requirements and startup time

* Remove old referer info

* Handle missing labels.

* Fix refresh button; add menu entry for new installations
2016-06-20 17:01:51 +01:00
grahamtriggs
1443ff6685 Merge pull request #34 from vivo-project/feature/1232
[VIVO-1232] Allow direct links to specific property tabs
2016-06-03 15:38:15 +01:00
Graham Triggs
24505d69be [VIVO-1232] Allow direct links to specific property tabs 2016-06-03 15:34:58 +01:00
Graham Triggs
59590b17b1 [VIVO-1243] Add generator tag to Wilma theme 2016-06-02 16:53:10 +01:00
Jim Blake
33add6ae05 Merge commit '2a6f857353ecbe75f8b5bb20db8c8d4f9ef9025f' into develop
* commit '2a6f857353ecbe75f8b5bb20db8c8d4f9ef9025f':
  [VIVO-1235] Fix temporal graph CSV save all missing data
  [VIVO-1120] Repair accidental JavaScript commit
  [VIVO-1120] Remove deprecated visualisation model code
2016-06-01 09:37:10 -04:00
Jim Blake
ba0c291ccd VIVO-1247, remove duplicate code used with ConfigurationBeanLoader.
Now that the @Property annotation includes cardinality parameters, we can remove a lot of duplicate code.
2016-06-01 09:28:44 -04:00
grahamtriggs
2a6f857353 Merge pull request #32 from vivo-project/committer/grahamtriggs
[VIVO-1235] Fix temporal graph CSV save all missing data
2016-05-31 20:47:02 +01:00
Graham Triggs
46f099162a [VIVO-1235] Fix temporal graph CSV save all missing data 2016-05-31 20:42:30 +01:00
grahamtriggs
48759c87bb Merge pull request #31 from vivo-project/committer/grahamtriggs
[VIVO-1120] Remove deprecated code from VIVO visualisations
2016-05-31 18:05:32 +01:00
Graham Triggs
bdfd0d551d [VIVO-1120] Repair accidental JavaScript commit 2016-05-28 16:44:21 +01:00
Graham Triggs
e1b5e2448e [VIVO-1120] Remove deprecated visualisation model code 2016-05-27 23:39:00 +01:00
Graham Triggs
d77e45f557 Add initial travis config 2016-05-27 12:02:20 +01:00
Graham Triggs
e08831fa11 [VIVO-1245] Remove Vitro jar shading / ensure Vitro jar is included as a dependency 2016-05-26 19:33:59 +01:00
grahamtriggs
4643a2a118 Merge pull request #30 from vivo-project/feature/1245-resolve-duplication
[VIVO-1245] Reduce code duplication and class overwriting in VIVO
2016-05-26 19:23:34 +01:00
Graham Triggs
603b64368d [VIVO-1245] Cleanup IndividualJsonWrapper 2016-05-25 20:59:55 +01:00
Graham Triggs
4a5a988eeb [VIVO-1245] Split out Template Model builders to avoid initialisation order issue 2016-05-25 20:42:42 +01:00
Graham Triggs
46ca84d519 [VIVO-1245] Cleanup Template Model classes 2016-05-25 19:47:40 +01:00
Graham Triggs
b5db288cd3 [VIVO-1245] Remove SelectDataGetterUtils - can't find any uses 2016-05-25 18:56:22 +01:00
Graham Triggs
dba5c4e005 [VIVO-1245] Cleanup of MenuManagementDataUtils 2016-05-25 18:38:46 +01:00
Graham Triggs
40abb0a4e1 [VIVO-1245] Cleanup of NewIndividualFormGenerator, simplify configuration of generators and improve means of configuring in Freemarker 2016-05-25 17:06:30 +01:00
Graham Triggs
8ca5955283 [VIVO-1245] Cleanup of ManageLabelsGenerator 2016-05-24 21:52:24 +01:00
Graham Triggs
090b6b7b3e [VIVO-1245] Cleanup of ProcessDataGetterN3Map 2016-05-24 17:37:32 +01:00
Graham Triggs
6b140bf89d [VIVO-1245] Cleanup of DefaultAddMissingIndividualFormGenerator 2016-05-24 17:05:23 +01:00
Graham Triggs
cc0d131ff6 [VIVO-1245] Cleanup of IndividualSearchResult (add new startup listener to configure for VIVO) and new SiteAdminController 2016-05-24 14:34:26 +01:00
Graham Triggs
4e7802d34c [VIVO-1222] Add revisionInfo to build 2016-05-23 15:11:33 +01:00
Graham Triggs
4dfffe88a2 [VIVO-1236] Add TwelveMonkeys ImageIO library for full OpenJDK image support 2016-05-02 14:13:07 +01:00
Benjamin Gross
3ffbea3cbb Fix broken URLs in runtime.properties, use tiny links 2016-03-21 10:26:56 -06:00
Benjamin Gross
93f263d8f5 [VIVO-1235] Temporal graph bug fixes 2016-03-16 16:58:30 -06:00
Benjamin Gross
18d551b1a2 replace incorrect label on entity comparison page 2016-03-15 16:00:08 -06:00
Michael Conlon
129f8b3e26 Merge remote-tracking branch 'origin/develop' into develop 2016-03-05 17:34:53 -05:00
Michael Conlon
6e58127563 improve tagline. Improve file formatting 2016-03-05 17:33:44 -05:00
Graham Triggs
aac9373f85 Updates to the Selenium WebDriver tests. 2016-01-26 20:52:43 +00:00
Graham Triggs
5053b4cff4 [VIVO-1223] Add authorship rank to the constructed model 2016-01-22 14:01:25 +00:00
Graham Triggs
6b296f00c1 Updates to the Selenium WebDriver tests. 2016-01-20 13:26:55 +00:00
Graham Triggs
550db92748 Updates to the Selenium WebDriver tests. 2016-01-19 16:49:17 +00:00
Graham Triggs
6217134901 Updates to the Selenium WebDriver tests. 2016-01-19 15:05:28 +00:00
Graham Triggs
d19d0f27c8 Updates to the Selenium WebDriver tests. 2016-01-18 16:35:06 +00:00
Graham Triggs
addfd09a61 Updates to the Selenium WebDriver tests. 2016-01-15 21:32:58 +00:00
Graham Triggs
b66df2453d Updates to the Selenium WebDriver tests. 2016-01-15 20:49:14 +00:00
Graham Triggs
41a7ed3682 Updates to the Selenium WebDriver tests. 2016-01-15 20:23:27 +00:00
Graham Triggs
0236f3c42d Updates to the Selenium WebDriver tests. 2016-01-15 17:29:16 +00:00
Graham Triggs
98a52c1306 Updates to the Selenium WebDriver tests. 2016-01-15 16:49:33 +00:00
Graham Triggs
c62844c4c1 Updates to the Selenium WebDriver tests. 2016-01-08 18:04:57 +00:00
Graham Triggs
b5b2845c6d Selenium WebDriver test updates 2016-01-07 21:55:53 +00:00
grahamtriggs
f1db2aa8aa Merge pull request #28 from gneissone/no-old-positions
hide past positions in 'research area of' list view
2016-01-07 14:00:58 +00:00
Benjamin Gross
39b7d7bdfb hide past positions in 'research area of' list view 2015-12-23 11:13:40 -07:00