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.

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

Merge 2.x to master #7026

Merged
merged 30 commits into from Sep 5, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
bb775aa
DOC: merge api changes into main api_changes.rst
tacaswell Aug 27, 2016
7314c90
DOC: move whats_new files into main whats_new.rst
tacaswell Aug 27, 2016
0d4c84a
DOC: merge the rcparams sections
tacaswell Aug 27, 2016
4be1c14
DOC: document 'CN' pattern of naming colors
tacaswell Aug 27, 2016
7a6429e
DOC: fix rst
tacaswell Aug 27, 2016
19a96c1
WIP: split up whats_new
tacaswell Aug 27, 2016
628f4c1
FIX: correct name of seaborn stylesheet
tacaswell Aug 28, 2016
fa4fbe1
DOC: work on color documentation
tacaswell Aug 28, 2016
b314fbb
DOC: minor changes to old whats_new
tacaswell Aug 28, 2016
97b0574
DOC: move style change documentation around a bit
tacaswell Aug 28, 2016
39636b0
DOC: start to re-arrange top-level organization
tacaswell Aug 28, 2016
cdc11fe
DOC: yet more re-organization / consolidation
tacaswell Aug 28, 2016
534778f
FIX: properly rename seaborn style sheet
tacaswell Aug 28, 2016
251ae73
DOC: update colormap section
tacaswell Aug 29, 2016
ee0d3e2
DOC: fix adornments
tacaswell Aug 29, 2016
7652e40
DOC: clean up API changes a bit
tacaswell Aug 29, 2016
f1753b7
DOC: yet more work on new defaults
tacaswell Aug 29, 2016
b11d170
API: add `lines.scale_dashes` rcParam
tacaswell Aug 29, 2016
6f43449
FIX: matplotlibrc.template to match rcsetup
tacaswell Aug 29, 2016
b6e9648
DOC: add section on `plot`
tacaswell Aug 29, 2016
dbab147
DOC: edits colors.rst
tacaswell Aug 30, 2016
ce9243e
DOC: minor wording / punctuation changes
tacaswell Aug 30, 2016
f81a08d
DOC: Fix small issues in new release notes.
QuLogic Aug 30, 2016
1aaa2c0
DOC: add patch section
tacaswell Aug 30, 2016
d925fff
DOC: add section on dpi / figure size / font size
tacaswell Aug 30, 2016
89add4c
DOC: yet more doc changes
tacaswell Sep 3, 2016
6d97f09
DOC: cleanups in api_changes for v1.5 and later
efiring Sep 5, 2016
a569f11
Merge pull request #6994 from tacaswell/doc_v2_release_notes
efiring Sep 5, 2016
55e90bd
Merge branch 'v2.x' into master_merge
efiring Sep 5, 2016
cc07e88
Remove style_sheets.rst, erroneously resurrected in the merge.
efiring Sep 5, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
320 changes: 224 additions & 96 deletions doc/api/api_changes.rst

Large diffs are not rendered by default.

16 changes: 0 additions & 16 deletions doc/api/api_changes/2015-03-14-SSH.rst

This file was deleted.

16 changes: 0 additions & 16 deletions doc/api/api_changes/2015-11-12-DDH.rst

This file was deleted.

19 changes: 0 additions & 19 deletions doc/api/api_changes/2015-12-01-TAC.rst

This file was deleted.

8 changes: 0 additions & 8 deletions doc/api/api_changes/2015-12-30_draw_image.rst

This file was deleted.

20 changes: 0 additions & 20 deletions doc/api/api_changes/2016-06-deprecate_backends.rst

This file was deleted.

10 changes: 0 additions & 10 deletions doc/api/api_changes/2016-07-20-EF.rst

This file was deleted.

11 changes: 0 additions & 11 deletions doc/api/api_changes/qualitative colormaps.rst

This file was deleted.

5 changes: 2 additions & 3 deletions doc/contents.rst
Expand Up @@ -14,14 +14,13 @@ Overview
.. toctree::
:maxdepth: 2

style_changes.rst
users/index.rst
api/index.rst
faq/index.rst
mpl_toolkits/index.rst
resources/index.rst
thirdpartypackages/index.rst
devel/index.rst
mpl_toolkits/index.rst
api/index.rst
examples/index.rst
glossary/index.rst

Expand Down
33 changes: 0 additions & 33 deletions doc/style_changes.rst

This file was deleted.