3950 Commits

Author SHA1 Message Date
Rodney Ewing
e1ad18cc6d duplicate 2013-08-26 06:33:30 -07:00
Rodney Ewing
7707172e39 copying.txt 2013-08-26 06:33:30 -07:00
Rodney Ewing
53cf5b4556 added tests 2013-08-26 06:33:30 -07:00
Rodney Ewing
1cb84a3632 fixed tests and defaults 2013-08-26 06:33:30 -07:00
Rodney Ewing
ecb4512822 max file size 2013-08-26 06:33:30 -07:00
Rodney Ewing
2f74de492e fixed tests 2013-08-26 06:33:30 -07:00
Rodney Ewing
cc4457f407 fixed tests and defaults 2013-08-26 06:33:29 -07:00
Rodney Ewing
001a50a850 fixed tests and defaults 2013-08-26 06:33:29 -07:00
Rodney Ewing
91a52878cf made no upload limit the default 2013-08-26 06:33:29 -07:00
Rodney Ewing
150bee3f8f typos 2013-08-26 06:33:28 -07:00
Rodney Ewing
c3cce7564a added tests 2013-08-26 06:33:28 -07:00
Rodney Ewing
bdd2242155 added user upload limits 2013-08-26 06:33:28 -07:00
Christopher Allan Webber
7b12cbd98b Removing unnecessary "setup_plugin()" calls, as pointed out by Velmont. 2013-08-25 13:59:34 -05:00
Christopher Allan Webber
6c3d383bbb Merge remote-tracking branch 'refs/remotes/rodney757/email' 2013-08-25 13:23:27 -05:00
Aditi
7d9dbe32cc Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin 2013-08-25 09:24:13 +05:30
tilly-Q
e46fb71c1d pushing so paroneayea can help me resolve a conflict within the tests. 2013-08-23 16:14:36 -04:00
Christopher Allan Webber
e8eec575f3 Not sure why there wasn't a .commit() at the end of add_new_notification_tables()
... but it seems like there should be and it wouldn't hurt.

This commit sponsored by Julio Claudio Matus Ramirez.  Thank you!
2013-08-22 16:04:19 -05:00
Aditi
70cc6eb8f3 Resolve merge conflict and merge. 2013-08-22 22:34:06 +05:30
Rodney Ewing
fd9e4af272 skip ascii thumb resizing if necessary 2013-08-21 16:03:34 -07:00
Rodney Ewing
e2b5634549 skip image resizing if possible 2013-08-21 14:44:18 -07:00
Rodney Ewing
e002452f91 get and set metadata for a MediaFile 2013-08-21 14:44:13 -07:00
Christopher Allan Webber
2c79dbc5ff Merge remote-tracking branch 'refs/remotes/rodney757/notifications' 2013-08-21 16:00:48 -05:00
Rodney Ewing
0cdebda7fc only use the width for video thumbnails to keep the correct scaling 2013-08-21 12:38:12 -07:00
Christopher Allan Webber
f397ef118f Fixing migration name. webm not wemb :) 2013-08-21 14:19:11 -05:00
Christopher Allan Webber
f6497ce572 Merge remote-tracking branch 'refs/remotes/rodney757/reprocessing'
Conflicts:
	mediagoblin/processing/task.py
	mediagoblin/submit/lib.py
2013-08-21 12:39:38 -05:00
tilly-Q
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.
2013-08-20 15:24:29 -04:00
Rodney Ewing
9de4fab437 rename webm_640 to webm_video since it might be a different resolution 2013-08-20 10:29:38 -07:00
tilly-Q
9e204e49c9 Merge branch 'master' into OPW-Moderation-Update
Conflicts:
	mediagoblin/db/models.py
	mediagoblin/decorators.py
	mediagoblin/routing.py
	mediagoblin/user_pages/views.py
2013-08-20 12:21:13 -04:00
tilly-Q
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.

--\ mediagoblin/db/migration_tools.py
--| Merging from ticket 679

--\ mediagoblin/db/migrations.py
--| Added unique constraint to Privilege.privilege_name

--\ mediagoblin/db/models.py
--| Deleted vestigial Privilege.is_admin_or_moderator method

--\ mediagoblin/templates/mediagoblin/moderation/user.html
--| Add a `Ban User` / `UnBan User` for admin

--\ mediagoblin/test/test_api.py
--| Fixed test with my new changes

--\ mediagoblin/test/test_auth.py
--| Try to fix test, still having problems

--\ mediagoblin/test/test_modelmethods.py
--| Wrote my first test for the User.has_privilege method

--\ mediagoblin/test/test_modelmethods.py
--| Fixed test with my new changes

--\ mediagoblin/test/test_sqlmigrations.py
--| Merging from ticket 679

--\ mediagoblin/test/tools.py
--| Editted add_fixture_user to allow for privileges rather than active column
2013-08-20 12:02:20 -04:00
Rodney Ewing
c9f9536cdf move links to the bottom of the page until we have a tabbed UI 2013-08-20 08:25:45 -07:00
Rodney Ewing
4710097b27 fix tests to use new change_email view 2013-08-20 08:25:45 -07:00
Rodney Ewing
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. 2013-08-20 08:25:45 -07:00
Rodney Ewing
402f436011 maybe have change password and email on same page 2013-08-20 08:25:45 -07:00
Rodney Ewing
a30d2d8b6c request object no longer contains notification functions 2013-08-20 08:25:26 -07:00
Rodney Ewing
93d805ad6b add user prefrence for insite notifications 2013-08-20 08:10:50 -07:00
Rodney Ewing
4a2aa93c6a use urlgen and store it in a variable 2013-08-20 08:09:29 -07:00
Rodney Ewing
04d8ced5c6 added test for mark all comment notifications seen 2013-08-20 08:09:29 -07:00
Rodney Ewing
1cca2a6857 Pep 8 2013-08-20 08:09:29 -07:00
Rodney Ewing
d0708da727 add the ability to mark all notifications read. 2013-08-20 08:09:29 -07:00
Rodney Ewing
c62d174437 Oops, this accidently slipped in there
Revert "This patch checks for libs instead of programs in configure.ac for sqlite3 and postgesql."

This reverts commit 26da3271f6e6a880c0418998d5a4e5e71081e1f7.
2013-08-20 07:52:12 -07:00
Rodney Ewing
9041552676 use href='javascript:;' instead of href='#notifications', etc 2013-08-20 07:18:48 -07:00
Rodney Ewing
26da3271f6 This patch checks for libs instead of programs in configure.ac for sqlite3 and postgesql.
Patch submitted by amirouche
2013-08-20 07:03:55 -07:00
Rodney Ewing
d4ae4c9f97 - need self.metadata with BaseProcessingFail
- pass feed_url into ProcessMedia run()
2013-08-19 15:28:51 -07:00
Rodney Ewing
b505952508 -update to latest master
- have mg generate task_id

remove
2013-08-19 15:26:06 -07:00
Sebastian Spaeth
65875f24e4 Remove specific celery version requirement
Any celery above 2.5 should work just fine.
2013-08-19 14:42:39 -07:00
Sebastian Spaeth
41098dff57 Switch deprecated BROKER_HOST to new BROKER_URL
People will need to switch that setting in their mediagoblin.ini too.
Make sure we RELEASE NOTE this.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
2013-08-19 14:42:39 -07:00
Sebastian Spaeth
bf2dafd1a0 Tweak Celery Task
- Make sure Exceptions are pickleable (not sure if this was not the
  case but this is the pattern as documented in the celery docs.
- Don't create a task_id in the GMG code, but save the one
  implicitely created by celery.
- Don't create a task-id directory per upload. Just store queued uploads
  in a single directory (this is the most controversial change and might
  need discussion!!!)

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
2013-08-19 14:42:13 -07:00
Rodney Ewing
bd0b5daa44 -skip persona test is requests is not installed
- should use request.urlgen for location
2013-08-19 14:33:07 -07:00
Alon Levy
e7b8059f17 media_confirm_delete: redirect to next, then prev, then user home
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>
2013-08-17 09:44:02 -07:00
Rodney Ewing
931fa43fbc make sure size is a tuple 2013-08-16 15:30:23 -07:00