mediagoblin.git
12 years agogandaro points out we should have all headers end with question marks for consistency
Christopher Allan Webber [Sun, 6 May 2012 20:28:13 +0000 (15:28 -0500)]
gandaro points out we should have all headers end with question marks for consistency

Done for about.rst

12 years agoApparently I can't correct typos right. MedaGoblin->MediaGoblin in docs
Christopher Allan Webber [Sun, 6 May 2012 20:27:19 +0000 (15:27 -0500)]
Apparently I can't correct typos right.  MedaGoblin->MediaGoblin in docs

12 years agoA couple of typos in docs... MedaGobilin->MediaGoblin
Christopher Allan Webber [Sat, 5 May 2012 17:16:13 +0000 (12:16 -0500)]
A couple of typos in docs... MedaGobilin->MediaGoblin

12 years agoUpdate version to 0.3.1.dev
Will Kahn-Greene [Mon, 30 Apr 2012 18:03:35 +0000 (11:03 -0700)]
Update version to 0.3.1.dev

12 years agoUpdate version to 0.3.0 for release
Will Kahn-Greene [Mon, 30 Apr 2012 16:48:00 +0000 (09:48 -0700)]
Update version to 0.3.0 for release

12 years agoOne character chage: "our" to "your" in the release notes as it makes more
greg [Tue, 1 May 2012 16:32:59 +0000 (09:32 -0700)]
One character chage: "our" to "your" in the release notes as it makes more
sense, I believe.

12 years ago0.3.0 *is* released! Reflect that in the release notes :)
Christopher Allan Webber [Tue, 1 May 2012 16:10:39 +0000 (11:10 -0500)]
0.3.0 *is* released!  Reflect that in the release notes :)

12 years agoAlso tell people to install python-psycopg2 if using postgres in docs
Christopher Allan Webber [Tue, 1 May 2012 03:12:07 +0000 (22:12 -0500)]
Also tell people to install python-psycopg2 if using postgres in docs

12 years ago./bin/gmg migrate -> ./bin/gmg dbupdate in the docs
Christopher Allan Webber [Tue, 1 May 2012 03:05:27 +0000 (22:05 -0500)]
./bin/gmg migrate -> ./bin/gmg dbupdate in the docs

12 years agoCommitting extracted and compiled translations
Christopher Allan Webber [Mon, 30 Apr 2012 15:48:49 +0000 (10:48 -0500)]
Committing extracted and compiled translations

12 years agoCommitting present MediaGoblin translations before pushing extracted messages
Christopher Allan Webber [Mon, 30 Apr 2012 15:48:21 +0000 (10:48 -0500)]
Committing present MediaGoblin translations before pushing extracted messages

12 years agoRemoving references to MongoDB in docs/
Christopher Allan Webber [Sun, 29 Apr 2012 18:11:31 +0000 (13:11 -0500)]
Removing references to MongoDB in docs/

12 years agoNo need to keep around mongodb migration tests.
Christopher Allan Webber [Sun, 29 Apr 2012 18:05:00 +0000 (13:05 -0500)]
No need to keep around mongodb migration tests.

12 years agoDeprecate ./bin/gmg migrate.
Christopher Allan Webber [Sun, 29 Apr 2012 17:08:44 +0000 (12:08 -0500)]
Deprecate ./bin/gmg migrate.

Keeping it around just in case someone manually wants to migrate
before running the convert thing or... something.  Probably silly.

12 years agoRemoving wipealldata command and deleting env_export/env_import for now.
Christopher Allan Webber [Sun, 29 Apr 2012 16:45:48 +0000 (11:45 -0500)]
Removing wipealldata command and deleting env_export/env_import for now.

None of these tools really work anymore in the SQL world, and possibly
aren't as necessary either.  In the meanwhile, just disabling them to
reduce confusion.

12 years agoRemoving mongo and mongokit as dependencies.
Christopher Allan Webber [Sun, 29 Apr 2012 16:11:08 +0000 (11:11 -0500)]
Removing mongo and mongokit as dependencies.

12 years agoTranslate form validation error messages.
Elrond [Mon, 23 Apr 2012 22:12:18 +0000 (00:12 +0200)]
Translate form validation error messages.

Okay, this is a long story.
There are two ways to translate validation error messages:

1) Let wtforms do it. You give wtforms a translation thingy
   and it calls it for the message to be translated. Good
   idea maybe. Except: The translation function is only
   called for the builtin messages of wtforms. It's not
   called for any handcrafted messages in the constructor.
   And we can't translate the message there! Because the
   message needs to be translated when the form is
   rendered, for each user's locale.

   This does not work for us.

2) Translate the message while it gets rendered.
   Luckily we render the message completely by hand. So we
   can just translate it there also!

   Simple, easy, works!

This all does not cover translating the builtin messages of
wtforms. They're currently not extracted in any way, so our
translators can't translate them.

But that's another issue!

12 years agoMaking celeryd consistent: look for mediagoblin_local.ini
Christopher Allan Webber [Sun, 22 Apr 2012 19:09:47 +0000 (14:09 -0500)]
Making celeryd consistent: look for mediagoblin_local.ini

Use mediagoblin_local.ini as default conf file if it exists, else use
mediagoblin.ini, just like everything else.

12 years agoMerge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Christopher Allan Webber [Sun, 22 Apr 2012 15:06:52 +0000 (10:06 -0500)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

12 years agoSwitching BROKER_HOST to sqlite:// instead of sqlalchemy+sqlite://
Christopher Allan Webber [Sun, 22 Apr 2012 15:02:04 +0000 (10:02 -0500)]
Switching BROKER_HOST to sqlite:// instead of sqlalchemy+sqlite://

Okay, so if you run git master of kombu, this works.  And if you run
the older kombu + kombu-sqlalchemy, this also worked.  In the last
release of kombu (2.1.5) there's a bug, and sqlalchemy+sqlite://
worked for processes consuming tasks but not ones publishing tasks.

Aye aye aye.

I guess we might have to move our setup.py back to the old kombu +
kombu-sqlalchemy setup until they put out a new kombu release? :(

12 years agoCommitting extracted and compiled translations
Elrond [Sun, 22 Apr 2012 10:45:18 +0000 (12:45 +0200)]
Committing extracted and compiled translations

12 years agoRemove kombu-sqlalchemy and use database string in modern kombu-proper format
Christopher Allan Webber [Sun, 22 Apr 2012 01:29:02 +0000 (20:29 -0500)]
Remove kombu-sqlalchemy and use database string in modern kombu-proper format

Previously we were using kombu-sqlalchemy the library for sqlalchemy
support.  Newer kombu has support for this internally, so we're using
that.  Requires changing a celery setting and also removing
kombu-sqlalchemy from your path.

I hope the process of removing kombu-sqlalchemy from one's path
doesn't confuse too many people...!

12 years agoCommitting extracted and compiled translations
Christopher Allan Webber [Sat, 21 Apr 2012 21:36:35 +0000 (16:36 -0500)]
Committing extracted and compiled translations

12 years agoCommitting present MediaGoblin translations before pushing extracted messages
Christopher Allan Webber [Sat, 21 Apr 2012 21:36:02 +0000 (16:36 -0500)]
Committing present MediaGoblin translations before pushing extracted messages

12 years agoExtract new translatable strings.
Elrond [Sat, 21 Apr 2012 21:15:03 +0000 (23:15 +0200)]
Extract new translatable strings.

12 years agotransifex: Wait a bit after push.
Elrond [Sat, 21 Apr 2012 21:13:05 +0000 (23:13 +0200)]
transifex: Wait a bit after push.

We're seeing somewhat inconsistent data in tx pull.
My theory is: The server needs longer to process the
uploaded new template and work that into the translations.

12 years agoDocumentation updates and fixes
Will Kahn-Greene [Sat, 21 Apr 2012 02:10:21 +0000 (22:10 -0400)]
Documentation updates and fixes

* Nixed some of the mongodb references--pretty sure we're done with that.
* Fixed some awkward language.
* Fixed : :: stuff. Sphinx lets you do :: so you don't need the additional
  colon.
* Turned a paragraph into a .. note:: section. That makes it easier to
  notice and read.

12 years agouse _ function on some now untranslatable strings
Jakob Kramer [Sun, 25 Mar 2012 20:24:14 +0000 (22:24 +0200)]
use _ function on some now untranslatable strings

12 years ago'+ Add media' and 'View your profile' translatable
Jakob Kramer [Thu, 19 Apr 2012 18:02:36 +0000 (20:02 +0200)]
'+ Add media' and 'View your profile' translatable

12 years agoAlso make sure mimetype here is set correctly via mimetype[0] (Thanks Shackra!)
Christopher Allan Webber [Wed, 18 Apr 2012 14:22:51 +0000 (09:22 -0500)]
Also make sure mimetype here is set correctly via mimetype[0] (Thanks Shackra!)

12 years agoCommitting extracted and compiled translations
Christopher Allan Webber [Wed, 18 Apr 2012 13:49:14 +0000 (08:49 -0500)]
Committing extracted and compiled translations

12 years agoMake image-for-media_title alt tag translatable
Christopher Allan Webber [Wed, 18 Apr 2012 13:48:17 +0000 (08:48 -0500)]
Make image-for-media_title alt tag translatable

12 years agoCommitting extracted and compiled translations
Christopher Allan Webber [Wed, 18 Apr 2012 13:23:46 +0000 (08:23 -0500)]
Committing extracted and compiled translations

12 years agoCommitting present MediaGoblin translations before pushing extracted messages
Christopher Allan Webber [Wed, 18 Apr 2012 13:23:26 +0000 (08:23 -0500)]
Committing present MediaGoblin translations before pushing extracted messages

12 years agoMerge remote-tracking branch 'joar/html5slider'
Joar Wandborg [Wed, 18 Apr 2012 10:10:23 +0000 (12:10 +0200)]
Merge remote-tracking branch 'joar/html5slider'

12 years agoAdded html5slider to support range inputs in Firefox
Joar Wandborg [Wed, 18 Apr 2012 10:06:10 +0000 (12:06 +0200)]
Added html5slider to support range inputs in Firefox

12 years agoSave the MIMEtype to cloudfiles correctly.
Shackra [Mon, 16 Apr 2012 09:50:00 +0000 (11:50 +0200)]
Save the MIMEtype to cloudfiles correctly.

12 years agoUpdated the audio display <source> element
Joar Wandborg [Mon, 16 Apr 2012 08:43:50 +0000 (10:43 +0200)]
Updated the audio display <source> element

as per
<http://www.w3.org/TR/html5/the-source-element.html#attr-source-type>.

This closes bug <http://issues.mediagoblin.org/ticket/435>.

12 years agolog.debug the used config file.
Elrond [Mon, 9 Apr 2012 20:49:41 +0000 (22:49 +0200)]
log.debug the used config file.

Might be useful at some point.

12 years agoFix atom feed for tags.
Elrond [Mon, 9 Apr 2012 20:43:25 +0000 (22:43 +0200)]
Fix atom feed for tags.

This one was missed. Needs to call a big sql join.
Luckily the join was already implemented.

12 years agoFixed video skin
Joar Wandborg [Mon, 9 Apr 2012 19:34:29 +0000 (21:34 +0200)]
Fixed video skin

Removed the default video.js skin entirely, now running on vjs-mg-skin
only!

12 years agoRemoved commented out pdb.set_trace
Joar Wandborg [Mon, 9 Apr 2012 18:50:43 +0000 (20:50 +0200)]
Removed commented out pdb.set_trace

12 years agoMerge remote-tracking branch 'joar/media-fixes'
Joar Wandborg [Mon, 9 Apr 2012 18:36:50 +0000 (20:36 +0200)]
Merge remote-tracking branch 'joar/media-fixes'

12 years agoMedia processing, transcoding, display fixes
Joar Wandborg [Mon, 9 Apr 2012 14:28:46 +0000 (16:28 +0200)]
Media processing, transcoding, display fixes

- Added configurable options
  - Video
    - vp8_quality
    - vp8_threads
    - vorbis_quality
  - Audio
    - spectrogram_fft_size
  - ASCII
    - thumbnail_font
- Cleaned up ascii.asciitoimage
- Cleaned up video.transcoders
- Changed default video quality settings to better quality
- Changed default audio spectrogram solution to the double.
- Added a hacky notice for Firefox users instead of the broken range
  input.

12 years agoAdd MediaGoblin video player skin by chron0
Jef van Schendel [Sun, 8 Apr 2012 19:53:17 +0000 (21:53 +0200)]
Add MediaGoblin video player skin by chron0

12 years agoCELERY_ALWAYS_EAGER environment variable only recognized if 'true' now
Christopher Allan Webber [Sun, 8 Apr 2012 15:43:23 +0000 (10:43 -0500)]
CELERY_ALWAYS_EAGER environment variable only recognized if 'true' now

12 years agoAllow users to pass callables in as controllers, not just import paths
Christopher Allan Webber [Sun, 8 Apr 2012 14:54:32 +0000 (09:54 -0500)]
Allow users to pass callables in as controllers, not just import paths

12 years agoCommitting extracted and compiled translations
Christopher Allan Webber [Sat, 7 Apr 2012 21:33:50 +0000 (16:33 -0500)]
Committing extracted and compiled translations

12 years agoCommitting present MediaGoblin translations before pushing extracted messages
Christopher Allan Webber [Sat, 7 Apr 2012 21:33:17 +0000 (16:33 -0500)]
Committing present MediaGoblin translations before pushing extracted messages

12 years agoCleanup sql session after request. ALWAYS!
Elrond [Sat, 7 Apr 2012 21:21:59 +0000 (23:21 +0200)]
Cleanup sql session after request. ALWAYS!

The cleanup could be missed if the request handling code in
app.py:__call__ exits early (due to exception, or due to
one of those early "return"s).
So to make sure the sql session is cleaned up for real,
wrap the whole thing in a try: finally:.

Also wrote a short tool to test if the session is actually
empty. The tool is currently disabled, but ready to be
used.

12 years agoFix relnotes formatting
Will Kahn-Greene [Sat, 7 Apr 2012 16:26:40 +0000 (12:26 -0400)]
Fix relnotes formatting

* adds link to deployment docs.
* tweaks formatting

12 years agoStart adding release notes.
Elrond [Thu, 5 Apr 2012 17:46:24 +0000 (19:46 +0200)]
Start adding release notes.

This is especially for noting the switch to sql and
explaining how to convert your mongodb data over to sql.

12 years agoUpdated documentation
Joar Wandborg [Mon, 2 Apr 2012 22:49:24 +0000 (00:49 +0200)]
Updated documentation

Added PostgreSQL deployment documentation

12 years agoMerge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Joar Wandborg [Mon, 2 Apr 2012 13:09:53 +0000 (15:09 +0200)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

12 years agogmg env_import shouldn't crash on unicode ...
Joar Wandborg [Mon, 2 Apr 2012 13:08:22 +0000 (15:08 +0200)]
gmg env_import shouldn't crash on unicode ...

characters in media titles

12 years agoCheck that the media_data tables are empty.
Elrond [Mon, 2 Apr 2012 12:02:56 +0000 (14:02 +0200)]
Check that the media_data tables are empty.

In the analyzing part also check that the media_data tables
are empty (as expected) before dropping them.

12 years agoAdd ascii and audio tables/migration data.
Elrond [Mon, 2 Apr 2012 11:49:59 +0000 (13:49 +0200)]
Add ascii and audio tables/migration data.

Well, and if it's not needed, drop it again. ;)

12 years agoCleanup unused media_data tables and migration info.
Elrond [Mon, 2 Apr 2012 11:42:02 +0000 (13:42 +0200)]
Cleanup unused media_data tables and migration info.

After converting everything, check what is actually used in
the db. For media_types that are not used, drop all the
media_data tables and remove the migration info.

12 years agoMongo -> SQL conversion tool: UI improvements
Elrond [Mon, 2 Apr 2012 10:58:29 +0000 (12:58 +0200)]
Mongo -> SQL conversion tool: UI improvements

Output some headers while converting things.
And indent some info.
Also some DRY things.

12 years agoFixed an issue where orphaned comments breaks the import
Joar Wandborg [Mon, 2 Apr 2012 11:44:28 +0000 (13:44 +0200)]
Fixed an issue where orphaned comments breaks the import

12 years agoMerge remote-tracking branch 'refs/remotes/elrond/sql/final'
Christopher Allan Webber [Sun, 1 Apr 2012 20:36:11 +0000 (15:36 -0500)]
Merge remote-tracking branch 'refs/remotes/elrond/sql/final'

Conflicts:
mediagoblin/tests/test_submission.py

Also, WHOO SQL SWITCHOVER PARTY!

        ASCII DANCE PARTY

    /_o_/    \ /   \o_    o
     (       _|_    )    //)
     /\     / o \  /|     /|

      *BMCH BMCH BMCH BMCH*
%
 /_o_/   HHHYAAaaaaa
  /_
 / /
%
AAAAAHAHAHAHAHHHAAHA
       ,,          .------
      o_o ;;       /\\     \    $  __
      '\/ ||      // \\     #     /_/
        \//      // //\\     \
         )             \\     \   %
        \\              \\_____\
        | )            //-------
       /_/_           //     //

       SWITCH YOUR DATABASE
     FLIP A FUKKEN BOOLEAN
%
             __________
          .-'          '-.
        .'                '.
      .'  _--_        _--_  '.
     /   /  (_).     /  (_).  \
    .   |      |    |      |   .
    |    ._____,     ._____,   |
    |   ____________________   |
    |    |                 |   |
    '    \                 /   '
     \    '.        .----./   /
      \     '._    /     /   /
       '.      '--------'  .'
         '._            _.'
            '----------'

12 years agoFix unit tests for sql: cache media_id.
Elrond [Sun, 1 Apr 2012 20:02:06 +0000 (22:02 +0200)]
Fix unit tests for sql: cache media_id.

Attributes of SQLAlchemy objects get "lost". So "cache"
them locally in the code.
This is really the simple explanation for some scarry
sqlalchemy details.

12 years agoFinally enable SQL for everybody!
Elrond [Sun, 1 Apr 2012 19:46:36 +0000 (21:46 +0200)]
Finally enable SQL for everybody!

This switches the whole source code over to use sql instead
of mongodb. It's a pretty easy change, but changes nearly
the complete way things work. Hopefully everythong works!

12 years agoSwitch JSONEncoded from VARCHAR to TEXT
Elrond [Sun, 1 Apr 2012 17:55:15 +0000 (19:55 +0200)]
Switch JSONEncoded from VARCHAR to TEXT

The JSON fields are really "dumb stuff in here" fields.
They are not intended to get indexed or anything. And they
can get large. For example the exif_all field in one of my
simple tests is nearly 7 kB large. Although VARCHAR might
work, TEXT feels just better as the storage type.

12 years agoJS: fix first part of #422; make items in drop-down acutally work
Jef van Schendel [Sun, 1 Apr 2012 16:06:49 +0000 (18:06 +0200)]
JS: fix first part of #422; make items in drop-down acutally work

12 years agoCSS: change padding-left to margin-left
Jef van Schendel [Sun, 1 Apr 2012 15:25:50 +0000 (17:25 +0200)]
CSS: change padding-left to margin-left

12 years agoCSS: change comment margins
Jef van Schendel [Sun, 1 Apr 2012 15:25:25 +0000 (17:25 +0200)]
CSS: change comment margins

12 years agoHTML/CSS: comment style changes
Jef van Schendel [Sun, 1 Apr 2012 15:22:37 +0000 (17:22 +0200)]
HTML/CSS: comment style changes

12 years agoHTML: remove elements for comment button style change
Jef van Schendel [Sun, 1 Apr 2012 15:11:57 +0000 (17:11 +0200)]
HTML: remove elements for comment button style change

12 years agoCSS: remove background
Jef van Schendel [Sun, 1 Apr 2012 15:07:52 +0000 (17:07 +0200)]
CSS: remove background

12 years agoLogo margin fix
Jef van Schendel [Sun, 1 Apr 2012 15:04:50 +0000 (17:04 +0200)]
Logo margin fix

12 years agoAdd dropdown to header
Jef van Schendel [Sun, 1 Apr 2012 14:02:23 +0000 (16:02 +0200)]
Add dropdown to header

12 years agoRevert changes from last commit; I am an idiot
Jef van Schendel [Sat, 31 Mar 2012 14:55:35 +0000 (16:55 +0200)]
Revert changes from last commit; I am an idiot

12 years agoSwitch over content to new layout/text; slight css edits
Jef van Schendel [Sat, 31 Mar 2012 14:48:06 +0000 (16:48 +0200)]
Switch over content to new layout/text; slight css edits

12 years agoIncrease bottom margin header
Jef van Schendel [Sat, 31 Mar 2012 12:25:37 +0000 (14:25 +0200)]
Increase bottom margin header

12 years agoSmall CSS changes to header
Jef van Schendel [Sat, 31 Mar 2012 12:10:58 +0000 (14:10 +0200)]
Small CSS changes to header

12 years agoAdded pygst.require('0.10') since it's absence breaks stuff
Joar Wandborg [Fri, 30 Mar 2012 15:50:56 +0000 (17:50 +0200)]
Added pygst.require('0.10') since it's absence breaks stuff

12 years agoUpdated Video docs, so that I won't forget
Joar Wandborg [Thu, 29 Mar 2012 22:18:54 +0000 (00:18 +0200)]
Updated Video docs, so that I won't forget

12 years agoCleaned up media_types.video.transcoders
Joar Wandborg [Thu, 29 Mar 2012 21:53:05 +0000 (23:53 +0200)]
Cleaned up media_types.video.transcoders

12 years agoAnd remove some now useless methods.
Elrond [Thu, 29 Mar 2012 21:05:34 +0000 (23:05 +0200)]
And remove some now useless methods.

12 years agoRemove the DictReadProxy thing.
Elrond [Thu, 29 Mar 2012 20:52:39 +0000 (22:52 +0200)]
Remove the DictReadProxy thing.

And some other stuff, that the converter does not need.

12 years agoFix some simple errors.
Elrond [Thu, 29 Mar 2012 20:31:51 +0000 (22:31 +0200)]
Fix some simple errors.

12 years agoChange models to a _v0 suffix.
Elrond [Thu, 29 Mar 2012 20:12:34 +0000 (22:12 +0200)]
Change models to a _v0 suffix.

And add the image and video media_data tables.
And start to rewrite the convert tool.

12 years agoMake a copy of models for v0.
Elrond [Thu, 29 Mar 2012 19:36:07 +0000 (21:36 +0200)]
Make a copy of models for v0.

12 years agoMerge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Joar Wandborg [Thu, 29 Mar 2012 21:01:40 +0000 (23:01 +0200)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

12 years agoCleanded up video imports, removed PyGTK dependency
Joar Wandborg [Thu, 29 Mar 2012 20:52:39 +0000 (22:52 +0200)]
Cleanded up video imports, removed PyGTK dependency

12 years agoAudio: And add empty migrations.
Elrond [Thu, 29 Mar 2012 19:52:26 +0000 (21:52 +0200)]
Audio: And add empty migrations.

12 years agoAudio: Add models and disable media_data.
Elrond [Thu, 29 Mar 2012 19:45:05 +0000 (21:45 +0200)]
Audio: Add models and disable media_data.

1. Add a super-minimal media_data table for audio.
   It currently contains nothing.
   Like the ascii one.

2. To avoid media_data trouble -- for now -- disable the
   creation of media_data completrly.

12 years agoMerge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Joar Wandborg [Thu, 29 Mar 2012 14:19:11 +0000 (16:19 +0200)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

12 years agoSeeking works in firefox
Joar Wandborg [Thu, 29 Mar 2012 14:06:36 +0000 (16:06 +0200)]
Seeking works in firefox

- Added support for indicating multiple buffered
  ranges (Firefox)
- Added volume slider (Chromium)
- Replaced stop button with faux pause button
- Added 'ended' event handler

12 years agoThe video media_type needs pygtk/gtk.
Elrond [Thu, 29 Mar 2012 11:15:38 +0000 (13:15 +0200)]
The video media_type needs pygtk/gtk.

Note in the docs, that the video media_type needs the gtk
and pygtk modules and where to get them on debian.

12 years ago411: Add relationship and backrefs to media_data tables.
Elrond [Wed, 28 Mar 2012 11:19:11 +0000 (13:19 +0200)]
411: Add relationship and backrefs to media_data tables.

Adding proper relationship()s and especially backref()s
will delete media_data rows along with the main MediaEntry.
This fixes #411.

12 years agoChanged audio.* Image* imports
Joar Wandborg [Tue, 27 Mar 2012 21:43:15 +0000 (23:43 +0200)]
Changed audio.* Image* imports

so that they no longer import from PIL explicitly.
This is due to explicit PIL.Image* imports failing
on a Ubuntu machine within virtualenv.

PIL is a mystery I have yet to find the energy to unravel.

The 'implicit' approach works both for the affected
machine and my local machine and I've seen it more often
out in the wild, so I'm assuming it is the right way.

12 years agoFixed test_submission -> test_evil_file test
Joar Wandborg [Tue, 27 Mar 2012 14:38:41 +0000 (16:38 +0200)]
Fixed test_submission -> test_evil_file test

12 years agoMerge remote-tracking branch 'joar/audio+sniffing'
Joar Wandborg [Tue, 27 Mar 2012 10:05:09 +0000 (12:05 +0200)]
Merge remote-tracking branch 'joar/audio+sniffing'

Conflicts:
mediagoblin/media_types/image/processing.py
mediagoblin/media_types/video/__init__.py
mediagoblin/media_types/video/processing.py
mediagoblin/tests/test_submission.py

12 years agoRemoving superfluous whitespace
Christopher Allan Webber [Mon, 26 Mar 2012 20:11:05 +0000 (15:11 -0500)]
Removing superfluous whitespace

12 years agoMerge remote-tracking branch 'remotes/slikdigit/bassam'
Christopher Allan Webber [Mon, 26 Mar 2012 20:09:35 +0000 (15:09 -0500)]
Merge remote-tracking branch 'remotes/slikdigit/bassam'

Conflicts:
mediagoblin/media_types/image/processing.py

12 years agoMerge remote-tracking branch 'remotes/bretts/bug261-resized-filenames'
Christopher Allan Webber [Mon, 26 Mar 2012 19:33:12 +0000 (14:33 -0500)]
Merge remote-tracking branch 'remotes/bretts/bug261-resized-filenames'

12 years agoReload the user for current values.
Elrond [Sun, 26 Feb 2012 14:14:50 +0000 (15:14 +0100)]
Reload the user for current values.

This might not be needed, but it helped at one point.

12 years agoReload and detach the test user.
Elrond [Sun, 26 Feb 2012 14:15:10 +0000 (15:15 +0100)]
Reload and detach the test user.

The code often needs to know some fields of the test user
even after doing some sql and stuff. The solultion is to
reload it and properly detach it from its Session. That way
all its fields are available and the whole thing is not
connected to a session. It feels like a normal object.