4173 Commits

Author SHA1 Message Date
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
Rodney Ewing
0a8c0c704d Keep the best quality file if there's no original 2013-08-16 15:30:23 -07:00
Rodney Ewing
7674b9c05b for some reason, the minimum thumbnail size for videos is 100 x 100 2013-08-16 15:30:23 -07:00
Rodney Ewing
1cefccc755 refactor get_orig_filename to return an acceptable filename to the processor.
If there is an original video file and we skip transcoding, delete the webm_640 file
2013-08-16 15:30:23 -07:00
Rodney Ewing
9b1317e3e2 make medium dimensions a tuple 2013-08-16 15:30:23 -07:00
Rodney Ewing
8bb0df62d4 check medium_size arg in skip_transcoding, not config 2013-08-16 15:30:23 -07:00
Rodney Ewing
882779f547 only try and delete queue file if it exists 2013-08-16 15:30:23 -07:00
Rodney Ewing
23a3703a1d use thumb_size 2013-08-16 15:30:22 -07:00
Rodney Ewing
3225008f04 include a thumb_size string with each Resizer to run gmg reprocess thumbs 2013-08-16 15:30:22 -07:00
Rodney Ewing
63021eb609 typos 2013-08-16 15:30:22 -07:00
Rodney Ewing
a2f501982a add quality and filter args to image processors 2013-08-16 15:30:22 -07:00
Rodney Ewing
d63f78fad9 forgot to add the ascii resizer to the list of processors 2013-08-16 15:30:22 -07:00
Rodney Ewing
7d3fda06b0 catch processing exceptions and if entry_orig_state is processed, then ignore the exception 2013-08-16 15:30:22 -07:00
Rodney Ewing
79f84d7e47 raise an error if the file failed to copy to public storage
catch copy_local_to_storage errors and raise PublicStoreFail, saving the keyname
2013-08-16 15:30:22 -07:00
Rodney Ewing
100a73a298 force thumbnail creation of audio 2013-08-16 15:30:22 -07:00
Rodney Ewing
b95cc59bb9 size should be a tuple 2013-08-16 15:30:22 -07:00
Rodney Ewing
8a528add8b rewind the file to the begining 2013-08-16 15:30:21 -07:00
Rodney Ewing
7a89d27c80 -scale-to only takes 1 size, so choose the smallest 2013-08-16 15:30:21 -07:00
Rodney Ewing
d4380b52b6 include '.png' in filename 2013-08-16 15:30:21 -07:00
Rodney Ewing
96109a58da oops, localized_file not local_file 2013-08-16 15:30:21 -07:00
Rodney Ewing
e7672e5b48 use a tmp_pdf filename 2013-08-16 15:30:21 -07:00
Rodney Ewing
61b3fc5078 don't include the '.' in the ext 2013-08-16 15:30:21 -07:00
Rodney Ewing
2e90b2be16 forgot to change __init__ for new processing managers 2013-08-16 15:30:21 -07:00
Rodney Ewing
2834d84c0c Cleanup image common processor 2013-08-16 15:30:21 -07:00
Rodney Ewing
a3cc93c6af added resizer for stl media 2013-08-16 15:30:21 -07:00
Rodney Ewing
77daec9224 Added initial stl processor 2013-08-16 15:30:21 -07:00
Rodney Ewing
ab64ca3474 add reprocess_manager to __init__ 2013-08-16 15:30:21 -07:00
Rodney Ewing
40554b3395 Use workbench for temp files, refactor _set_pdf_filename, and correct imports 2013-08-16 15:30:21 -07:00