diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-09-16 14:01:43 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-09-16 14:01:43 -0500 |
| commit | f6bad0eb26fa7e092570afe1fb7f38b3d1a1941d (patch) | |
| tree | 0ca05e7a95cfb30d8b286f3ec72e8c95e212511b /docs/source/index.rst | |
| parent | 5b64c92e0816e733c2f88b88ddc0aec070cdc0d3 (diff) | |
| parent | 1b4e199668ada5c2ec47df7432ab69e315dc0601 (diff) | |
| download | mediagoblin-f6bad0eb26fa7e092570afe1fb7f38b3d1a1941d.tar.lz mediagoblin-f6bad0eb26fa7e092570afe1fb7f38b3d1a1941d.tar.xz mediagoblin-f6bad0eb26fa7e092570afe1fb7f38b3d1a1941d.zip | |
Merge branch 'master' into merge-python3-port
Has some issues, will iteratively fix!
Conflicts:
mediagoblin/gmg_commands/__init__.py
mediagoblin/gmg_commands/deletemedia.py
mediagoblin/gmg_commands/users.py
mediagoblin/oauth/views.py
mediagoblin/plugins/api/views.py
mediagoblin/tests/test_api.py
mediagoblin/tests/test_edit.py
mediagoblin/tests/test_oauth1.py
mediagoblin/tests/test_util.py
mediagoblin/tools/mail.py
mediagoblin/webfinger/views.py
setup.py
Diffstat (limited to 'docs/source/index.rst')
| -rw-r--r-- | docs/source/index.rst | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/docs/source/index.rst b/docs/source/index.rst index 3ead6136..8e49d1d1 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -78,6 +78,7 @@ This guide covers writing new GNU MediaGoblin plugins. pluginwriter/database pluginwriter/api pluginwriter/tests + pluginwriter/hooks pluginwriter/media_type_hooks pluginwriter/authhooks @@ -96,6 +97,26 @@ This chapter contains various information for developers. devel/migrations +Part 5: Pump API +================ + +This chapter covers MediaGoblin's `Pump API +<https://github.com/e14n/pump.io/blob/master/API.md>`_ support. (A +work in progress; full federation is not supported at the moment, but +media uploading works! You can use something like +`PyPump <http://pypump.org>`_ +to write MediaGoblin uploadable applications.) + +.. toctree:: + :maxdepth: 1 + + api/client_register + api/oauth + api/media + api/media_interaction + + + Indices and tables ================== |