Christopher Allan Webber [Sun, 12 Jun 2011 22:42:26 +0000 (17:42 -0500)]
Merge remote branch 'remotes/elrond/idea/simple_proc_media_clean'
Conflicts:
mediagoblin/process_media/__init__.py
cfdv [Sun, 12 Jun 2011 22:35:07 +0000 (17:35 -0500)]
ensure color mode compatibility when making image thumbnails
Christopher Allan Webber [Sun, 12 Jun 2011 22:28:54 +0000 (17:28 -0500)]
First import of mg_globals as mgg, partly because I just wanted it to
be clear that it's okay to do by doing it *somewhere* :)
Christopher Allan Webber [Sun, 12 Jun 2011 22:27:37 +0000 (17:27 -0500)]
mediagoblin.globals->mediagoblin.mg_globals
Christopher Allan Webber [Sun, 12 Jun 2011 14:16:12 +0000 (09:16 -0500)]
Merge remote branch 'remotes/elrond/idea/clean_celery_setup'
Conflicts:
mediagoblin/celery_setup/from_celery.py
Christopher Allan Webber [Sun, 12 Jun 2011 14:11:39 +0000 (09:11 -0500)]
Merge remote branch 'remotes/elrond/idea/tests_kill_db'
Christopher Allan Webber [Sun, 12 Jun 2011 02:23:32 +0000 (21:23 -0500)]
possibly_localize_file->localized_file... a bit less terribly long.
Christopher Allan Webber [Sun, 12 Jun 2011 02:20:39 +0000 (21:20 -0500)]
Switch process_media over to using the workbench.
Christopher Allan Webber [Sun, 12 Jun 2011 02:20:26 +0000 (21:20 -0500)]
Don't bother returning whether or not we copied it or not, we can
figure that out by looking to see whether our storage is local or not.
Christopher Allan Webber [Sun, 12 Jun 2011 01:33:41 +0000 (20:33 -0500)]
Moving workbench out of process_media
Christopher Allan Webber [Sun, 12 Jun 2011 00:49:44 +0000 (19:49 -0500)]
Merge branch 'master' into workbench
Christopher Allan Webber [Sun, 12 Jun 2011 00:48:49 +0000 (19:48 -0500)]
Import mediagoblin.globals as mg_globals so we can be sure things are
set up in the right order.
Christopher Allan Webber [Sun, 12 Jun 2011 00:47:02 +0000 (19:47 -0500)]
Have the application set up instances of the WorkbenchManager.
Christopher Allan Webber [Sun, 12 Jun 2011 00:18:51 +0000 (19:18 -0500)]
test WorkbenchManager.possibly_localize_file()
Christopher Allan Webber [Sun, 12 Jun 2011 00:18:27 +0000 (19:18 -0500)]
We don't need this extra '.' in making the filename
Christopher Allan Webber [Sun, 12 Jun 2011 00:17:44 +0000 (19:17 -0500)]
Added a FakeRemoteStorage, for testing purposes
Christopher Allan Webber [Sat, 11 Jun 2011 23:52:48 +0000 (18:52 -0500)]
Make sure workbench won't kill directories out of scope.
Christopher Allan Webber [Sat, 11 Jun 2011 23:49:04 +0000 (18:49 -0500)]
Tests for creating/destroying workbenches
Christopher Allan Webber [Sat, 11 Jun 2011 22:28:58 +0000 (17:28 -0500)]
Wrote functions and documentation for all the WorkbenchManager
functions but haven't actually tested them yet. :)
Christopher Allan Webber [Sat, 11 Jun 2011 21:48:39 +0000 (16:48 -0500)]
Base structure of workbench manager
Christopher Allan Webber [Sat, 11 Jun 2011 17:04:30 +0000 (12:04 -0500)]
Adding a copy_locally() method to the StorageInterface and giving it a test.
Christopher Allan Webber [Sat, 11 Jun 2011 16:18:03 +0000 (11:18 -0500)]
Allow storage systems to be local and allow for a get_local_path
method if applicable.
Elrond [Fri, 10 Jun 2011 19:59:04 +0000 (21:59 +0200)]
Tests: Kill the whole testing database after all tests
nose allows setup and teardown functions at the package
level. So use this to drop the complete database after all
tests have finished.
Elrond [Fri, 10 Jun 2011 19:20:18 +0000 (21:20 +0200)]
celery_setup: drop param to setup_self and simplify OUR_MODULENAME
setup_self used to look like this:
setup_self(setup_globals_func=setup_globals)
The function isn't called with any param, so drop it.
Rewrite function as needed.
The module var OUR_MODULENAME just has the module's name in
it. This is available as __name__ anyway, so use this to
initialize the var.
Elrond [Wed, 8 Jun 2011 21:22:11 +0000 (23:22 +0200)]
Refactor filename generation in the public store
Just a small refactoring of the filename setup in the
public store. Very simple.
Christopher Allan Webber [Wed, 8 Jun 2011 01:39:51 +0000 (20:39 -0500)]
This attribute in quotes, too. :)
Christopher Allan Webber [Wed, 8 Jun 2011 01:38:05 +0000 (20:38 -0500)]
XML attributes must be in quotes!
Christopher Allan Webber [Tue, 7 Jun 2011 05:36:24 +0000 (00:36 -0500)]
Fixing check_filetype...
We need to check the first part of the guess_type returned tuple, and
also this try: except: doesn't belong here, so killing.
Christopher Allan Webber [Mon, 6 Jun 2011 12:57:05 +0000 (07:57 -0500)]
Added a comment to clarify that this shouldn't stay here.
Christopher Allan Webber [Mon, 6 Jun 2011 12:51:17 +0000 (07:51 -0500)]
Merge remote branch 'remotes/gandaro/324-bad-media-types'
Christopher Allan Webber [Mon, 6 Jun 2011 12:45:18 +0000 (07:45 -0500)]
A setup_fresh_app decorator which should make writing tests a bit easier.
Setting test_register_views() to use it also.
Christopher Allan Webber [Mon, 6 Jun 2011 12:44:12 +0000 (07:44 -0500)]
A clear_test_buckets() method
Christopher Allan Webber [Sun, 5 Jun 2011 23:16:31 +0000 (18:16 -0500)]
Docstring for test_register_views()
Christopher Allan Webber [Sun, 5 Jun 2011 23:14:48 +0000 (18:14 -0500)]
Make sure that two users with the same username can't register.
Christopher Allan Webber [Sun, 5 Jun 2011 22:49:43 +0000 (17:49 -0500)]
Email verification view test works
Christopher Allan Webber [Sun, 5 Jun 2011 22:39:47 +0000 (17:39 -0500)]
Make sure we can register, and then that we get the verification email
Christopher Allan Webber [Sun, 5 Jun 2011 22:35:20 +0000 (17:35 -0500)]
Use render_template utility so we can test whether or not this email
sends
Christopher Allan Webber [Sun, 5 Jun 2011 22:31:18 +0000 (17:31 -0500)]
Moved the verification url generation string template to a global variable
Christopher Allan Webber [Sun, 5 Jun 2011 21:43:25 +0000 (16:43 -0500)]
Make sure that get_test_app() really does wipe the database
Christopher Allan Webber [Sun, 5 Jun 2011 20:58:35 +0000 (15:58 -0500)]
Made a simple template rendering view and switched a bunch of code over to using it
Christopher Allan Webber [Sun, 5 Jun 2011 20:41:08 +0000 (15:41 -0500)]
I have a strong preference for aligning all parameters in a function call.
Christopher Allan Webber [Sun, 5 Jun 2011 20:36:51 +0000 (15:36 -0500)]
Merge remote branch 'remotes/elrond/idea/shortcuts'
Christopher Allan Webber [Sun, 5 Jun 2011 20:33:48 +0000 (15:33 -0500)]
Just a bit of formatting for these unfinished tests ;)
Christopher Allan Webber [Sun, 5 Jun 2011 20:33:28 +0000 (15:33 -0500)]
Instructions for running tests with the modern setup
Christopher Allan Webber [Sun, 5 Jun 2011 20:33:07 +0000 (15:33 -0500)]
New password check error message
Christopher Allan Webber [Sun, 5 Jun 2011 20:30:07 +0000 (15:30 -0500)]
Test registration form integrity
Christopher Allan Webber [Sun, 5 Jun 2011 15:34:29 +0000 (10:34 -0500)]
The first bit of the registration tests working. Not fully there, but
it's clear that the webtest part is working, without having tested the
database yet. :)
Christopher Allan Webber [Sun, 5 Jun 2011 15:33:59 +0000 (10:33 -0500)]
Actually it's a lot better of an idea to load the full application out
of the paste config file the way paste would than to load components
of it ourselves.
Aside from this being nicer, it's also necessary for the sake of
getting the middleware working nicely. We could do it ourselves, but
why bother when paste can just do it for us?
Christopher Allan Webber [Sun, 5 Jun 2011 15:31:29 +0000 (10:31 -0500)]
We should store the template path, not the template object, as the key
in our testing cache
Elrond [Sun, 5 Jun 2011 13:49:08 +0000 (15:49 +0200)]
Create redirect shortcut and use it around
This is just replacing exc.HTTPFound(location=request.urlgen(...))
by redirect(request, ...). No magic.
Elrond [Sun, 5 Jun 2011 14:02:12 +0000 (16:02 +0200)]
Reformat render_to_response calls
Just a simple indentation and ordering change, no
functional change.
Elrond [Sun, 5 Jun 2011 13:25:45 +0000 (15:25 +0200)]
Create render_to_reponse and use it everywhere.
Just a shortcut for Response(render_template(...))
Christopher Allan Webber [Sun, 5 Jun 2011 14:14:38 +0000 (09:14 -0500)]
Firefox 3.X shows hidden fields for some reason, adding display: none;
to be rid of them for sure
Christopher Allan Webber [Sat, 4 Jun 2011 22:36:36 +0000 (17:36 -0500)]
Moving all views over to using util.render_template()!
Christopher Allan Webber [Sat, 4 Jun 2011 21:44:22 +0000 (16:44 -0500)]
Cache template environments and gettexts so we don't have to reproduce
them on every request.
Christopher Allan Webber [Sat, 4 Jun 2011 21:32:13 +0000 (16:32 -0500)]
Added new render_template method which will make our lives nicer and
also will be useful for unit testing purposes :)
Christopher Allan Webber [Sat, 4 Jun 2011 18:20:48 +0000 (13:20 -0500)]
Proper webtest infrastructure... seems to be about right anyway :)
Christopher Allan Webber [Sat, 4 Jun 2011 13:48:51 +0000 (08:48 -0500)]
Mount media editing under /u/{username}/m/{media}/edit/
Christopher Allan Webber [Sat, 4 Jun 2011 13:48:17 +0000 (08:48 -0500)]
Let's redirect back to the media homepage using the slug instead of the id
Christopher Allan Webber [Sat, 4 Jun 2011 12:41:31 +0000 (07:41 -0500)]
I shouldn't have removed the .save() entirely :)
Christopher Allan Webber [Fri, 3 Jun 2011 23:47:22 +0000 (18:47 -0500)]
Title first and foremost... anything else looks weird to me.
Christopher Allan Webber [Fri, 3 Jun 2011 23:43:20 +0000 (18:43 -0500)]
Merge branch 'media_edit'
Christopher Allan Webber [Fri, 3 Jun 2011 23:43:08 +0000 (18:43 -0500)]
Find out if such a slug exists via a query instead of via a .save() call
Elrond [Fri, 3 Jun 2011 21:54:33 +0000 (23:54 +0200)]
Propagate Exceptions up in Celery-Eager-Mode
When running in celery-eager mode, the celery machinery
hides all exceptions inside "celery tasks" (you can find
out about them on the task handle somehow). Currently much
better to propagate them straight up, so they're visible on
the console.
Aleksandar Micovic [Fri, 3 Jun 2011 01:07:37 +0000 (21:07 -0400)]
Refactored the sending of verification emails.
Christopher Allan Webber [Thu, 2 Jun 2011 21:30:06 +0000 (16:30 -0500)]
attribute values should be quoted :)
Christopher Allan Webber [Thu, 2 Jun 2011 21:04:17 +0000 (16:04 -0500)]
No reason for 'verification_successful = bool' here.
Elrond [Thu, 2 Jun 2011 16:28:26 +0000 (18:28 +0200)]
Add GNU headers to new *.py
Jakob Kramer [Thu, 2 Jun 2011 15:47:38 +0000 (17:47 +0200)]
add changes in mediagoblin/submit/views.py
Jakob Kramer [Thu, 2 Jun 2011 15:35:20 +0000 (17:35 +0200)]
should fix #324
Elrond [Thu, 2 Jun 2011 15:43:54 +0000 (17:43 +0200)]
Handle Exceptions from save(); Move may_edit_media
Turn .save() excpetions into a HTTPConflict. Not nice, but
at least the user gets the error. Until there is a proper
way to validate things and get nice errors.
Move may_edit_media() to lib.py, as it's not a view.
Elrond [Thu, 2 Jun 2011 14:48:15 +0000 (16:48 +0200)]
Prepare for moving /edit/ under /u/.../edit/
To make moving the whole thing under /u/ easier, prepare to
pass in the {user} needed for that.
Elrond [Thu, 2 Jun 2011 14:39:47 +0000 (16:39 +0200)]
Change edit form to use divs instead of table
Christopher Allan Webber [Thu, 2 Jun 2011 14:02:13 +0000 (09:02 -0500)]
No need for a method for generating the verification key as a method
on the class, can just do that in the view
Christopher Allan Webber [Thu, 2 Jun 2011 13:47:30 +0000 (08:47 -0500)]
Elrond put that ObjectId thing in the db.util module and wants us to
use that one ;)
Elrond [Thu, 2 Jun 2011 12:33:26 +0000 (14:33 +0200)]
Merge remote branch 'upstream/master'
Conflicts:
mediagoblin/templates/mediagoblin/user_pages/media.html
Elrond [Thu, 2 Jun 2011 12:25:31 +0000 (14:25 +0200)]
Check for edit permission.
You need to own the media, or be an admin to use the edit form.
As simple as that, for now.
Christopher Allan Webber [Wed, 1 Jun 2011 00:54:26 +0000 (19:54 -0500)]
0.0.2 of GNU MediaGoblin!
Christopher Allan Webber [Wed, 1 Jun 2011 00:37:28 +0000 (19:37 -0500)]
If a user doesn't provide a userid and a token to the verify_email function, might as well 404
Christopher Allan Webber [Wed, 1 Jun 2011 00:31:23 +0000 (19:31 -0500)]
Moving import to outside of this function
Christopher Allan Webber [Wed, 1 Jun 2011 00:30:05 +0000 (19:30 -0500)]
Just adjusting some spacing so we don't go over 80 chars
Christopher Allan Webber [Wed, 1 Jun 2011 00:29:36 +0000 (19:29 -0500)]
Give a "proper" view for resending verification email
Christopher Allan Webber [Wed, 1 Jun 2011 00:17:28 +0000 (19:17 -0500)]
Merge remote branch 'remotes/aleks/aleks'
Aleksandar Micovic [Tue, 31 May 2011 21:14:23 +0000 (17:14 -0400)]
Added the ability to regenerate a verification key.
Aleksandar Micovic [Tue, 31 May 2011 19:26:00 +0000 (15:26 -0400)]
Fixed bug where someone who wasn't logged in was asked to verify
their emails.
Aleksandar Micovic [Tue, 31 May 2011 03:51:30 +0000 (23:51 -0400)]
Added a temporary verification page informing the user they need
to authenticate.
Christopher Allan Webber [Mon, 30 May 2011 23:06:12 +0000 (18:06 -0500)]
Add an index on MediaEntries making sure slugs + uploader combos are unique
Christopher Allan Webber [Sun, 29 May 2011 22:49:03 +0000 (17:49 -0500)]
Use the object gallery file on the front page also
Christopher Allan Webber [Sun, 29 May 2011 22:43:18 +0000 (17:43 -0500)]
This <ul /> not used (second inside), removing
Jakob Kramer [Sun, 29 May 2011 17:49:25 +0000 (19:49 +0200)]
remove all 'username_repr' stuff
Jakob Kramer [Sun, 29 May 2011 17:17:44 +0000 (19:17 +0200)]
don't import 're'
Jakob Kramer [Sun, 29 May 2011 17:15:46 +0000 (19:15 +0200)]
this should fix #354
Jef van Schendel [Sun, 29 May 2011 00:02:26 +0000 (02:02 +0200)]
First changes to media gallery view
Jef van Schendel [Sat, 28 May 2011 23:53:41 +0000 (01:53 +0200)]
Slightly modified text on media page
Jef van Schendel [Sat, 28 May 2011 23:47:12 +0000 (01:47 +0200)]
Centered image on media page
Jef van Schendel [Sat, 28 May 2011 23:43:12 +0000 (01:43 +0200)]
Modified logo to change on :hover
Jef van Schendel [Sat, 28 May 2011 23:14:48 +0000 (01:14 +0200)]
Changed submit form to divs
Joar Wandborg [Sat, 28 May 2011 21:56:29 +0000 (23:56 +0200)]
Changed <p> font from 'sans' to 'sans-serif'
Joar Wandborg [Sat, 28 May 2011 21:54:15 +0000 (23:54 +0200)]
Changed <body> font from 'sans' to 'sans-serif'
Joar Wandborg [Sat, 28 May 2011 21:52:00 +0000 (23:52 +0200)]
Merge branch 'master' of git://gitorious.org/~schendje/mediagoblin/schendjes-mediagoblin