Skip to content

update from 2437 handle support iqss #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
solhm merged 25 commits into from
May 3, 2017
Merged

update from 2437 handle support iqss #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
3ff3834
Merge tag 'v4.2.4'
pdurbin Feb 12, 2016
b18a38c
Merge tag 'v4.3'
pdurbin Mar 22, 2016
b84c044
Merge tag 'v4.3.1'
pdurbin May 13, 2016
93597b4
Merge tag 'v4.4'
pdurbin Jun 30, 2016
067201c
Merge pull request #3330 from IQSS/develop
djbrooke Sep 2, 2016
7e5e8c9
Merge pull request #3395 from IQSS/v4.5.1
kcondon Sep 30, 2016
c913662
Merge pull request #3524 from IQSS/develop
kcondon Dec 9, 2016
1f0c9ef
Merge pull request #3689 from IQSS/develop
kcondon Mar 13, 2017
5e416c8
Merge pull request #3692 from IQSS/develop
kcondon Mar 15, 2017
1ed82ae
Merge pull request #3693 from IQSS/v4.6.1
kcondon Mar 15, 2017
b28a429
add initial Swift support #3747
pdurbin Apr 6, 2017
6f1e12c
quick fix to prevent a NullPointerException #3747
pdurbin Apr 7, 2017
a496eac
Merge branch 'develop' into 3747-swift-and-compute-button #3747
pdurbin Apr 7, 2017
f74fe41
catch ClassCastException and bail out #3747
pdurbin Apr 7, 2017
dc30893
Updated storage identifier and swift container ID
ferrys Apr 10, 2017
f46c667
add "Data Not Published" popup to file page on "Map Data" click #3760
pdurbin Apr 20, 2017
c88f7bd
Updated config docs and container names
ferrys Apr 21, 2017
99d0c2b
Merge pull request #3783 from ferrys/3747-swift-and-compute-button-up…
ferrys Apr 21, 2017
6f1f5ec
Revert "Updated config docs and container names"
ferrys Apr 21, 2017
14786e2
Merge pull request #3784 from IQSS/revert-3783-3747-swift-and-compute…
ferrys Apr 21, 2017
64090b7
Merge pull request #3779 from IQSS/3760-map-data-popup-file-page
kcondon Apr 21, 2017
07a469f
add entry for postgresql 9_6
Apr 24, 2017
73398fc
Merge pull request #3787 from pjwest/master
kcondon Apr 26, 2017
9fc60ad
Merge branch 'master' into develop #3786 #3787
pdurbin Apr 27, 2017
b6d9382
Merge branch 'develop' into 2437-handle-support-iqss #2437
pdurbin Apr 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion scripts/installer/install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,8 @@ my %POSTGRES_DRIVERS = (
"9_2", "postgresql-9.1-902.jdbc4.jar",
"9_3", "postgresql-9.1-902.jdbc4.jar",
"9_4", "postgresql-9.1-902.jdbc4.jar",
"9_5", "postgresql-9.1-902.jdbc4.jar"
"9_5", "postgresql-9.1-902.jdbc4.jar",
"9_6", "postgresql-9.1-902.jdbc4.jar"
);

# A few preliminary checks:
Expand Down
10 changes: 10 additions & 0 deletions src/main/webapp/file-download-button-fragment.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,4 +275,14 @@
<!-- 4.2.1 - TODO: retest this on a dataset with fileRequest enabled and with some files restricted to the user -->
<span class="glyphicon glyphicon-bullhorn"/> #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}
</p:commandLink>
<p:dialog header="#{bundle['file.mapData.unpublished.header']}" widgetVar="mapData_popup" modal="true">
<p class="help-block">
<span class="text-danger"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['file.mapData.unpublished.message']}</span>
</p>
<div class="button-block">
<button type="button" class="btn btn-default" onclick="PF('mapData_popup').hide();PF('blockDatasetForm').hide();">
#{bundle.close}
</button>
</div>
</p:dialog>
</ui:composition>