aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/submit
Commit message (Collapse)AuthorAgeFilesLines
...
* Minor formatting and syntax fix.Aaron Williamson2012-01-182-1/+2
|
* Merge branch 'mediagoblin-upstream' into feature544_basic_license_dataAaron Williamson2012-01-181-0/+28
|\
| * Cleaned the codeMichele Azzolari2012-01-171-2/+4
| |
| * We handle exceptions if PuSH failsMichele Azzolari2012-01-171-4/+14
| |
| * As per spec, we permit to have more then 1 hubMichele Azzolari2012-01-121-5/+7
| |
| * As suggested by Elrond, we use only one settingMichele Azzolari2012-01-121-1/+1
| |
| * Added PuSH capabilityMichele Azzolari2012-01-111-0/+14
| |
* | Merged changes with upstreamAaron Williamson2012-01-174-85/+107
|\|
| * Add Markdown for submit page, edit page, profile edit page; thus fixing ↵Jef van Schendel2012-01-041-1/+4
| | | | | | | | ticket #690
| * Dot-Notation for MediaEntry.queued_media_fileElrond2012-01-041-1/+1
| |
| * Fixed submission error handling and broken testsJoar Wandborg2011-12-311-3/+9
| | | | | | | | | | | | - Fixed broken test_auth test - Fixed error handling on submission, it now raises the exception if it is not explicitly relevant to file submission.
| * ASCII media type support & fix a bug in file submission error handlingJoar Wandborg2011-12-311-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added ASCII media processing * Added ASCII media display * Added ASCII media type Rebased from Joar Wandborg's ascii art branch (squashed to remove the commits borrowing code of dubious license) Fixed a bug in file submission error handling: - Moved file-extension condition out of loop (what did it do there?) - Updated file submission tests - Changed error handling in file submission, should now report more than absolutely necessary.
| * Fix #715: On media submit page, "Separate" is misspelledJef van Schendel2011-12-301-1/+1
| |
| * Dot-Notation for MediaEntry.media_typeElrond2011-12-051-1/+1
| |
| * Dot-Notation for MediaEntry.description(_html)Elrond2011-12-051-3/+3
| |
| * Dot-Notation for MediaEntry.titleElrond2011-12-051-1/+1
| |
| * Dot-Notation for MediaEntry.uploaderElrond2011-12-051-1/+1
| |
| * Dot-Notation for Users.usernameElrond2011-12-051-1/+1
| |
| * Merge remote branch ↵Elrond2011-11-271-1/+1
| |\ | | | | | | | | | | | | | | | | | | '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.
| | * Fix the text "Seperate tags by commas and spaces" since spaces are not used ↵Manuel Urbano Santos2011-11-271-1/+1
| | | | | | | | | | | | to seperate anymore.
| * | Fixes after merging video into master - part 2Joar Wandborg2011-11-211-66/+69
| | | | | | | | | | | | | | | | | | - Added handling of InvalidFileType to submit.views - Updated test_celery_setup and test_submission tests to reflect the changes to the media procesing infrastructure
| * | Fixes after merging video branch into masterJoar Wandborg2011-11-211-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | Merge branch 'video_gstreamer-only'Joar Wandborg2011-11-211-8/+9
| |\ \ | | |/ | |/| | | | | | | | | | Conflicts: mediagoblin/db/migrations.py mediagoblin/submit/views.py
| | * Multimedia support - Commiting from a not yet finished state - Details belowJoar Wandborg2011-09-231-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * DONE Initially testing with arista ** DONE Video display templates *** TODO Multi-browser support ** TODO Video thumbnails ** TODO Link to original video ** TODO Video cropping Also contains a lot of "debug" print's
| * | Fix for bug #467, "Add explanatory copy to add/edit picture pages saying ↵Jef van Schendel2011-11-201-1/+3
| | | | | | | | | | | | that tags are comma-separated"
| * | Dot-Notation: x._id = ObjectId() doesn't seem to work properlyElrond2011-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | For whatever reason, this does not work as expected: entry._id = ObjectId() Need to go this way: entry['_id'] = ObjectId()
| * | Dot-Notation for "_id"Elrond2011-11-151-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Note: Migrations can't use "Dot Notation"! Migrations run on pymongo, not mongokit. So they can't use the "Dot Notation". This isn't really a big issue, as migrations are anyway quite mongo specific.
| * | Merge remote-tracking branch 'remotes/nyergler/pep8-ification'Christopher Allan Webber2011-11-133-11/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/db/migrations.py mediagoblin/db/models.py mediagoblin/user_pages/views.py mediagoblin/util.py
| | * | has_key is deprecated, converting uses to use "in" operator.Nathan Yergler2011-10-011-1/+1
| | | |
| | * | Whitespace and formatting cleanup.Nathan Yergler2011-10-013-10/+10
| | |/ | | | | | | | | | | | | | | | | | | * Removed trailing whitespace * Line length < 80 where possible * Honor conventions on number of blank lines * Honor conventions about spaces around :, =
* | / First crack at basic license support.Aaron Williamson2012-01-172-1/+8
|/ /
* | Finished splitting util.py into separate files.Aaron Williamson2011-10-012-4/+3
| |
* | Moved common, translation, template, and url code out of util.py and into ↵Aaron Williamson2011-10-012-2/+2
|/ | | | tools/[file].py
* Mark description field's label for translationChristopher Allan Webber2011-09-051-1/+2
|
* 508. Updates copyright/license informationWill Kahn-Greene2011-09-015-5/+5
|
* Merge remote branch 'remotes/jwandborg/f403_ability_to_delete'Christopher Allan Webber2011-08-281-2/+2
|\ | | | | | | | | | | | | Conflicts: mediagoblin/edit/views.py mediagoblin/templates/mediagoblin/user_pages/media.html mediagoblin/user_pages/routing.py
| * + 'confirm' section for confirmation dialoguesMark Holmquist2011-08-221-2/+2
| | | | | | | | | | + implemented delete functionality * fixed several instances of 'must be an instance of unicode, not str'
* | Merge branch 'master' into jwandborg-f482_media_attachmentsChristopher Allan Webber2011-08-222-18/+43
|\| | | | | | | | | | | | | | | | | Conflicts: mediagoblin/config_spec.ini mediagoblin/edit/forms.py mediagoblin/edit/views.py mediagoblin/submit/views.py mediagoblin/templates/mediagoblin/user_pages/media.html
| * Capture and properly handle errors.Christopher Allan Webber2011-08-131-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Handled in several places: - In the run() of the ProcessMedia itself for handled (BaseProcessingFail derived) errors (best to do these not in on_failure because the errors are highlighted in celeryd in a way that looks inappropriate for when the errors are well handled) - In ProcessMedia.on_failure() for all other errors - In the submit view where all exceptions are caught, media is marked at having failed, then the error is re-raised. (The reason for this is that users running in "lazy" mode will get errors propagated by celery and so on_failure won't run for them.)
| * Proper handling of processor failures, working as hoped!Christopher Allan Webber2011-08-131-8/+18
| | | | | | | | | | | | BaseProcessingFail based exceptions recorded and marked appropriately in the database. Other exceptions also caught and marked (or rather not marked) appropriately in the database as well.
| * Merge branch 'master' into processingChristopher Allan Webber2011-08-111-1/+1
| |\ | | | | | | | | | | | | Conflicts: mediagoblin/db/migrations.py
| | * Feature #446 - Render the submission form using the render_divs macroCaleb Forbes Davis V2011-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Currently there are individual calls to wtforms_util.render_field_div for each field in the media submit form, which is too verbose - Matched the field ordering in submit/form.py to the verbose version - hacks the correct textareafield rendering with hard-coded rows and columns. - TODO - figure out how to pass the textarea dimensions with **kwargs
| * | Moving things around a bit/commenting in the submit view to make the ↵Christopher Allan Webber2011-08-111-2/+6
| | | | | | | | | | | | workflow clearer
| * | Merge branch 'master' into processingChristopher Allan Webber2011-08-101-4/+2
| |\|
| | * Generate the ObjectId() manually instead of via .save()Christopher Allan Webber2011-08-101-4/+2
| | |
| * | We should save the entry *after* we add the queued_task_id.Christopher Allan Webber2011-08-101-1/+1
| | |
| * | Merge branch 'master' into processingChristopher Allan Webber2011-08-103-6/+36
| |\|
| | * Converting all forms to use the "fake/null" gettext conversion functionChristopher Allan Webber2011-08-101-1/+1
| | | | | | | | | | | | | | | Gettext doesn't actually get run right in the form but we do need to wrap the strings in _() so stuff extracts :)
| | * Marked relevant strings in python views/forms for translation via ugettextChristopher Allan Webber2011-08-082-6/+9
| | |
| * | Store the task id of a processing action in the database.Christopher Allan Webber2011-07-241-1/+2
| | |