1596 Commits

Author SHA1 Message Date
Elrond
809cbfc5ab Dot-Notation for Users.email 2011-12-05 21:08:57 +01:00
Elrond
5a4e3ff1e2 Dot-Notation for Users.username 2011-12-05 21:08:57 +01:00
Christopher Allan Webber
5b5b67cd5c Update comment URLs to use the media slug. 2011-12-05 08:37:20 -06:00
Christopher Allan Webber
bcc9ee3205 Update the delete item to use the _id after all... it's the safest way.
See http://bugs.foocorp.net/issues/695
2011-12-05 08:35:42 -06:00
Christopher Allan Webber
38f102515a Cloudfiles not actually a dependency, removing from setup.py
If users want cloudfiles, they can always ./bin/easy_install it.
2011-12-04 23:58:58 -06:00
Christopher Allan Webber
04b0b7a124 Merge remote-tracking branch 'remotes/lorochka85/bug852_use_media_slug_instead_of_id'
Conflicts:
	mediagoblin/decorators.py
	mediagoblin/templates/mediagoblin/user_pages/media.html
	mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
2011-12-04 23:14:08 -06:00
tycho garen
a085dda5d2 DOCS:: #675 revision to deployment and production documents 2011-12-04 17:09:39 -05:00
Christopher Allan Webber
4752fdcf06 Filled in reason #3 to submit separate out celery. 2011-12-04 15:27:00 -06:00
Christopher Allan Webber
2ef0679790 Fix button word-wrapping issue 2011-12-04 14:39:42 -06:00
Christopher Allan Webber
83b581e425 Merge remote-tracking branch 'tychoish/master' 2011-12-04 13:59:13 -06:00
Christopher Allan Webber
5b972a192e Compiled the .mo files too 2011-12-04 13:57:35 -06:00
Christopher Allan Webber
b3efea3c79 Updated translations 2011-12-04 13:56:55 -06:00
tycho garen
b25b00d26e DOCS: update to deployment documentation and new production deployments doc 2011-12-04 14:51:00 -05:00
Christopher Allan Webber
f79886023f Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin 2011-12-04 11:06:08 -06:00
Christopher Allan Webber
f80f5b58a8 Removing the conditional that checks if there's a media in media.html
If there isn't a media, we shouldn't hit that template!  The view
should ensure that.
2011-12-04 10:24:42 -06:00
Christopher Allan Webber
21e8432956 Change "Your finest source of goblin related media" to something else
We don't want to insist everyone hold a goblin-related gallery :)
2011-12-04 10:21:58 -06:00
Elrond
ea5a5b15a3 Merge branch 'misc/fixture_add_user'
* misc/fixture_add_user:
  fixture_add_user: Factoring a unit test tool
2011-12-04 14:59:33 +01:00
Christopher Allan Webber
bb20c179c4 Most users won't see this but having space after prompt still nice for passwords. 2011-12-03 21:59:52 -06:00
Christopher Allan Webber
bbac7663f4 PEP-8'ifying prompt_if_not_set 2011-12-03 21:56:30 -06:00
Christopher Allan Webber
cfd20ed6a1 Merge remote-tracking branch 'remotes/manolinux/645_gmg_adduser_prompt' 2011-12-03 21:43:15 -06:00
Christopher Allan Webber
cc4f83faab Raise a slightly useful exception when we can't find the media type. 2011-12-03 21:38:45 -06:00
Christopher Allan Webber
a6f065632a Updated translations 2011-12-03 16:59:20 -06:00
Elrond
6603b30041 Merge remote branch 'remotes/manolinux/671_spaces_in_tag_list_edit'
* remotes/manolinux/671_spaces_in_tag_list_edit:
  * Feature #678: Drop custom delimiters in tags   * Eliminate the definition of the tag delimiter for tests.   * Remove a test that was related to custom tags delimiter. * Bug #671: Tags list on Edit page is not seperated by spaces and hard to read   * Modify a test to include this space.
  * Bug #671: Tags list on Edit page is not seperated by spaces and hard to read : Make 'media_tags_as_string' function put a space after each comma. * Feature #678: Drop custom delimiters in tags : I declare a constant in the begining of text.py file.
2011-12-03 22:11:54 +01:00
Elrond
71c6c432a5 Bug #685: only provide CSRF token if it exists
This was suggested by Nathan Yergler in the bug logs.
Just implementing it.

- Let render_csrf_form_token return None, if the CSRF_TOKEN
  is not available in the environ, because the
  process_request part of the meddleware has not yet run.

- In render_template: If the returned value from above is
  None, then do not add the csrf_token to the templates
  context.
2011-12-03 21:25:55 +01:00
Elrond
968dd9e735 Bug #685: Add failing unit test
The simplest way to reproduce Bug #685 is to ask for a non
existent page. This should return a proper 404. It
currently doesn't.
So add a unit test exactly for this.

This unit test fails currently! It will fail until the bug
gets fixed.
2011-12-03 16:50:36 +01:00
Manuel Urbano Santos
7d98005a6b Prompt for arguments in adduser if not present (I created a function in util.py to check and prompt for arguments). 2011-12-03 15:36:02 +01:00
Manuel Urbano Santos
d463055317 Change adduser arguments from positional to --keyword style. 2011-12-03 14:29:28 +01:00
Jef van Schendel
eae7d0585f Changed comment error message wording slightly. Btw, should we translate these things? 2011-12-03 01:19:15 +01:00
Jef van Schendel
0d6e5dddeb Add show-password checkbox and make it work 2011-12-02 23:48:40 +01:00
Christopher Allan Webber
1e9d1acc03 We should use the variable local_templates instead of user_template_path 2011-12-02 16:13:14 -06:00
Jef van Schendel
92417fc535 First push with jQuery library 2011-12-02 21:17:55 +01:00
Elrond
93e4622491 Expect 404 in unit tests, if we now use 404.
Our unit tests for auth were expecting a 400.
Well, now we give a 404. So expect that!

I'm not completely sure, if the 404 is the right thing
here, but that's another topic.
2011-12-02 00:09:13 +01:00
Christopher Allan Webber
8e2af2843f Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin 2011-12-01 16:59:22 -06:00
Christopher Allan Webber
c7e1fee1b8 Should be 404 for 404s, not 400 :) 2011-12-01 16:58:56 -06:00
Elrond
9754802d4b fixture_add_user: Factoring a unit test tool
Some unit tests need a user in the database, especially to
act as that user.  Some routines did that on their own.  So
factored this whole thing into a new function and use it
around.
2011-12-01 23:33:47 +01:00
Christopher Allan Webber
813be2938a Don't barf on templates that use the autoescaping extension 2011-12-01 15:21:15 -06:00
Elrond
72567762e3 Merge remote branch 'remotes/nyergler/issue-680-csrf-optout'
* remotes/nyergler/issue-680-csrf-optout:
  Issue 680 Allow decorating views to prevent CSRF protection.
  Issue 680: Dispatch meddleware request processing post-routing
2011-11-28 18:40:45 +01:00
Elrond
a3663b4079 Mark two strings for translation
1. "Go to page:" in pagination
2. "Submit" in the forget password form
2011-11-28 09:45:15 +01:00
Elrond
088c59545f Merge remote branch 'remotes/manolinux/683_text_separate_tags_by_commas_and_spaces'
* remotes/manolinux/683_text_separate_tags_by_commas_and_spaces:
  Fix the text "Seperate tags by commas and spaces" since spaces are not used to seperate anymore.
2011-11-27 23:23:20 +01:00
Christopher Allan Webber
19e2668b77 Updating translations 2011-11-27 15:31:42 -06:00
Manuel Urbano Santos
9382221fe2 Fix the text "Seperate tags by commas and spaces" since spaces are not used to seperate anymore. 2011-11-27 14:31:20 +01:00
Manuel Urbano Santos
d5bb51f9d4 * Feature #678: Drop custom delimiters in tags
* Eliminate the definition of the tag delimiter for tests.
  * Remove a test that was related to custom tags delimiter.
* Bug #671: Tags list on Edit page is not seperated by spaces and hard to read
  * Modify a test to include this space.
2011-11-27 13:55:07 +01:00
Manuel Urbano Santos
3038ba87e4 * Bug #671: Tags list on Edit page is not seperated by spaces and hard to read : Make 'media_tags_as_string' function put a space after each comma.
* Feature #678: Drop custom delimiters in tags : I declare a constant in the begining of text.py file.
2011-11-27 13:49:47 +01:00
Nathan Yergler
ca9ebfe2e0 Issue 680 Allow decorating views to prevent CSRF protection. 2011-11-26 15:32:35 -08:00
Nathan Yergler
91cf67385a Issue 680: Dispatch meddleware request processing post-routing 2011-11-26 14:34:36 -08:00
Elrond
e4113ad5b4 Merge remote branch 'remotes/inconexo/588_lowercase_extension'
* remotes/inconexo/588_lowercase_extension:
  Filename extensions are lowercased before uploading the image.

The merge failed really. It tried to apply the changes to
the wrong file. So applied them by hand to
	mediagoblin/media_types/image/processing.py

Conflicts:
	mediagoblin/processing.py
2011-11-26 13:50:06 +01:00
Elrond
5568a01419 Use setup_global_and_app_config in gmg's migrate.
Instead of using read_mediagoblin_config, forgetting to
check the validation report and then finding the main app
section by hand, just use setup_global_and_app_config.
2011-11-26 11:50:25 +01:00
Elrond
56dc1c9d3e Add base class for Meddleware
Created a BaseMeddleware which all Meddleware should derive
from. This is not strictly needed, but will greatly help.

The base class has the common __init__ of all the other
Meddlwares and fall backs for all hooks. That way a new
Meddlware only needs to override what it actually wants to
implement.
2011-11-25 22:16:18 +01:00
Christopher Allan Webber
1b7662012f Uncommenting requires=['gst'] till I figure out why Joar added it there :) 2011-11-25 12:33:34 -06:00
Christopher Allan Webber
ce5ae8da19 Rename MediaGoblin middleware to meddleware to avoid confusion w/ wsgi middleware
hehehehehe, "meddleware"
2011-11-25 12:13:56 -06:00