heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,218 Commits 1 Branch 0 Tags
Commit Graph

1042 Commits

Author SHA1 Message Date
Elrond
b81926f614 Merge remote branch 'aaronw/bug601_blank_comments' 
* aaronw/bug601_blank_comments:
  Make Comment posted! translatable.
  Update english translation file.
  Added a check to prevent blank messages from being posted.

Conflicts:
	mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po
 2011-10-15 14:59:52 +02:00
Elrond
404d8fa9ae Merge remote branch 'aaronw/bug608_checkbox_labels' 
* aaronw/bug608_checkbox_labels:
  No need to translate label name.
  Add label tag to fix translation issue.
  Update english translation file.
  Checkbox label is being translated in the form definition -- translating it in the template is redundant and breaks <label> functionality.

Conflicts:
	mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po
 2011-10-15 14:15:36 +02:00
Elrond
b06e4f3b2d Improve indentation a bit 
Only change: Indentation, nothing else!
 2011-10-15 13:56:59 +02:00
Elrond
48ba47b570 Merge remote branch 'aaronw/feature469_comment_form_under_comments' 
* aaronw/feature469_comment_form_under_comments:
  Put the trans tag in the right place.
  Move comment form below comments.
 2011-10-15 13:54:58 +02:00
Aaron Williamson
f7ede646e4 Put the trans tag in the right place. 2011-10-14 19:33:48 -04:00
Christopher Allan Webber
c0022ecc88 Fixing 404s, related to recent util refactoring. 2011-10-05 20:57:02 -05:00
Aaron Williamson
2b3a50db43 Make Comment posted! translatable. 2011-10-04 16:32:41 -04:00
Aaron Williamson
29264e0d74 No need to translate label name. 2011-10-04 16:12:43 -04:00
Aaron Williamson
ad6d2277da Add label tag to fix translation issue. 2011-10-04 16:11:47 -04:00
Aaron Williamson
b7206469fa Move comment form below comments. 2011-10-03 21:32:36 -04:00
Aaron Williamson
04590de053 Update english translation file. 2011-10-03 21:06:28 -04:00
Aaron Williamson
52bc9a31da Update english translation file. 2011-10-03 21:05:23 -04:00
Aaron Williamson
7298ffa11b Added a check to prevent blank messages from being posted. 2011-10-03 21:03:36 -04:00
Aaron Williamson
c302bcd918 Checkbox label is being translated in the form definition -- translating it in the template is redundant and breaks <label> functionality. 2011-10-03 20:47:39 -04:00
Christopher Allan Webber
4d7a93a493 Adding csrf token fields to the forgot password calls 2011-10-01 21:31:14 -05:00
Christopher Allan Webber
88233cb282 Fixing indentation in start.html 2011-10-01 21:30:41 -05:00
Christopher Allan Webber
b43b17fc26 Merge remote branch 'remotes/aaronw/bug444_fix_utils_py_redux' 
Conflicts:
	mediagoblin/util.py
 2011-10-01 21:27:36 -05:00
Christopher Allan Webber
e27396802c Merge remote branch 'remotes/jwandborg/storage_split_fix' 2011-10-01 20:54:24 -05:00
Christopher Allan Webber
1268521b20 Merge remote branch 'remotes/nyergler/569-application-middleware' 2011-10-01 20:45:43 -05:00
Aaron Williamson
91e42c467d Merge branch 'mediagoblin-upstream' into bug444_fix_utils_py_redux 2011-10-01 18:09:49 -04:00
Aaron Williamson
152a3bfaa3 Finished splitting util.py into separate files. 2011-10-01 18:05:44 -04:00
Aaron Williamson
03ae172a60 Finished splitting util.py into separate files. 2011-10-01 18:05:17 -04:00
Nathan Yergler
9202e5a1e1 #361: Removing additional secret key, per CW's request. 2011-10-01 14:24:49 -07:00
Nathan Yergler
4f475d3024 #361 Unit tests for CSRF Middleware 2011-10-01 14:21:02 -07:00
Nathan Yergler
7e694e5fd8 #361: Don't test for CSRF token if we're running unit tests. 2011-10-01 14:20:35 -07:00
Nathan Yergler
5d2abe45b2 PEP8-ification. 2011-10-01 12:48:43 -07:00
Nathan Yergler
6bfbe02426 Merge remote-tracking branch 'refs/remotes/upstream/master' into 569-application-middleware 
Conflicts:
	mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
 2011-10-01 12:08:58 -07:00
Aaron Williamson
7ce09f6ac4 Merge branch 'mediagoblin-upstream' into bug444_fix_utils_py_redux 2011-10-01 09:32:43 -04:00
Aaron Williamson
ae3bc7fabf Moved common, translation, template, and url code out of util.py and into tools/[file].py 2011-10-01 09:31:42 -04:00
Elrond
bf33272f03 Give debug message in email debug mode 
If the server is running in email debug mode (current
default), users have often asked where the mail is. So tell
them in the web browser that their mail is on the console.
 2011-09-30 22:27:47 +02:00
Christopher Allan Webber
573aba86b5 Merge remote branch 'remotes/elrond/misc/use_staticdirect' 2011-09-28 17:33:03 -05:00
Christopher Allan Webber
e9b2d7b498 Updating translations 2011-09-25 20:31:00 -05:00
Christopher Allan Webber
31370dbc2c Stripping out whitespace on these translation blocks. 
{% trans -%}
  ;o
{%- endtrans %}
 2011-09-25 20:26:06 -05:00
Joar Wandborg
dd1756ee19 mountstorage - Changed typo in import 2011-09-15 13:19:25 +02:00
Elrond
32d1a69d2f Templates: Use request.staticdirect instead of /mgoblin_static 
Any reference to static, shipped content should use
request.staticdirect instead of the default path.

Especially if hosting mediagoblin via fastcgi, the paths
might need changing.
 2011-09-14 19:52:47 +02:00
Christopher Allan Webber
9122a9d047 Merge remote branch 'remotes/jwandborg/f587-split_storage_into_submodules' 2011-09-14 04:57:19 -05:00
Joar Wandborg
fd10c71644 Fixed ./bin/gmg. import_export would not find BasicFileStorage, and ./bin/gmg would throw an error no matter what command you tried to run. 2011-09-14 02:08:01 +02:00
Joar Wandborg
a2468d18ca Feature #587 - Split storage.py into submodules 
*   Removed storage.py
*   Created submodules for filestorage, cloudfiles, mountstorage
*   Changed test_storage to reflect the changes made in the storage
    module structure
*   Added mediagoblin.storage.filestorage.BasicFileStorage as a
    default for both publicstore and queuestore's `storage_class`
 2011-09-12 02:32:03 +02:00
Christopher Allan Webber
8c12e57b9e Extracted, pushed, pulled, compiled translations 2011-09-11 16:20:10 -05:00
Christopher Allan Webber
3d95afeb36 Marking some things on the frontpage for translation. 2011-09-11 16:13:27 -05:00
Christopher Allan Webber
55376ff403 Merge remote branch 'remotes/elrond/idea/use_media_url_for_self' 2011-09-10 17:42:50 -05:00
Christopher Allan Webber
ab613cb3c8 Using Local Fonts instead of Remote Fonts linked to Google. 
Thanks to Shawn Kahn for help on / original version of this patch!
 2011-09-10 17:27:47 -05:00
Joar Wandborg
33d3de8e2c Refractored gmg_commands.import_export 2011-09-10 10:55:53 -05:00
Elrond
8d7b549bb6 Use media.url_for_self() instead of generating it 
Some places used to generate the URL for a media entry on
their own instead of calling media.url_for_self() to do
that. The later handles missing slugs better.
 2011-09-09 23:59:32 +02:00
Christopher Allan Webber
f373599bd7 Merge branch 'gullydwarf-cfdv-f357_lost_password_functionality' 
Conflicts:
	mediagoblin/auth/routing.py
 2011-09-08 08:12:43 -05:00
Christopher Allan Webber
f7ab66707c Renaming request.[GET|POST] as formdata instead of session; that's more accurate. 2011-09-08 08:10:27 -05:00
Christopher Allan Webber
961fe38163 Adding a small docstring 2011-09-07 23:51:41 -05:00
Christopher Allan Webber
4185e644f4 Keys in mongodb should be unicode, here... 2011-09-07 23:48:10 -05:00
Christopher Allan Webber
daf029646e Also nullify verification key after verifying in the email confirmation step 2011-09-07 23:46:41 -05:00
Christopher Allan Webber
a85a21103b If the user hasn't verified their email or account inactive give a special warning 2011-09-07 23:45:14 -05:00