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

1215 Commits

Author SHA1 Message Date
Joar Wandborg
959b0df398 Image media exceptions 
- Removed exception types specified in image.processing and included them from process_media.errors instead
 2011-10-15 19:16:02 +02:00
Christopher Allan Webber
f693f9af88 Merge remote branch 'remotes/elrond/misc/i592_use_full_path' 2011-10-15 11:07:13 -05:00
Christopher Allan Webber
76c94f6edf Merge remote branch 'remotes/elrond/idea/csrf_improvement' 2011-10-15 10:28:37 -05:00
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
Elrond
2dc8d24932 Some mostly cosmetic changes to CSRF 
* remove max_age - A session cookie is better, because it's
  a session thing, really.
* Call the cookie mediagoblin_csrftoken, much clearer.
* Use the SCRIPT_NAME for the path of the cookie, so that
  the cookie is sent back to the right place only.
  Alternatively the path= parameter could be removed, so
  that it defaults to '/'.
* call the randomness function only once, instead of twice.
  64 bits should be enough. If really more bits are needed,
  increase the number.
* Just give the number as cookie. No point in md5 and
  hexdigest in my view (those functions just make another
  representation).
* getrandbits gets a bit count directly, simpler API
 2011-10-14 21:46:17 +02:00
Joar Wandborg
e9c1b9381d Video transcoding is now gstreamer directly instead of through arista 2011-10-14 03:17:06 +02:00
Joar Wandborg
a7ca2a7211 import_export - Added some error handling 
We still want to be able to do an export if a file can't be read
 2011-10-14 03:15:50 +02:00
Joar Wandborg
a249b6d3a2 - Refractored the video thumbnailer 
- Started work on video transcoder
   Not done, by far!
 - Bug fix in video.processing error handling
 2011-10-11 04:57:17 +02:00
Christopher Allan Webber
c0022ecc88 Fixing 404s, related to recent util refactoring. 2011-10-05 20:57:02 -05:00
Joar Wandborg
89d764cd70 Fixed incorrect logger.[...] calls 
- Added FIXME about thumb size
 2011-10-06 00:00:09 +02:00
Joar Wandborg
3528b47d1e Added parameter to transcoding_error 2011-10-05 23:26:50 +02:00
Joar Wandborg
26729e0277 Multimedia refractoring, and added video thumbnail support 2011-10-05 22:58:42 +02: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
2a8c1b058b Update english translation file. 2011-10-03 21:07:16 -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
Aaron Williamson
2fe6991660 Reverse order of sanity checks: check email_verified after making sure there's a user in the request. 2011-10-03 20:28:48 -04:00
Aaron Williamson
7903a14f98 Make sure user isn't already verified before resending verification. 2011-10-03 20:25:11 -04:00
Aaron Williamson
43199340a2 Fixed conflict in /auth/views.py. 2011-10-03 20:01:14 -04:00
Aaron Williamson
3b74ce94ff Check request.user to determine if user is logged in. 2011-10-03 19:59:28 -04:00
Elrond
05788ef450 i592: Use full path in various places 
When running mediagoblin in a sub path on a web server,
most things inside mediagoblin need the "inside path", but
when generating URLs for the webbrowser, full paths are
needed.

urlgen and routes already do that.

Some (mostly pagination and login) need the URL of the
current page. They used request.path_info. But this is the
"inside" path, not the full.

So now there is request.full_path and its used in various
places.
 2011-10-03 14:01:13 +02: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
f136085531 Regenerated English .po file to include new string. 2011-10-01 19:52:12 -04:00
Aaron Williamson
84a7e7706c Display and error and redirect to login page if unauthenticated user tries to access resend_verification. 2011-10-01 19:49:56 -04:00
Nathan Yergler
285ffeddf3 has_key is deprecated, converting uses to use "in" operator. 2011-10-01 15:10:41 -07:00
Nathan Yergler
243c3843bd Whitespace and formatting cleanup. 
* Removed trailing whitespace
* Line length < 80 where possible
* Honor conventions on number of blank lines
* Honor conventions about spaces around :, =
 2011-10-01 15:10:02 -07: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