3327 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
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
e7c08e3550 load js at the end of the page 2013-08-16 11:49:33 -07:00
Rodney Ewing
fb2f2bece2 use urlgen 2013-08-16 11:48:03 -07:00
Rodney Ewing
fb900ef27b Merge branch 'auth_docs'
Conflicts:
	docs/source/index.rst
2013-08-16 10:24:41 -07:00
Rodney Ewing
71b2bee622 fix persona tests by using a correct query 2013-08-15 17:36:56 -07:00
Christopher Allan Webber
fc714df00d Removing PyPump as we aren't using it yet and there's a dependency conflict ;| 2013-08-15 18:29:35 -05:00
Christopher Allan Webber
97b9b98c1e Merge branch 'persona_resquash' 2013-08-15 17:07:14 -05:00
Christopher Allan Webber
cd612ee689 Removing the whitespace betwetween action= and its value 2013-08-15 15:17:02 -05:00
Christopher Allan Webber
4834ef8ec2 Merge remote-tracking branch 'refs/remotes/tsyesika/master'
New oauth tools!  Heck yeah!
2013-08-15 10:34:20 -05:00
Christopher Allan Webber
29cd702e47 Fix notifications, which I broke.
This commit sponsored by Denver Gingerich.  Thank you!
2013-08-14 15:57:58 -05:00
Christopher Allan Webber
7949d88a75 Avoiding the celery warnings that we seem to be confusing people lately.
Basically, it's shuffling around the notifications stuff.

This commit sponsored by Günter Kraft.  Thank you!
2013-08-14 15:08:49 -05:00
tilly-Q
8394febbe1 This has been an update to clean out the code a little bit. The primary change
I made was I added the method has_privilege (which takes a variable amount of
unicode privilege names as an argument) to the User model. This method allowed
for much cleaner checks as to whether or not a user has a privilege. Other-
wise, I also made it impossible for moderators to punish admins. I created a
new url path and three new pages for Users to look at filed reports and the
code of conduct for the mg instance.

=== Made reports on admins not resolvable by moderators:
--\   mediagoblin/moderation/views.py
--\   mediagoblin/templates/mediagoblin/moderation/report.html

=== Created new files for the new pages:
--\   mediagoblin/meta/__init__.py
--\   mediagoblin/meta/routing.py
--\   mediagoblin/meta/views.py
--\   mediagoblin/templates/mediagoblin/meta/code_of_conduct.html
--\   mediagoblin/templates/mediagoblin/meta/reports_details.html
--\   mediagoblin/templates/mediagoblin/meta/reports_panel.html
--\   mediagoblin/routing.py
--\   mediagoblin/static/css/base.css

=== Replaced vestigial methods of checking a user's privilege with the more
====== effective method has_privilege(u'privilege_name'):
--\   mediagoblin/db/models.py
--|   Added in the has_privilege method to the User class

--\   mediagoblin/db/migrations.py
--\   mediagoblin/db/models.py
--\   mediagoblin/decorators.py
--\   mediagoblin/edit/lib.py
--\   mediagoblin/edit/views.py
--\   mediagoblin/gmg_commands/users.py
--\   mediagoblin/moderation/views.py
--\   mediagoblin/templates/mediagoblin/base.html
--\   mediagoblin/templates/mediagoblin/user_pages/collection.html
--\   mediagoblin/templates/mediagoblin/user_pages/media.html
--\   mediagoblin/templates/mediagoblin/user_pages/user.html
--\   mediagoblin/templates/mediagoblin/utils/collection_gallery.html
--\   mediagoblin/user_pages/views.py

=== Minor UI changes
--\   mediagoblin/templates/mediagoblin/moderation/report_panel.html
--\   mediagoblin/templates/mediagoblin/moderation/user.html

=== Other Bugs:
--\   mediagoblin/tools/response.py
--\   mediagoblin/db/migrations.py
2013-08-13 18:38:00 -04:00
Jessica Tallon
89909bd692 Fix import errors when running tests 2013-08-13 11:25:40 +01:00
Rodney Ewing
135dd5296b change dropdown button to <a> from <div> so that it is tabbable 2013-08-09 11:38:55 -07:00
Rodney Ewing
d7ecae5a4e Revert "slugs are now generated during processing"
This reverts commit 9da4e8049f2de900f7aa12f2fed8c60d6749ff0b.
2013-08-08 15:49:51 -07:00
Rodney Ewing
b26edfb944 Revert "Leave slug empty until we are sure media processing was successful."
This reverts commit f67611fb485b5a84cedc62b73beb1e551e8cb934.

For some reason, generating a slug here throws an integrity error during
a query when there is a duplicate slug.
2013-08-08 15:49:33 -07:00
Christopher Allan Webber
4de7db6fef Switching the MediaGoblin homepage image over to using the "official" gavroche style 2013-08-08 14:15:47 -05:00
Rodney Ewing
8fc57eaaa6 Add ?next= when trying to add a comment when not logged in 2013-08-08 11:07:12 -07:00
Rodney Ewing
202d951c3d Render 404 if not ajax request 2013-08-07 17:13:38 -07:00
Rodney Ewing
b2d6c45850 change interval to 1000ms 2013-08-07 16:58:06 -07:00
Emily O'Leary
3bd62dc4ca Changed how the comment was encoded/read.
Fixed CSRF + Post with comment preview.
Merged with latest master
2013-08-07 16:33:58 -07:00
Emily O'Leary
3cf4ae0c41 Changed the target of the markdown links for opening in a new tab as suggested by joar. 2013-08-07 16:33:10 -07:00
Emily O'Leary
bb3299ce21 Added i18n to my javascript changes as per trac #417 2013-08-07 16:33:09 -07:00
Emily O'Leary
5ab6029961 Added comment preview functionality to user pages. It works by passing the comment's value as a JSON string to a new handler that lives at /ajax/comment/preview. The query string is decoded, unquoted, and has its leading and trailing quotes removed to match the input that cleaned_markdown_conversion expects.
It does this in real time with a 500ms lag by using a timer. Initially I tried the onChange handler but you need to lose focus for that to process. The javascript timer is only invoked if the add comment button is pressed. A request is only sent if the comment box is not empty and the current value is not the same as the last value.
2013-08-07 16:33:09 -07:00
Rodney Ewing
9da4e8049f slugs are now generated during processing 2013-08-07 16:19:57 -07:00
Rodney Ewing
f67611fb48 Leave slug empty until we are sure media processing was successful.
Patch submitted by LotusEcho
2013-08-07 16:15:27 -07:00
Kenneth Dombrowski
155d234d95 * create config option for optional jinja2 extensions
* add comments & clarify code for jinja2 extensions

Conflicts:
	mediagoblin/config_spec.ini
2013-08-07 16:02:09 -07:00
Rodney Ewing
2ed6afb048 Use the workbench for video processing.
Patch submitted by Kushal
2013-08-07 15:31:40 -07:00
Christopher Allan Webber
316ede4705 autoplay is now by default False for videos.
This commit sponsored by Vasili Sviridov.  Thank you!
2013-08-07 15:03:37 -05:00
Christopher Allan Webber
24e6c34e88 Merge branch 'merge-pyconfigure'
Conflicts:
	docs/source/siteadmin/deploying.rst
2013-08-07 11:57:12 -05:00
Rodney Ewing
31de493e41 typo fix in foundations branch 2013-08-02 07:31:09 -07:00
Rodney Ewing
bf5a8e5452 Merge remote-tracking branch 'tilly-q/ticket-679' 2013-08-02 07:28:35 -07:00
tilly-Q
84c1cd7c52 I added a few more unitests in this commit. It now confirms that even after mi-
-gration, there is only one of each Foundation object.
2013-07-31 20:50:38 -04:00
tilly-Q
07e61ef13a Merge branch 'ticket-679' of gitorious.org:~npigeon/mediagoblin/npigeons-mediagoblin 2013-07-31 20:49:07 -04:00
tilly-Q
860fa806ee In this commit I added a few unittests to account for Foundations. There were
only a few tests I had to add to mediagoblin/tests/test_sql_migrations.py beca-
-use the foundation creation only happens at database initialization.
2013-07-31 20:12:35 -04:00
tilly-Q
9d6e453f8f This commit was the work I did fixing errors that cropped up from the merge.
There were a few errors because of the switch from sqlalchemy 0.7 to 0.8 but I
cleared them up.
2013-07-31 20:11:26 -04:00
Rodney Ewing
2119ee3b90 Merge commit 'refs/merge-requests/55' of git://gitorious.org/mediagoblin/mediagoblin into 55
Conflicts:
	docs/source/siteadmin/relnotes.rst
2013-07-31 15:27:22 -07:00
Rodney Ewing
9b60486894 minor styling updates to docs 2013-07-31 15:16:52 -07:00
Rodney Ewing
bc23c8b9b6 Merge commit 'refs/merge-requests/59' of git://gitorious.org/mediagoblin/mediagoblin into merge-requests/59 2013-07-31 15:07:44 -07:00