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

Docstanya #297

Merged
merged 282 commits into from
Jan 17, 2019
Merged

Docstanya #297

merged 282 commits into from
Jan 17, 2019

Conversation

dnadeau4
Copy link
Contributor

@dnadeau4 dnadeau4 commented Jan 5, 2019

No description provided.

dnadeau4 and others added 30 commits November 15, 2017 09:29
@dnadeau4
merge docs
49c79e1
@dnadeau4
add requirements.txt
b92460f
@dnadeau4
remove cdat_info
96a2581
@dnadeau4
remote cdat_info
d629683
@dnadeau4
fix latex_logo png
c533331
@dnadeau4
Merge branch 'master' into cdmsdocsmerge
9d724ae
@dnadeau4
pin pyopenssl to 17.2.0 due to myproxyclient failure in py3
0ca4050
@dnadeau4
update TOC
263d814
@dnadeau4
work on tables and setup
bbafa04
@dnadeau4
try to force jquery 3.1
3ec8781
@dnadeau4
just copy js script in _static
7eca248
@dnadeau4
add highlight python
95b3029
@dnadeau4
add sample dataset page
a1f80cb
@dnadeau4
add sample dataset page
f6335ee
@dnadeau4
work on tables for cdms_2.rst
58915de
@dnadeau4
continue cdms2 documentations
89c45b9
update cdms2 tables
d4269cf
update sections
8402530
update table
1ec5ef9
@dnadeau4
finish chapter 2
7bc7d13
@dnadeau4
merge master
dbdbbc9
@dnadeau4
fix litteral error
322803c
@dnadeau4
merge master
e9c0809
@dnadeau4
fix conclits
ee5c35a
@dnadeau4
Merge branch 'master' into cdmsdocsmerge
9b9c9f8
@dnadeau4
unlink .dodsrc for cdscan
c4563ee
@reshel3
First changes from Tanya
9ae560a
@reshel3
some change in chapter 1 and 2
f93e64f
@reshel3
some changes in Chapter 2
42d56ee
@reshel3
fix tables
af15c81
reshel3 and others added 27 commits October 18, 2018 15:16
@reshel3
add jupyter notebook
451a012
@reshel3
Changes to all
0fbeaba
@reshel3
Changes to Jupyter Notebooks
dd65dfd
@reshel3
Changes to all
06f672c
@dnadeau4
fix conflict merge master
0e1e668
@dnadeau4
update documentation for version 3.1.0
193e42a
@dnadeau4
Merge branch 'master' into docstanya
5216d3b
@dnadeau4
merge documentations
b7a23ec
@dnadeau4
Merge branch 'master' into docstanya
e1a9e29
@dnadeau4
change banner and sidebar colors
46a8b5f
@reshel3
Changes to API
866a225
@dnadeau4
fix style sheet
c1f98a9
@reshel3
Changes to API
f444406
@reshel3
Changes to API
aea7a3e
@reshel3
Changes to API and Sections
69de7c1
@reshel3
Changes to all
64cc035
@doutriaux1
will this fix master? (#292)
8006c3c
Merge branch 'master' into docstanya
24130a4
@reshel3
Changes to Sections 1 and 2
9297ece
@reshel3
fix cdtime and scripts
e3da499
@reshel3
Merge branch 'docstanya' of github.com:CDAT/cdms into docstanya
8cf4121
@reshel3
fix conflicts
743d60e
@reshel3
trigger read-the-docs
a87283c
@reshel3
fix more cdtime doc issues
df6905e
@reshel3
fix typo Default-Calendar
da1e5eb
@reshel3
fix conflicts
86b4c45
@reshel3
pass flake8
c6b2a6c
@coveralls
Copy link

Coverage Status

Coverage remained the same at ?% when pulling c6b2a6c on docstanya into 5a83dd4 on master.

@dnadeau4 dnadeau4 merged commit 1421a59 into master Jan 17, 2019
@dnadeau4 dnadeau4 deleted the docstanya branch January 17, 2019 21:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@dnadeau4 @coveralls @doutriaux1 @durack1 @reshel3 @muryanto1