Skip to content
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

Jump to bottom

Longstanding changes in develop #124

Merged
merged 52 commits into from
May 29, 2018
Merged

Longstanding changes in develop #124

merged 52 commits into from
May 29, 2018
+2,961 −884

Conversation

Castronova
Copy link
Member

No description provided.

Castronova and others added 30 commits October 5, 2017 16:34
@Castronova
#76 added index page

Verified

This commit was signed with the committer’s verified signature.
wooorm Titus
GPG key ID: E6E581152ED04E2E
Verified
Learn about vigilant mode
0b35530
@Castronova
#76 added missing settings file

Verified

This commit was created on github.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
528dcaf
@Castronova
#77 #76 added target argument to the rest api

Verified

This commit was signed with the committer’s verified signature.
wooorm Titus
GPG key ID: E6E581152ED04E2E
Verified
Learn about vigilant mode
d40027e
@Castronova
#73 force footer to stay below jh content
aef5039
@Castronova
#95 moved docker updates into docker-base
34f5f0e
@Castronova
#95 consolidated multipart commands into single lines
1d119ae
@Castronova
#95 reverted local changes in Dockerfile
639bebc
@Castronova
#95 resolved kernel issues
7e0cb5b
@lichray
add Sciunit support
843770f 
This patch will

 - install sciunit2 (depends on bsddb, fixes #69)
 - install the man(1) utility (fixes #71)
 - allow access to ptrace (required by Sciunit, fixes #70)

also

 - fix Dakota build
 - avoid loading large cached Python wheels
 - install R kernel as normal user (fixes #92)
@Castronova
#95 resolved library dependecies
48d8b6e
@Castronova
#95 updates to config.py to address version changes
0d91cc5
@Castronova
Merge pull request #100 from hydroshare/95-consolidate-dockerfiles
be73ed8 
95 consolidate dockerfiles
@Castronova
merge conflicts
233d3f3
@Castronova
removed unncessary docker build files
441dd77
@Castronova
#91 removed python3 flush for backwards compatibility
36bf194
@Castronova
#91 added import to __init__
965305a
@Castronova
#91 cleaned irods library initialization
82deffb
@Castronova
#104 pep8 fixes
33262f1
@Castronova
Merge pull request #105 from hydroshare/sciunit-support
646a322 
Sciunit support
@Castronova
#107 removed celery folder from dockerfile since it is not currently …
de3ae75 
…being used
@Castronova
#107 added missing files to repo
91cc7cd
@Castronova
Merge pull request #108 from hydroshare/107-dockerhub-build
9ace17a 
107 dockerhub build
@Castronova
#104 updated the timeseries notebook for the latest odm2api release
4adac90
@Castronova
Merge branch 'develop' of https://github.com/hydroshare/hydroshare-ju…
a718472 
…pyterhub into 104-timeseries-odm2-updates
@Castronova
Merge pull request #109 from hydroshare/104-timeseries-odm2-updates
ae71235 
fixes to timeseries notebook for latest odm2api
@Castronova
Merge branch 'develop' of https://github.com/hydroshare/hydroshare-ju…
0f5d61c 
…pyterhub into 76-rest-index
@Castronova
Merge pull request #102 from hydroshare/76-rest-index
2e83fca 
76 rest index
@Castronova
Merge pull request #106 from hydroshare/91-irods-library-issues
d0711e5 
91 irods library issues
@Castronova
Merge branch 'develop' of https://github.com/hydroshare/hydroshare-ju…
7700492 
…pyterhub into 73-footer-styling
@Castronova
#73 moved static files under the jupyterhub directory
0787f0f
Castronova and others added 22 commits December 4, 2017 16:32
@Castronova
#73 added configure and config-envs functions to jpctl
2657584
@Castronova
#73 removing auto generated files in the installation dir
7fc32c0
@Castronova
#73 removed deprecated functions from jpctl
3196950
@Castronova
Merge pull request #101 from hydroshare/73-footer-styling
d47497a 
#73 force footer to stay below jh content
deployment modifications
057ab9b
@Castronova
added an updated timeseries odm2 notebook
dde5000
@Castronova
increased the individual memory restriction to 16G
3459eda
@Castronova
removed cell output from timeseries odm2
0e9111e
@Castronova
fixed bug in notebook hyperlinks
7edbb3f
@Castronova
suppressed warnings in landslide driver notebook
88d5085
@Castronova
replaced landlab notebook. removed rhessys notebook bc it was broken.
c71f57d
@Castronova
added R example notebook
9c01a28
@Castronova
#110 resolved certificate issue in Welcome page
4bd91a2
@Castronova
#110 removed image references in page foooter
c9d025b
@Castronova
fixed bug in setting the footer
f5032c6
@Castronova
fixed missing footer images
bb95080
@Castronova
added a script to perform the envar configuration for jupyterhub
c395d00
@Castronova
added ssl cert and key lookup from environment variables. This allows…
13f671b 
… the rest server to run with and without ssl.
@Castronova
added ssl setting based on environment variables
12a6460
@Castronova
added a call to the external python file for setting environment vari…
11abd4c 
…ables
@Castronova
modifications to base dockerfile for taudem 5.3.9
b2636d9
@Castronova
Merge branch 'develop' of https://github.com/hydroshare/hydroshare-ju…
8cb724c 
…pyterhub into develop
@Castronova Castronova self-assigned this May 29, 2018
@Castronova Castronova merged commit 3b13fa5 into master May 29, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Castronova Castronova

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Castronova @lichray