bdd2242155
added user upload limits
Rodney Ewing
2013-06-12 12:02:11 -07:00
7b12cbd98b
Removing unnecessary "setup_plugin()" calls, as pointed out by Velmont.
Christopher Allan Webber
2013-08-25 13:59:34 -05:00
6c3d383bbb
Merge remote-tracking branch 'refs/remotes/rodney757/email'
Christopher Allan Webber
2013-08-25 13:23:27 -05:00
7d9dbe32cc
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Aditi
2013-08-25 09:24:13 +05:30
e46fb71c1d
pushing so paroneayea can help me resolve a conflict within the tests.
tilly-Q
2013-08-23 16:14:36 -04:00
e8eec575f3
Not sure why there wasn't a .commit() at the end of add_new_notification_tables()
Christopher Allan Webber
2013-08-22 16:04:19 -05:00
70cc6eb8f3
Resolve merge conflict and merge.
Aditi
2013-08-22 22:34:06 +05:30
fd9e4af272
skip ascii thumb resizing if necessary
Rodney Ewing
2013-08-21 16:03:34 -07:00
e2b5634549
skip image resizing if possible
Rodney Ewing
2013-08-21 14:37:44 -07:00
e002452f91
get and set metadata for a MediaFile
Rodney Ewing
2013-08-21 14:34:11 -07:00
2c79dbc5ff
Merge remote-tracking branch 'refs/remotes/rodney757/notifications'
Christopher Allan Webber
2013-08-21 16:00:48 -05:00
0cdebda7fc
only use the width for video thumbnails to keep the correct scaling
Rodney Ewing
2013-08-21 12:38:12 -07:00
f397ef118f
Fixing migration name. webm not wemb :)
Christopher Allan Webber
2013-08-21 14:19:11 -05:00
f6497ce572
Merge remote-tracking branch 'refs/remotes/rodney757/reprocessing'
Christopher Allan Webber
2013-08-21 12:39:31 -05:00
2c901db023
This commit was just to fix a few of the errors with the merging and to make sure that all of the previous tests work fine.
tilly-Q
2013-08-20 15:11:02 -04:00
9de4fab437
rename webm_640 to webm_video since it might be a different resolution
Rodney Ewing
2013-08-20 10:29:38 -07:00
9e204e49c9
Merge branch 'master' into OPW-Moderation-Update
tilly-Q
2013-08-20 12:21:13 -04:00
e1561d0488
This was a very small update, I'm hoping to rebase after this to solve some other problems. I started looking at the tests in this update. This update I spent fixing the tests to work with my new code.
tilly-Q
2013-08-20 12:02:20 -04:00
c9f9536cdf
move links to the bottom of the page until we have a tabbed UI
Rodney Ewing
2013-07-12 13:07:36 -07:00
4710097b27
fix tests to use new change_email view
Rodney Ewing
2013-07-12 12:34:35 -07:00
5a6e4e1307
check for form.password in the off chance that a user is logged in and the server switches the authentication method from basic_auth to openid.
Rodney Ewing
2013-07-12 12:27:41 -07:00
402f436011
maybe have change password and email on same page
Rodney Ewing
2013-07-11 16:16:41 -07:00