aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin
Commit message (Collapse)AuthorAgeFilesLines
* Resolve merge conflict and merge.Aditi2013-08-2257-74/+2245
|\
| * media_confirm_delete: redirect to next, then prev, then user homeAlon Levy2013-08-171-2/+6
| | | | | | | | | | | | | | | | | | Instead of redirecting directly to user's home. Makes the flow for mass or just a few deletions easier. For really large deletions it would still make sense to have a dedicated view, but this is still way better then losing context by jumping back to the home view. Signed-off-by: Alon Levy <alon@pobox.com>
| * load js at the end of the pageRodney Ewing2013-08-164-3/+3
| |
| * use urlgenRodney Ewing2013-08-162-2/+6
| |
| * Merge branch 'auth_docs'Rodney Ewing2013-08-163-0/+99
| |\ | | | | | | | | | | | | Conflicts: docs/source/index.rst
| | * typoRodney Ewing2013-07-091-2/+2
| | |
| | * added docs for the persona pluginRodney Ewing2013-07-091-0/+41
| | |
| | * added basic_auth and openid docs to index and link them togetherRodney Ewing2013-07-092-7/+11
| | |
| | * added openid docsRodney Ewing2013-07-091-0/+32
| | |
| | * basic_auth documentationRodney Ewing2013-07-091-0/+22
| | |
| * | fix persona tests by using a correct queryRodney Ewing2013-08-151-4/+4
| | |
| * | Merge branch 'persona_resquash'Christopher Allan Webber2013-08-1519-10/+904
| |\ \
| | * | Removing the whitespace betwetween action= and its valueChristopher Allan Webber2013-08-151-3/+3
| | | |
| | * | made it so that the create account button works with only persona enabledRodney Ewing2013-07-032-1/+6
| | | |
| | * | moved persona template stuff to use template_hooksRodney Ewing2013-07-0311-35/+86
| | | |
| | * | merge --squash persona branch to take care of a false merge commit inRodney Ewing2013-07-0317-10/+848
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the basic_auth branch that persona is forked from Conflicts: mediagoblin/templates/mediagoblin/auth/login.html mediagoblin/templates/mediagoblin/auth/register.html mediagoblin/templates/mediagoblin/edit/edit_account.html These are commit messages from the squashed persona stuff: - added tests and fixed minor errors - fixed a redirect loop when only persona is enabled and accessing /auth/login - moved persona.js to plugin's static dir - fixes for add/remove persona emails - add and remove personas - working with multiple plugins - working version - switched to hidden form instead of ajax - beginings
| * | Merge remote-tracking branch 'refs/remotes/tsyesika/master'Christopher Allan Webber2013-08-1528-50/+1212
| |\ \ | | | | | | | | | | | | New oauth tools! Heck yeah!
| | * | Fix import errors when running testsJessica Tallon2013-08-131-2/+1
| | | |
| | * | Fix problem causing exception when invalid Authentication header providedxray72242013-07-291-2/+5
| | | |
| | * | Fix problem with routing to oauthxray72242013-07-291-0/+1
| | | |
| | * | Fixes problem with headers pointing to old federation dirxray72242013-07-291-2/+2
| | | |
| | * | Renames OAuth1 code to federationxray72242013-07-229-13/+13
| | | |
| | * | Refactor WTFormDataxray72242013-07-222-10/+26
| | | |
| | * | Fix problem with migration - OAuthJessica Tallon2013-07-223-10/+9
| | | |
| | * | Fixes some typo's and removes unused importsJessica Tallon2013-07-201-6/+5
| | | |
| | * | Moves first versions of the the models to migrationsxray72242013-07-181-7/+72
| | | |
| | * | Adds migration for OAuth1 tablesxray72242013-07-181-1/+15
| | | |
| | * | Adds test for request_tokensxray72242013-07-184-20/+71
| | | |
| | * | Adds some tests for the OAuth and some docsxray72242013-07-162-9/+132
| | | |
| | * | Fixes testsxray72242013-07-148-28/+17
| | | |
| | * | Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblinxray72242013-07-141-3/+4
| | |\ \
| | * | | Using nonce now, preventing OAuth replay attacksxray72242013-07-143-5/+28
| | | | |
| | * | | Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblinxray72242013-07-1444-234/+333
| | |\ \ \
| | * | | | Ensures endpoint queries with @oauth_required are validatedxray72242013-07-112-2/+49
| | | | | |
| | * | | | Adds the decoratorxray72242013-07-114-5/+31
| | | | | |
| | * | | | Cleans up some of the OAuth codexray72242013-07-117-60/+134
| | | | | |
| | * | | | Finishes most of oauth, just decorator to completexray72242013-07-114-41/+80
| | | | | |
| | * | | | Adds more support for oauth - access_token & decorators still to doxray72242013-07-117-12/+259
| | | | | |
| | * | | | Adds oauth support up until authorizationxray72242013-07-115-40/+226
| | | | | |
| | * | | | Client registration now supports application/x-www-form-urlencoded nowxray72242013-07-113-38/+118
| | | | | |
| | * | | | Adds update abilityxray72242013-07-111-1/+19
| | | | | |
| | * | | | Adds more support to begin to deal with updatesxray72242013-07-111-2/+32
| | | | | |
| | * | | | Working client registrationxray72242013-07-116-54/+101
| | | | | |
| | * | | | Moves json_response into tools/json.pyxray72242013-07-113-0/+69
| | | | | |
| | * | | | Moves json_response into tools/json.pyxray72242013-07-115-28/+45
| | | | | |
| * | | | | Fix notifications, which I broke.Christopher Allan Webber2013-08-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This commit sponsored by Denver Gingerich. Thank you!
| * | | | | Avoiding the celery warnings that we seem to be confusing people lately.Christopher Allan Webber2013-08-146-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically, it's shuffling around the notifications stuff. This commit sponsored by Günter Kraft. Thank you!
| * | | | | change dropdown button to <a> from <div> so that it is tabbableRodney Ewing2013-08-091-2/+2
| | | | | |
* | | | | | Change path for tinymce.Aditi2013-08-101-1/+1
| | | | | |
* | | | | | Change button names to Save and Blog.Aditi2013-08-102-2/+2
| | | | | |