1393 Commits

Author SHA1 Message Date
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
Christopher Allan Webber
4da6efb459 Removing these video javascript files, which are currently unused 2011-11-25 11:43:34 -06:00
Christopher Allan Webber
f47a7a8c92 Remove old enable_video config option 2011-11-25 11:42:03 -06:00
Christopher Allan Webber
cfa96da734 Load multiple media types based on the media_types section of the config file 2011-11-25 11:41:24 -06:00
Christopher Allan Webber
99d2ac1d83 Merge remote-tracking branch 'remotes/jwandborg/master' 2011-11-24 15:24:58 -06:00
Elrond
3018832153 Rename MediaEntry.uploader() to .get_uploader()
The .uploader() method conflicts with the uploader database
field. As we're moving to .FIELD for db field access, this
is a relevant conflict.

So renaming .uploader() to .get_uploader()
2011-11-22 22:29:37 +01:00
Elrond
4d4e5b435b 652: Don't show empty field labels.
If the label for a field is empty, don't show it at all.
And don't translate it!
2011-11-22 22:00:04 +01:00
Elrond
ea33f63635 Wrap long line.
Nothing else.
2011-11-22 21:48:56 +01:00
Pablo J. Urbano Santos
56bfd91ab4 Added a message noticing the user the image has been successfully
deleted.
2011-11-22 21:07:09 +01:00
Joar Wandborg
6506b1e22c Fixes for video branch
- Removed superfluous code from media_types.image
- Updated lazy_pass_to_ugettext imports
2011-11-22 21:06:08 +01:00
Pablo J. Urbano Santos
d0ba62e2e7 Fixes #597. Add a visible error when user tries to delete an image
without cheking the "I'm sure" checkbox.
2011-11-22 20:29:33 +01:00
Joar Wandborg
8aeb673877 Video support is disabled by default, set enable_video to true to enable 2011-11-22 00:09:41 +01:00
Joar Wandborg
0bce749b21 Fixes after merging video into master - part 2
- Added handling of InvalidFileType to submit.views
- Updated test_celery_setup and test_submission tests to reflect the changes to the
  media procesing infrastructure
2011-11-21 23:38:31 +01:00
Joar Wandborg
8e5f974684 Fixes after merging video branch into master
- Removed debug output from init/celery
- Moved process_media/__init__ to processing.py
- Centralized the processing.ProcessMedia task class
  - Updated media managers to reference the processing function
    instead of the ProcessMedia instance
  - Updated new-style image processing to previous, newer old-style
    image processing
- Updated video transcoding
  - Changed method in progress output, sometimes
    message.structure['percent'] raises KeyError
2011-11-21 23:18:40 +01:00
Joar Wandborg
b9e1fa280e Merge branch 'video_gstreamer-only'
Conflicts:
	mediagoblin/db/migrations.py
	mediagoblin/submit/views.py
2011-11-21 21:51:30 +01:00
Joar Wandborg
c875bb74a8 Refractored GStreamer element linking 2011-11-21 21:47:00 +01:00
Christopher Allan Webber
e56e5f8c5c Tests for StorageInterface*.copy_local_to_storage() 2011-11-20 22:25:22 -06:00
Christopher Allan Webber
61c5306d24 Made the image processing use intermediary conversion file.
This should fix the problem with PIL and the cloudfiles storage system
fighting.
2011-11-20 22:12:51 -06:00
Christopher Allan Webber
2e8fbc8fab Slightly clearer docs on copy_local_to_storage 2011-11-20 22:02:02 -06:00
Christopher Allan Webber
98f6efb068 copy_local_to_storage, both general and specialized-for-BasicFileStorage versions
This utility should allow for easy copying from a local filesystem to
the storage instance.
2011-11-20 22:01:43 -06:00
Joar Wandborg
a63b640f12 Stashing changes 2011-11-21 00:06:59 +01:00
Jakob Kramer
fe0a8f53e2 fixed identation 2011-11-20 21:40:51 +01:00
Jakob Kramer
a00f1c1e1c eyecandy for programmers 2011-11-20 21:30:46 +01:00
Jakob Kramer
9404a9fed2 don't use 'and' anymore, if there is only one tag 2011-11-20 21:15:07 +01:00
Elrond
5dbeda8a0f Fix redirect to logical path
redirects should in nearly all cases go to a logical path
like 'mediagoblin.auth.login' and not to an absolute path
like "/auth/login".
2011-11-20 20:15:21 +01:00
Elrond
e51af0e620 Merge remote branch 'remotes/aaronw/bug614_verification_crash'
* remotes/aaronw/bug614_verification_crash:
  Update english translation file.
  Reverse order of sanity checks: check email_verified after making sure there's a user in the request.
  Make sure user isn't already verified before resending verification.
  Check request.user to determine if user is logged in.
  Regenerated English .po file to include new string.
  Display and error and redirect to login page if unauthenticated user tries to access resend_verification.

Conflicts:
	mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po
2011-11-20 20:00:08 +01:00
Jef van Schendel
0b3cdd6a25 Navigation buttons edits. Removed images as they are no longer needed. Related: bug #504 2011-11-20 17:01:23 +01:00
Jef van Schendel
7807f5a513 Remove Edit/Delete icons, since they are not required yet. 2011-11-20 16:45:45 +01:00
Jef van Schendel
16a444444a Change tag list from a list to a paragraph. Wrap text for translation. 2011-11-20 16:18:27 +01:00
Jef van Schendel
cee794a8f7 Fix for bug #467, "Add explanatory copy to add/edit picture pages saying that tags are comma-separated" 2011-11-20 15:34:40 +01:00
Jef van Schendel
88f20b58b2 Slight style changes to button_action_highlight 2011-11-20 01:57:29 +01:00
Jef van Schendel
c6c08a2f29 Small correction, this button should be button_action, not button_form 2011-11-20 01:57:02 +01:00
Jef van Schendel
5ab3855e1f Slight change to error wording 2011-11-20 01:46:21 +01:00
Jef van Schendel
13423daae2 Another change to button style. Renamed header_submit, header_submit_highlight and button classes, correct all references to these 2011-11-20 01:43:48 +01:00
Jef van Schendel
5bd523eb23 Change to background of "empty_space", it now uses an image 2011-11-20 01:12:10 +01:00
Jakob Kramer
c8ccd23e8e added unittests, now using form errors and fixed bug when no GET parameter is given for /edit/profile/ 2011-11-20 00:37:19 +01:00
Jakob Kramer
4837b2f253 added support for changing the password, issue #643 2011-11-20 00:37:19 +01:00
Jef van Schendel
909dda1f85 Change button style a bit 2011-11-20 00:28:19 +01:00
Jef van Schendel
aea6d577cb Change form structure and add relevant CSS rules 2011-11-19 23:46:42 +01:00
Christopher Allan Webber
7880168526 Added back the title block 2011-11-19 14:06:48 -06:00
Christopher Allan Webber
5bb37b9480 Merge remote branch 'remotes/inconexo/613_custom_title' 2011-11-19 14:04:56 -06:00
Christopher Allan Webber
1bc231c766 Added Pablo Santos to the AUTHORS file 2011-11-19 14:03:01 -06:00
Christopher Allan Webber
7c378f2cd5 Allow user to set whether comments are ascending or descending 2011-11-19 14:01:38 -06:00
Christopher Allan Webber
5db324f7c6 Merge remote branch 'remotes/inconexo/441_comment_order' 2011-11-19 13:54:49 -06:00
Christopher Allan Webber
b4b7b6a57a Added Corey Farwell to the list of contributors 2011-11-19 13:42:30 -06:00
Corey Farwell
fc5695c538 incorrect path in nginx config 2011-11-19 10:43:31 -08:00
Pablo J. Urbano Santos
1a3138addd media_home: order comments by ascending date. 2011-11-19 19:15:41 +01:00
Pablo J. Urbano Santos
e62fc61194 Added parameter ascending to MediaEntry::get_comments, if true, comments
will be ordered ascending, otherwise descending
2011-11-19 19:11:42 +01:00
Pablo J. Urbano Santos
3c0411f51f Allow instance owners to customize html titles of page:
Added html_title config option.
	Made base.html template use html_title option as page title.
2011-11-19 17:07:41 +01:00
Christopher Allan Webber
53bc39755b Add app_config and global_config to the template environment 2011-11-19 08:33:29 -06:00