aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into authRodney Ewing2013-06-2572-5530/+4087
|\
| * Adding a docstring to fixture_media_entryChristopher Allan Webber2013-06-221-0/+8
| * Fix the data integrity bug in test_misc.Christopher Allan Webber2013-06-221-2/+2
| * Padding on the header-dropdown areaChristopher Allan Webber2013-06-221-0/+1
| * Merge remote-tracking branch 'refs/remotes/joar/notifications'Christopher Allan Webber2013-06-2227-29/+910
| |\
| | * New notifications, fixedJoar Wandborg2013-06-094-5/+25
| | * New notificationsJoar Wandborg2013-06-0927-28/+890
| * | Fix by Rodney Ewing so render_http_exception works with newer Werkzeug versions.Christopher Allan Webber2013-06-221-1/+1
| * | Removing the "enter your password to change your email" bit.Christopher Allan Webber2013-06-214-76/+23
| * | Merge remote-tracking branch 'refs/remotes/rodney757-github/mail'Christopher Allan Webber2013-06-2113-115/+370
| |\ \
| | * | cleanup after mergeRodney Ewing2013-05-291-0/+1
| | * | modified verification emails to use itsdangerous tokensRodney Ewing2013-05-297-84/+105
| | * | send_verification_email was moved to auth/toolsRodney Ewing2013-05-291-1/+2
| | * | form is already validated, no need to validate againRodney Ewing2013-05-291-6/+2
| | * | Merge remote-tracking branch 'upstream/master' into change_emailRodney Ewing2013-05-2867-5258/+7656
| | |\ \
| | * | | added error handling on bad token, fixed route, and added testsRodney Ewing2013-05-243-7/+120
| | * | | added support for user to change email addressRodney Ewing2013-05-246-27/+150
| * | | | Indenting some stuff in pdf.html and wrapping width and height parameters in ...Christopher Allan Webber2013-06-201-13/+15
| * | | | pdf: remove two unused files (we use pdf.js in an iframe, no need for our own...Alon Levy2013-06-212-5063/+0
| * | | | What is models_v0.py? An explaination!Christopher Allan Webber2013-06-201-0/+23
| * | | | Now in dev mode on 0.4.1Christopher Allan Webber2013-06-171-1/+1
| * | | | MediaGoblin v0.4.0!Christopher Allan Webber2013-06-161-1/+1
| * | | | Committing extracted and compiled translationsChristopher Allan Webber2013-06-1614-39/+39
| * | | | Committing present MediaGoblin translations before pushing extracted messagesChristopher Allan Webber2013-06-1613-271/+2781
| | |_|/ | |/| |
| * | | CloudFiles: Default to SSL URIsJoar Wandborg2013-06-071-1/+1
* | | | typoRodney Ewing2013-06-251-1/+1
* | | | changes after cwebb's reviewRodney Ewing2013-06-2117-114/+36
* | | | moved authentication_disabled to config_specRodney Ewing2013-06-156-10/+7
* | | | changed no_auth to authentication_disabled in configRodney Ewing2013-06-119-24/+24
* | | | cleanupRodney Ewing2013-06-041-5/+0
* | | | fixed a bug that was deleting the messagesRodney Ewing2013-06-042-5/+6
* | | | minor changes from aaronw's reviewRodney Ewing2013-06-043-6/+8
* | | | Merge remote-tracking branch 'upstream/master' into basic_authRodney Ewing2013-05-304-17/+26
|\| | |
| * | | Commenting out the max-height restriction on thumbnails.Christopher Allan Webber2013-05-301-3/+6
| * | | The pdf.js iframe view is awesome so I'm making it the default. So there! ;)Christopher Allan Webber2013-05-281-1/+1
| * | | Fixing bug where non-image types might break if app_config['original_date_vis...Christopher Allan Webber2013-05-282-13/+19
| | |/ | |/|
* | | removed extra argument from check_login_simple in login viewRodney Ewing2013-05-281-1/+1
* | | cleanupRodney Ewing2013-05-281-1/+1
* | | Merge remote-tracking branch 'upstream/master' into basic_authRodney Ewing2013-05-282-42/+30
|\| |
| * | added a register_user functionRodney Ewing2013-05-282-33/+53
| * | created a check_login_simple functionRodney Ewing2013-05-285-33/+34
| * | moved email_debug_message to gmg/tools/mailRodney Ewing2013-05-272-13/+15
| * | moved send_verification_email to auth/toolsRodney Ewing2013-05-273-39/+41
| * | removed unused importRodney Ewing2013-05-271-1/+0
| * | Committing extracted and compiled translationsChristopher Allan Webber2013-05-2757-5127/+7482
* | | cleanupRodney Ewing2013-05-281-8/+0
* | | Conflicts:Rodney Ewing2013-05-2759-5127/+7502
* | | modified get_user function to take kwargs instead of usernameRodney Ewing2013-05-273-11/+14
* | | no need for user might be email kwarg in check_login_simpleRodney Ewing2013-05-272-2/+2
* | | Merge branch 'pre-auth' into basic_authRodney Ewing2013-05-273-40/+61
|\ \ \