aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Another elrond suggestion: only init orig_metadata if there's anything in ↵Christopher Allan Webber2013-03-031-2/+4
| | | | | | the dict. This commit sponsored by Joshua Rosen. Thank you!
* Per Elrond's suggestions moving DEFAULT_WEBM_TYPE to media managerChristopher Allan Webber2013-03-033-4/+4
| | | | | | | The reason for this is to avoid defining this twice as we were previously (once in the template, once in video/models.py) This commit sponsored by Roland McIntosh. Thank you!
* Extrapolate type= based on the video metadata that we have, if we can.Christopher Allan Webber2013-03-033-2/+34
| | | | | | | | | It's kind of awkward because it relies on there being a entry.media_data, but that's not guaranteed... (see http://issues.mediagoblin.org/ticket/650) so we use a dopey fallback in the template in that case (kind of annoying info duplication). This commit sponsored by Piotr Wieczorek. Thank you!
* Mild cosmetic cleanups to video.html and adding missing </li> elements.Christopher Allan Webber2013-03-031-8/+16
| | | | This commit sponsored by Jukka Hellen. Thanks!
* {% set %} the display_type and display_path and use that elsewhereChristopher Allan Webber2013-03-031-2/+3
| | | | | | This will make some stuff a bit cleaner that's coming up... This commit sponsored by J B Nicholson-Owens. Thanks!
* pdb.set_trace() in mediagoblin code is Not Allowed(TM), removing from audio codeChristopher Allan Webber2013-03-031-3/+0
| | | | | | | | Of course, the version that appears here is not really dangerous because it's for the "call the file individually" form of debugging, but it isn't allowed anyway. This commit sponsored by Michael Faryniarz. Thanks!
* Now store metadata info from processing into the media type.Christopher Allan Webber2013-03-033-0/+62
| | | | | | | | | This comes in several parts: - Store the metadata from gstreamer during processing - Add a new JSONEncoded field to the VideoData table - And, of course, add a migration for that field! This commit sponsored by Julius Tuomisto. Thank you, Julius!
* Huge amount of work to (mostly) allow .ogg (and maybe other) formats to skip ↵Christopher Allan Webber2013-03-027-17/+32
| | | | | | | | | | | | | | | | | | | transcode - Update get_display_media in several ways: - now uses the media type's own declaration of the order of things - returns both the media_size and the media_path, as per the docstring - implicitly uses self.media_files as opposed to forcing you to pass it in - update videos to use get_display_media - update images to declare media_fetch_order in the media manager (videos also) - update stl to use media.media_files['original'] instead of weird use of get_display_media - update sidebar to only conditionally show webm_640 TODO still: identify video type information *during* processing, show that in the <video><source /></video> element. This commit sponsored by Nathan Yergler. Thanks, nyergler!
* If we're not transcoding, copy this file directly over to ['original']Christopher Allan Webber2013-03-011-6/+17
| | | | | | | | | | | There's no reason to copy it over to 'webm_640' in such a case, clearly. Added logic so we don't do it twice either. Haven't tested this yet though ;) This commit sponsored by Algot Runeman. Thank you!
* Merge branch 'master' into joar-skip_transcodingChristopher Allan Webber2013-03-01140-6676/+10025
|\ | | | | | | | | Conflicts: mediagoblin/config_spec.ini
| * Fix some media page redirects in media_collect.Elrond2013-03-011-3/+3
| | | | | | | | Use .slug_or_id instead of only .id.
| * Fixup _("...") % (...) in media_collect.Elrond2013-03-011-6/+6
| | | | | | | | | | | | | | Get some messages translated. Bad: _("..." % (...)) Good: _("...") % (...)
| * MediaGoblin not really anything to do with FooCorp anymore.Christopher Allan Webber2013-02-271-15/+0
| |
| * Fixing translations stuff for command line tools and such.Christopher Allan Webber2013-02-271-2/+7
| | | | | | | | | | | | | | | | | | | | | | We had switched mg_globals to have the default translations set to None so that it would be set up by the mediagoblin app later. However, this would mean that things like scripts would try to call gettext and error out. Thanks to Tumulte for catching this. This commit sponsored by Aurimas Fišeras. Thank you!
| * Simplifying the test for whether or not a user and slug combo exists.Christopher Allan Webber2013-02-271-3/+1
| | | | | | | | | | | | | | Thanks to tchernobog for catching this (it was breaking on postgres) and Elrond for the suggestion on how to fix it. This commit sponsored by Caleb Cooper. Thanks Caleb!
| * Removing html5shiv for not complying with its own licenses and racismChristopher Allan Webber2013-02-264-28/+0
| | | | | | | | | | | | | | | | | | | | Issues of racism seem to have been resolved and removed from upstream, but make having this as a dependency somewhat uncomfortable: https://github.com/aFarkas/html5shiv/issues/91 Regardless, at the time of writing the project doesn't comply with its own license... it states to be dual licensed under MIT and GPLv2 but distributes neither of these licenses with its source.
| * Allow media managers without sniff_handlerJoar Wandborg2013-02-271-1/+2
| |
| * Copying the license from the jquery repository rather than the generic MIT one.Christopher Allan Webber2013-02-261-1/+2
| | | | | | | | | | Damned MIT and BSD licenses encouraging modification by every project makes compliance annoying.
| * Simplifying the "id:" url detection, per Elrond's suggestion.Christopher Allan Webber2013-02-261-11/+9
| | | | | | | | | | | | As pointed out, we didn't need that nested if. This commit sponsored by Paul Kuriakose. Thank you!
| * Replacing several request.matchdict['media'] -> media_slug ... shorter!Christopher Allan Webber2013-02-261-2/+2
| | | | | | | | | | | | Thanks for pointing this out, Elrond ;) This commit sponsored by Gerardo Joven Valdivia. Thank you!
| * Media URLs with ids in them are now like /u/cwebber/m/id:4112/ rather than ↵Christopher Allan Webber2013-02-262-18/+27
| | | | | | | | | | | | | | | | /u/cwebber/m/4112/ This avoids some potential name collision issues. This commit sponsored by Asokan Pichai. Thank you!
| * Stylistic cleanups to some urlgen calls.Christopher Allan Webber2013-02-261-4/+4
| | | | | | | | This commit sponsored by Stephane Berube. Thank you!
| * Small PEP-8 compliance fix.Christopher Allan Webber2013-02-261-3/+3
| | | | | | | | This commit sponsored by Mats Sjöberg. Thanks!
| * Import sqlalchemy's and_ and use it in our select statementChristopher Allan Webber2013-02-261-2/+3
| | | | | | | | This commit sponsored by Hans-Jörg Dollansky. Thank you!
| * And of course, we need to actually commit at the end of a migration.Christopher Allan Webber2013-02-261-0/+3
| | | | | | | | This commit sponsored by Tamas Kemenczy. Thanks, Tamas!
| * Dope'ily missed .count() on the query where we're countingChristopher Allan Webber2013-02-251-1/+1
| | | | | | | | | | | | Thanks for catching, Elrond. This commit sponsored by Graham King. Thank you!
| * Supplying migrations for a bold new era of mediagoblin entry slugsChristopher Allan Webber2013-02-251-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Okay, that's a totally confusing statement, but the docstring of this migration summarizes it well: Entries without slugs now display differently in the url like: /u/cwebber/m/id=251/ ... because of this, we should back-convert: - entries without slugs should be converted to use the id, if possible, to make old urls still work - slugs with = (or also : which is now also not allowed) to have those stripped out (small possibility of breakage here sadly) This commit sponsored by John Sullivan. Thanks johnsu01! :)
| * You can now set the PASTE_CONFIG environment variable to control logging setupChristopher Allan Webber2013-02-251-0/+5
| | | | | | | | | | | | | | | | So this should work: PASTE_CONFIG=/path/to/paste_foo.ini ./lazycelery.sh Thanks to Laurent Fournier for sponsoring this commit!
| * Removing stray character from pythonsnake's doc change and filling commentChristopher Allan Webber2013-02-241-2/+3
| | | | | | | | This commit sponsored by Johannes Knabbe. Thank you!
| * Fix bug 461pythonsnake2013-02-241-0/+3
| |
| * Improved dropdown styling, part deuxJef van Schendel2013-02-242-12/+22
| |
| * Merge branch 'master' of gitorious.org:mediagoblin/mediagoblinJef van Schendel2013-02-241-0/+4
| |\
| | * Changing the order so that config_spec.ini is mentioned after ↵Christopher Allan Webber2013-02-241-4/+4
| | | | | | | | | | | | | | | | | | mediagoblin_local.ini This commit sponsored by Matteo Settenvini. Thanks!
| | * Merge remote-tracking branch 'refs/remotes/pythonsnake/581_config'Christopher Allan Webber2013-02-241-0/+4
| | |\
| | | * Mention mediagoblin/config_spec.inipythonsnake2013-02-131-0/+4
| | | |
| * | | Improved dropdown stylingJef van Schendel2013-02-242-21/+15
| |/ /
| * | Merge remote-tracking branch 'refs/remotes/pythonsnake/629_autoplay'Christopher Allan Webber2013-02-242-1/+6
| |\ \
| | * | Fix bug 629pythonsnake2013-02-102-1/+6
| | |/
| * | Renaming "extrahead" template hooks to "head".Christopher Allan Webber2013-02-244-5/+5
| | | | | | | | | | | | | | | | | | As Elrond points out, the "extra" is implied by it being a hook! This commit sponsored by Andrew Fustini. Thanks, Drew!
| * | extra_head template hook. This will allow plugins to add extra js/css more ↵Christopher Allan Webber2013-02-241-0/+7
| | | | | | | | | | | | | | | | | | easily. This commit sponsored by Moritz Berberich. Thank you!
| * | Add owner to list of collections.Elrond2013-02-241-11/+7
| | | | | | | | | | | | | | | | | | | | | When listing the collections, that a media is contained in, also show the owner of the collection. Also simplify the whole looping a lot.
| * | Use media.id for collecting media too.Elrond2013-02-244-9/+9
| | | | | | | | | | | | Also remove some useless whitespace while at it.
| * | Use the media id for attachmemt editing.Elrond2013-02-244-20/+23
| | | | | | | | | | | | And remove some stray white space from the output.
| * | Committing extracted and compiled translationsChristopher Allan Webber2013-02-2356-2621/+3060
| | |
| * | Committing present MediaGoblin translations before pushing extracted messagesChristopher Allan Webber2013-02-231-26/+27
| | |
| * | Fix stray comma in listings.views.atom_feedJoar Wandborg2013-02-221-1/+1
| | |
| * | Added some empty templatesJoar Wandborg2013-02-224-0/+54
| | | | | | | | | | | | | | | - Make it possible for site owners to hook into base.html without tainting the repository.
| * | simplified get_usefulAndrás Veres-Szentkirályi2013-02-221-6/+1
| | |
| * | use dict.iteritems() instead of dict.items()András Veres-Szentkirályi2013-02-221-1/+1
| | |
| * | use list expression instead of 3-deep forAndrás Veres-Szentkirályi2013-02-221-7/+2
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-02 20:01:03 +0000