Fix merge conflict in prev_next.html
[mediagoblin.git] / setup.py
2012-03-05 Jef van SchendelMerge branch 'keyboard_nav'
2012-03-04 Jef van SchendelMerge branch 'newlayout' into newlayout-stage
2012-02-27 ElrondMerge remote-tracking branch 'cwebber/celerysql'
2012-02-26 Christopher Allan... kombu-sqlalchemy a requirement in order for kombu sqlal...
2012-02-21 Jef van SchendelResolve merge conflicts
2012-02-19 Christopher Allan... We now require sqlalchemy and sqlalchemy-migrate
2012-02-18 Christopher Allan... Merge branch 'master' into sqlmigrate
2012-02-08 Will Kahn-GreeneFix copyright statements; add LICENSE for EXIF.py
2012-01-28 Joar WandborgMerge remote-tracking branch 'joar/exif-rebase'
2012-01-28 Christopher Allan... We were using translitcodec and I didn't understand...
2012-01-28 Christopher Allan... We aren't using translitcodec anymore. Kill it!
2012-01-26 ElrondPackaging improvement by Clint Byrum from Debian/Ubuntu
2012-01-17 Aaron WilliamsonMerged changes with upstream
2011-12-15 ElrondMerge remote branch 'remotes/cwebber/sqlalchemy'
2011-12-13 ElrondMerge remote branch 'joar/b681-comments_from_reviewing_...
2011-12-13 Jef van SchendelMerge jQuery branch, resolve conflicts
2011-12-05 Christopher Allan... Cloudfiles not actually a dependency, removing from...
2011-12-05 Christopher Allan... Merge remote-tracking branch 'remotes/lorochka85/bug852...
2011-12-03 ElrondMerge remote branch 'remotes/manolinux/671_spaces_in_ta...
2011-11-27 ElrondMerge remote branch 'remotes/manolinux/683_text_separat...
2011-11-26 ElrondMerge remote branch 'remotes/inconexo/588_lowercase_ext...
2011-11-25 Christopher Allan... Uncommenting requires=['gst'] till I figure out why...
2011-11-24 Christopher Allan... Merge remote-tracking branch 'remotes/jwandborg/master'
2011-11-21 Joar WandborgMerge branch 'video_gstreamer-only'
2011-11-20 Joar WandborgStashing changes
2011-11-20 ElrondMerge remote branch 'remotes/aaronw/bug614_verification...
2011-11-19 loraMerge branch 'master' of git://gitorious.org/mediagobli...
2011-11-18 Christopher Allan... Merge branch 'master' of gitorious.org:mediagoblin...
2011-11-14 Christopher Allan... Merge remote-tracking branch 'remotes/nyergler/pep8...
2011-10-27 Joar WandborgAdded pygtk to dependencies
2011-10-18 Christopher Allan... Require an older version of WebOb as a stopgap fix...
2011-10-14 Joar WandborgRemoved arista dependency
2011-10-05 Joar WandborgMultimedia refractoring, and added video thumbnail...
2011-10-01 Nathan YerglerWhitespace and formatting cleanup.
2011-09-28 Joar WandborgAdded arista to install requires
2011-09-08 Christopher Allan... Merge branch 'gullydwarf-cfdv-f357_lost_password_functi...
2011-09-06 Christopher Allan... Merge branch 'i507_beaker_cache'
2011-09-02 Will Kahn-Greene508. Updates copyright/license information
2011-09-02 Will Kahn-GreeneSwitches to Zooko's version method
2011-08-31 Christopher Allan... Merge remote branch 'remotes/gullydwarf-cfdv/b503_remov...
2011-08-27 Christopher Allan... Merge remote branch 'remotes/jwandborg/configure_smtp'
2011-08-23 Christopher Allan... Merge branch 'master' into jwandborg-f482_media_attachments
2011-08-21 Christopher Allan... Merge remote branch 'remotes/elrond/dev/storage_config'
2011-08-21 Christopher Allan... Slightly wrapping paste error middleware and turning...
2011-08-11 Christopher Allan... Merge branch 'master' into processing
2011-08-08 ElrondMerge remote branch 'upstream/master' into dev/mount_st...
2011-08-08 Christopher Allan... Merge remote branch 'remotes/schendjes/master'
2011-08-08 Joar WandborgMerge branch 'master' of git://gitorious.org/mediagobli...
2011-08-07 Christopher Allan... Tools to extract translation from python files and...
2011-08-05 Christopher Allan... Merge remote branch 'remotes/jwandborg/f477_cloudfiles'
2011-08-03 Joar WandborgFeature 477 - Support Cloud Files public storage
2011-08-03 Christopher Allan... Merge branch 'master' of gitorious.org:mediagoblin...
2011-08-01 Will Kahn-GreeneUpdating version to 0.0.4.
2011-08-01 Will Kahn-GreeneAdds additional metadata to setup.py
2011-07-16 Christopher Allan... Merge remote branch 'remotes/jwandborg/feature_400...
2011-07-09 Christopher Allan... Merge remote branch 'remotes/elrond/dev/init'
2011-07-07 Christopher Allan... Merge remote branch 'remotes/gullydwarf-cfdv/f424_email...
2011-07-07 Christopher Allan... Merge remote branch 'remotes/gullydwarf-cfdv/f423_match...
2011-07-07 Christopher Allan... Merge remote branch 'remotes/gullydwarf-cfdv/b404_v2_re...
2011-07-06 Chris MoylanMerge branch 'master' into test_submission_views_365
2011-07-05 Will Kahn-GreeneUpdates version to 0.0.3.
2011-06-25 Christopher Allan... Merge remote branch 'remotes/gullydwarf-cfdv/is330'
2011-06-22 Christopher Allan... Merge remote branch 'remotes/elrond/idea/invalidid'
2011-06-20 cfdvMerge remote-tracking branch 'origin/master' into is315
2011-06-20 Jef van SchendelMerge remote-tracking branch 'gitorious/master'
2011-06-20 Christopher Allan... Merge remote branch 'remotes/jwandborg/issue_363'
2011-06-20 Christopher Allan... Merge remote branch 'remotes/cmoylan/test_auth_views_364'
2011-06-19 cfdvMerge branch 'is330', remote-tracking branch 'origin...
2011-06-19 cfdvMerge remote-tracking branch 'origin/master' into is315
2011-06-19 Christopher Allan... Merge remote branch 'remotes/elrond/idea/globals_check'
2011-06-19 Christopher Allan... Re-commenting-out lxml from setup.py
2011-06-19 Christopher Allan... Merge branch 'configobj'
2011-06-18 Jef van SchendelMerge remote-tracking branch 'gitorious/master'
2011-06-18 Christopher Allan... Merge branch 'master' into configobj
2011-06-17 Christopher Allan... We require lxml. Updating setup.py to reflect that.
2011-06-16 Christopher Allan... Require ConfigObj
2011-06-15 Joar WandborgMerge branch 'master' of git.gitorious.org/mediagoblin...
2011-06-12 Joar WandborgMerge branch 'master' of git.gitorious.org/mediagoblin...
2011-06-12 Joar WandborgAdded Markdown rendering for `media_entry`
2011-06-06 Christopher Allan... Merge remote branch 'remotes/gandaro/324-bad-media...
2011-06-06 Jef van SchendelMerge remote-tracking branch 'gitorious/master'
2011-06-04 Christopher Allan... Proper webtest infrastructure... seems to be about...
2011-06-02 Jef van SchendelMerge remote-tracking branch 'gitorious/master'
2011-06-02 ElrondMerge remote branch 'upstream/master'
2011-06-01 Christopher Allan... 0.0.2 of GNU MediaGoblin!
2011-05-16 Christopher Allan... ./bin/gmg shell! Should make a lot of peoples' hacking...
2011-05-13 Aaron WilliamsonGenerate unique slugs for newly submitted images.
2011-05-12 Christopher Allan... Added extraction stuff that's not used but appears...
2011-05-08 Christopher Allan... Removing unused sys import from setup.py
2011-05-04 Joar WandborgMerge branch 'master' of git.gitorious.org/mediagoblin...
2011-05-04 Christopher Allan... Require PIL
2011-05-01 Christopher Allan... Merge branch 'master' into celerysubmit
2011-05-01 Christopher Allan... Require sphinx & jinja2 for good measure :)
2011-04-24 Christopher Allan... Time to require celery!
2011-04-17 Christopher Allan... Buildout script which creates user_dev directory and...
2011-04-13 Will Kahn-GreeneChanges Mediagoblin -> MediaGoblin.
2011-04-09 Christopher Allan... Include werkzeug. We'll need it for werkzeug.util...
2011-04-02 Christopher Allan... Merge branch 'master' of gitorious.org:mediagoblin...
2011-04-02 Christopher Allan... Unit tests for our bcrypt auth stuff. Our first tests!
2011-04-02 Christopher Allan... Basic authentication tools using py-bcrypt
next