mediagoblin.git
12 years agoChanged media processing delegation to a 'sniffing' method
Joar Wandborg [Wed, 15 Feb 2012 00:15:29 +0000 (01:15 +0100)]
Changed media processing delegation to a 'sniffing' method

- Added sniff handlers to all media plugins
  All of them except audio returning False for ANYTHING
  at the moment.

12 years agoAudio media handler, media sniffing, video fixes
Joar Wandborg [Tue, 14 Feb 2012 22:26:07 +0000 (23:26 +0100)]
Audio media handler, media sniffing, video fixes

* Added audio processing code
* Added audio display template
* Added audio configuration setting
* Changed video docstring

12 years agoFix docs version
Will Kahn-Greene [Thu, 9 Feb 2012 16:00:30 +0000 (11:00 -0500)]
Fix docs version

12 years agoUpdate version to 0.3.0-dev
Will Kahn-Greene [Thu, 9 Feb 2012 15:49:50 +0000 (10:49 -0500)]
Update version to 0.3.0-dev

12 years agoUpdate version numbers
Will Kahn-Greene [Thu, 9 Feb 2012 15:44:36 +0000 (10:44 -0500)]
Update version numbers

12 years agoCommitting extracted and compiled translations
Christopher Allan Webber [Thu, 9 Feb 2012 15:30:26 +0000 (09:30 -0600)]
Committing extracted and compiled translations

12 years agoRemoving youcanhelp stuff
Will Kahn-Greene [Thu, 9 Feb 2012 15:23:03 +0000 (10:23 -0500)]
Removing youcanhelp stuff

This was never used. It doesn't support Texinfo files. It was only half
completed. Best to remove it.

12 years agoUpdate copyright headers for shell scripts
Will Kahn-Greene [Thu, 9 Feb 2012 15:20:42 +0000 (10:20 -0500)]
Update copyright headers for shell scripts

12 years agoAdded info on how to enable ascii art
Christopher Allan Webber [Thu, 9 Feb 2012 15:15:23 +0000 (09:15 -0600)]
Added info on how to enable ascii art

12 years agoUpdating codebase.rst to reflect the modern mediagoblin world
Christopher Allan Webber [Thu, 9 Feb 2012 15:10:08 +0000 (09:10 -0600)]
Updating codebase.rst to reflect the modern mediagoblin world

 - adding/removing libraries listed as appropriate
 - buildout->virtualenv references
 - Updating directory structure description to reflect current reality

12 years agoMinor rewording
Will Kahn-Greene [Wed, 8 Feb 2012 16:07:19 +0000 (11:07 -0500)]
Minor rewording

Tried to address confusion I had when I read the document and tweaked
some formatting.

12 years agoFix copyright statements; add LICENSE for EXIF.py
Will Kahn-Greene [Wed, 8 Feb 2012 15:46:33 +0000 (10:46 -0500)]
Fix copyright statements; add LICENSE for EXIF.py

12 years agoFully qualify the import of asciitoimage
Christopher Allan Webber [Wed, 8 Feb 2012 15:29:24 +0000 (09:29 -0600)]
Fully qualify the import of asciitoimage

12 years agoAdded CC0 header to all MediaGoblin docs in docs/source/
Christopher Allan Webber [Wed, 8 Feb 2012 03:25:41 +0000 (21:25 -0600)]
Added CC0 header to all MediaGoblin docs in docs/source/

12 years agoCommitting extracted and compiled translations
Christopher Allan Webber [Sun, 5 Feb 2012 22:23:29 +0000 (16:23 -0600)]
Committing extracted and compiled translations

12 years agoCommitting present MediaGoblin translations before pushing extracted messages
Christopher Allan Webber [Sun, 5 Feb 2012 22:23:18 +0000 (16:23 -0600)]
Committing present MediaGoblin translations before pushing extracted messages

12 years agoCommitting present MediaGoblin translations before pushing extracted messages
Christopher Allan Webber [Sun, 5 Feb 2012 22:21:14 +0000 (16:21 -0600)]
Committing present MediaGoblin translations before pushing extracted messages

12 years agoFix EXIF based image rotation test
Elrond [Sat, 4 Feb 2012 19:54:14 +0000 (20:54 +0100)]
Fix EXIF based image rotation test

The test checks for a pixel value after rotation (good
idea!). But the value seems to be a bit different on some
platforms, so use a list of seen values.

Not the perfect solution, but it works.

12 years agoASCII media support - Fixes
Joar Wandborg [Sat, 4 Feb 2012 19:51:05 +0000 (20:51 +0100)]
ASCII media support - Fixes

- Added debug logging in
  - mediagoblin.processing
  - mediagoblin.media_types.ascii.processing
  - mediagoblin.media_types.ascii.asciitoimage

12 years agoASCII art support - Fixes
Joar Wandborg [Thu, 2 Feb 2012 20:28:21 +0000 (21:28 +0100)]
ASCII art support - Fixes

- Improved(?) character set detection, chardet will not win
  over UTF-8 unless it is >= 90% sure.
- Changed the unicode.txt to ascii-portable.txt, since there is
  no unicode in the file.
- etc.

12 years agoAdded extensions 'asc' and 'nfo' to ASCII media type
Joar Wandborg [Thu, 2 Feb 2012 18:54:47 +0000 (19:54 +0100)]
Added extensions 'asc' and 'nfo' to ASCII media type

12 years agoIt's 2012 all up in here
Christopher Allan Webber [Thu, 2 Feb 2012 15:44:13 +0000 (09:44 -0600)]
It's 2012 all up in here

12 years agoUpdating deployment guide so that it can handle the current virtualenv site-packages...
Christopher Allan Webber [Thu, 2 Feb 2012 15:29:25 +0000 (09:29 -0600)]
Updating deployment guide so that it can handle the current virtualenv site-packages changes

Now it should try using --system-site-packages and if that
fails (older version) it tries it without the argument.

12 years agoSome small SQL model improvements
Elrond [Fri, 27 Jan 2012 23:33:23 +0000 (00:33 +0100)]
Some small SQL model improvements

- Add default for User.email_verified
- Add default for MediaEntry.state
- Let PathTupleWithSlashes store [] as "NULL",
  but not handling the reverse properly yet!
- Add _id alias field to MediaEntry and MediaComment

12 years agoCommitting extracted and compiled translations
Christopher Allan Webber [Sun, 29 Jan 2012 19:47:51 +0000 (13:47 -0600)]
Committing extracted and compiled translations

12 years agoCommitting present MediaGoblin translations before pushing extracted messages
Christopher Allan Webber [Sun, 29 Jan 2012 19:47:36 +0000 (13:47 -0600)]
Committing present MediaGoblin translations before pushing extracted messages

12 years agoAdding a line reminding user to push up commits
Christopher Allan Webber [Sun, 29 Jan 2012 19:32:41 +0000 (13:32 -0600)]
Adding a line reminding user to push up commits

12 years agoCommitting extracted and compiled translations
Christopher Allan Webber [Sun, 29 Jan 2012 19:31:47 +0000 (13:31 -0600)]
Committing extracted and compiled translations

12 years agoHm, maybe this is better... that didn't fix the stop-in-the-middle issue.
Christopher Allan Webber [Sun, 29 Jan 2012 19:30:18 +0000 (13:30 -0600)]
Hm, maybe this is better... that didn't fix the stop-in-the-middle issue.

12 years agoUpdate update_translations script to consider several things conditionally
Christopher Allan Webber [Sun, 29 Jan 2012 19:22:21 +0000 (13:22 -0600)]
Update update_translations script to consider several things conditionally

Specifically, previously if there was nothing to git add, whole script would just die

12 years agoNearly complete support for Tags
Elrond [Wed, 4 Jan 2012 21:00:44 +0000 (22:00 +0100)]
Nearly complete support for Tags

These changes allow all of the rest of the code to use tags
in sql as they were used on mongo. It's not efficient at
all, as changing tags usually means to remove all old tags
and adding all new.

The only problem here is: Old slugs for tags are not
removed, because they're shared across all MediaTags and
dropping orphans is not always easy.

12 years agoResized a test_exif test image. 1.9M is unnecessarily large.
Joar Wandborg [Sat, 28 Jan 2012 17:53:36 +0000 (18:53 +0100)]
Resized a test_exif test image. 1.9M is unnecessarily large.

12 years agoMerge remote-tracking branch 'joar/exif-rebase'
Joar Wandborg [Sat, 28 Jan 2012 17:47:01 +0000 (18:47 +0100)]
Merge remote-tracking branch 'joar/exif-rebase'

12 years agoAdd develover sql switch
Elrond [Sat, 24 Dec 2011 15:53:32 +0000 (16:53 +0100)]
Add develover sql switch

If you want to play with the current state of sql, you need
a switch to turn it on. So here is the super secret
developer switch.

So you want to know where it is?

Here it is:

Create a file mediagoblin/db/sql_switch.py and put one line
in it: "use_sql = True" (or False to disable again). Right,
that's it. If you want to delete it, remember to delete the
*.pyc too.

Be careful not to "git add" it by accident!

12 years agoWe were using translitcodec and I didn't understand how it worked ;)
Christopher Allan Webber [Sat, 28 Jan 2012 17:31:26 +0000 (11:31 -0600)]
We were using translitcodec and I didn't understand how it worked ;)

My bad!

12 years agoWe aren't using translitcodec anymore. Kill it!
Christopher Allan Webber [Sat, 28 Jan 2012 17:13:03 +0000 (11:13 -0600)]
We aren't using translitcodec anymore.  Kill it!

12 years agoLet some code support "media without slug"
Elrond [Sun, 22 Jan 2012 16:11:43 +0000 (17:11 +0100)]
Let some code support "media without slug"

The upcoming SQL database will allow having media without a
slug again. This might especially be useful for API
support, where the uploaded image (media) does not have
*any* information to generate a slug from.

This code change mostly allows the sql backend to have no
slug in its model and improves some parts to properly
handle that.

It specifically does not have any web frontend support to
edit/create MediaEntries with no slug.

12 years agoJavaScript fixes - AGPL headers, etc
Joar Wandborg [Sat, 28 Jan 2012 00:31:56 +0000 (01:31 +0100)]
JavaScript fixes - AGPL headers, etc

- Added AGPL header to comment_show.js, show_password.js
  and geolocation-map.js
- Removed console.log from geolocation-map.js

12 years agoScripts and styleshets for geolocation map - Conditional
Joar Wandborg [Fri, 27 Jan 2012 01:13:07 +0000 (02:13 +0100)]
Scripts and styleshets for geolocation map - Conditional

Scripts and stylesheets for the geolocation map are now
switched on/off with the geolocation map itself.

12 years agoAdding previously erroneously gitignored extlib/leaflet/{lib,dist,build}/ files
Joar Wandborg [Fri, 27 Jan 2012 00:55:50 +0000 (01:55 +0100)]
Adding previously erroneously gitignored extlib/leaflet/{lib,dist,build}/ files

12 years agoUpdated .gitignore due to it blacking out the extlib/leaflet/dist/ directory
Joar Wandborg [Fri, 27 Jan 2012 00:52:57 +0000 (01:52 +0100)]
Updated .gitignore due to it blacking out the extlib/leaflet/dist/ directory

12 years agoMove declarative_base Base into base.py
Elrond [Sun, 22 Jan 2012 19:17:43 +0000 (20:17 +0100)]
Move declarative_base Base into base.py

The base class of all models "Base" should be in base.py.

12 years agoAdd "mediagoblin/templates *.txt" to packaging
Elrond [Thu, 26 Jan 2012 21:14:48 +0000 (22:14 +0100)]
Add "mediagoblin/templates *.txt" to packaging

Again thanks to Clint Byrum!

12 years agoDrop all buildout things
Elrond [Thu, 26 Jan 2012 21:10:46 +0000 (22:10 +0100)]
Drop all buildout things

virtualenv is working for everyone.
No need for the buildout stuff any more.

12 years agoPackaging improvement by Clint Byrum from Debian/Ubuntu
Elrond [Thu, 26 Jan 2012 20:33:49 +0000 (21:33 +0100)]
Packaging improvement by Clint Byrum from Debian/Ubuntu

1) MANIFEST.in missed a bunch of things, especially
   config_spec.ini.

2) You need to specify include_package_data=True in
   setup.py to actually activate MANIFEST.in it seems.

Thanks go to Clint Byrum!

12 years agoRefractored media.html template and related includes
Joar Wandborg [Wed, 25 Jan 2012 22:53:02 +0000 (23:53 +0100)]
Refractored media.html template and related includes

- Added <p> around license part to separate it properly
  from other sidebar content
- Moved exif part to mediagoblin/utils/exif.html
- Moved geolocation map to mediagoblin/utils/geolocation_map.html

12 years agoActs on feedback from Chris
Joar Wandborg [Wed, 25 Jan 2012 22:05:47 +0000 (23:05 +0100)]
Acts on feedback from Chris

- Added EXIF tests
- Removed pdb from image processing "ifmain"
- Fixed comment typo in image processing
- Removed unused import in tools.exif

12 years agoMoved EXIF to sidebar, added conditions for visibility configuration settings
Joar Wandborg [Fri, 20 Jan 2012 09:27:26 +0000 (10:27 +0100)]
Moved EXIF to sidebar, added conditions for visibility configuration settings

12 years agoAdded exif_visisble and geolocation_map_visible to config_spec
Joar Wandborg [Fri, 20 Jan 2012 01:31:29 +0000 (02:31 +0100)]
Added exif_visisble and geolocation_map_visible to config_spec

12 years agoEXIF fixes
Joar Wandborg [Mon, 16 Jan 2012 02:45:58 +0000 (03:45 +0100)]
EXIF fixes

- Moved exif functions from mediagoblin.media_types.image.processing
  to mediagoblin.tools.exif
- Moved EXIF.py link from mediagoblin.media_types to mediagoblin.tools.extlib
- Refractored and updated EXIF exctraction and presentation

12 years agoRemoved link to EXIF.py in media_types.image
Joar Wandborg [Mon, 16 Jan 2012 02:25:57 +0000 (03:25 +0100)]
Removed link to EXIF.py in media_types.image

12 years agoEXIF extraction, geolocation map, image rotation
Joar Wandborg [Tue, 10 Jan 2012 01:59:07 +0000 (02:59 +0100)]
EXIF extraction, geolocation map, image rotation

- Images are now rotated based on EXIF image orientation
  (in case the image isn't flipped on X or Y axis or
  correctly oriented, then we do nothing)
- *Always* create a medium.jpg in image.processing, for
  the sake of rotation of display image
- Extract EXIF and GPS tags from images and insert them
  into media_data
- Geolocation map display added to media.html
- EXIF display added, then removed. It is not in this
  revision, although some of it is (the "EXIF" h4
  header). Need to make it presentable, filtering out
  purely robotical tags, perhaps.

12 years agoAdded code for leaflet geolocation map
Joar Wandborg [Tue, 10 Jan 2012 01:53:46 +0000 (02:53 +0100)]
Added code for leaflet geolocation map

12 years agoInstalled EXIF.py in extlibs/
Joar Wandborg [Tue, 10 Jan 2012 01:14:37 +0000 (02:14 +0100)]
Installed EXIF.py in extlibs/

12 years agoInstalled leaflet in extlib
Joar Wandborg [Tue, 10 Jan 2012 00:54:37 +0000 (01:54 +0100)]
Installed leaflet in extlib

12 years agoProper url_to_{prev,next} for SQL
Elrond [Wed, 4 Jan 2012 21:13:19 +0000 (22:13 +0100)]
Proper url_to_{prev,next} for SQL

Uses complete sqlalchemy syntax now.

12 years agoCreate a fully functional get_comments for SQL
Elrond [Mon, 2 Jan 2012 12:07:16 +0000 (13:07 +0100)]
Create a fully functional get_comments for SQL

Using proper sqlalchemy syntax instead of the emulated
mongo one.

12 years agoCanonical license URIS for CC stuff should have a trailing slash.
Christopher Allan Webber [Sat, 21 Jan 2012 23:00:42 +0000 (17:00 -0600)]
Canonical license URIS for CC stuff should have a trailing slash.

12 years agoShow the license list in sorted form
Christopher Allan Webber [Sat, 21 Jan 2012 22:58:03 +0000 (16:58 -0600)]
Show the license list in sorted form

12 years agoOops, I broke teh all rights reserved ;)
Christopher Allan Webber [Sat, 21 Jan 2012 22:56:49 +0000 (16:56 -0600)]
Oops, I broke teh all rights reserved ;)

12 years agoProvided a SORTED_SUPPORTED_LICENSES (but keep the old unsorted dict!)
Christopher Allan Webber [Sat, 21 Jan 2012 22:51:21 +0000 (16:51 -0600)]
Provided a SORTED_SUPPORTED_LICENSES (but keep the old unsorted dict!)

12 years agoConvert over the license field, too!
Christopher Allan Webber [Sat, 21 Jan 2012 22:41:07 +0000 (16:41 -0600)]
Convert over the license field, too!

12 years agoLicense "all rights reserved" default should be None/NULL, not empty string
Christopher Allan Webber [Sat, 21 Jan 2012 22:40:39 +0000 (16:40 -0600)]
License "all rights reserved" default should be None/NULL, not empty string

12 years agoFix unit tests with new license support
Elrond [Sat, 21 Jan 2012 18:24:36 +0000 (19:24 +0100)]
Fix unit tests with new license support

Make the license field in the forms optional and let them
properly be defaulted to "".

12 years agoAdded migration for license field, resolved conflict in db/sql/models.py
Aaron Williamson [Fri, 20 Jan 2012 03:00:08 +0000 (22:00 -0500)]
Added migration for license field, resolved conflict in db/sql/models.py

12 years agoAdd copyright header and a bit of pep8ification
Elrond [Thu, 19 Jan 2012 23:17:05 +0000 (00:17 +0100)]
Add copyright header and a bit of pep8ification

Nearly all the sql files missed a copyright header.
So added it!
And while there fixed a few pep8 things.

12 years agoUse custom query class
Elrond [Sat, 24 Dec 2011 17:20:20 +0000 (18:20 +0100)]
Use custom query class

A custom query class allows to add more methods on
queries (read: "cursors").

This custom query class especially adds a .sort with a
calling convention exactly like the mongo one.
Makes a lot of existing code happy!

12 years agoMinor formatting and syntax fix.
Aaron Williamson [Thu, 19 Jan 2012 02:21:49 +0000 (21:21 -0500)]
Minor formatting and syntax fix.

12 years agoMoved get_license_data to mixin.py, added license to sql media model, added translati...
Aaron Williamson [Thu, 19 Jan 2012 02:07:55 +0000 (21:07 -0500)]
Moved get_license_data to mixin.py, added license to sql media model, added translation tags to license template.

12 years agoMerge branch 'mediagoblin-upstream' into feature544_basic_license_data
Aaron Williamson [Thu, 19 Jan 2012 01:40:18 +0000 (20:40 -0500)]
Merge branch 'mediagoblin-upstream' into feature544_basic_license_data

12 years agosql/fake.py: Some fake objects/methods to calm the code
Elrond [Thu, 29 Dec 2011 10:07:58 +0000 (11:07 +0100)]
sql/fake.py: Some fake objects/methods to calm the code

sql/fake.py contains some fake classes and functions to
calm the rest of the code base. Or provide super minimal
implementations.

Currently:
- ObjectId "class": It's a function mostly doing
  int(first_arg) to convert string primary keys into
  integer primary keys.
- InvalidId exception
- DESCENING "constant"

12 years agoCleaned the code
Michele Azzolari [Tue, 17 Jan 2012 22:15:47 +0000 (23:15 +0100)]
Cleaned the code

12 years agoWe handle exceptions if PuSH fails
Michele Azzolari [Tue, 17 Jan 2012 21:42:36 +0000 (22:42 +0100)]
We handle exceptions if PuSH fails

12 years agoMerge remote branch 'remotes/macno/pushatom'
Elrond [Tue, 17 Jan 2012 17:30:15 +0000 (18:30 +0100)]
Merge remote branch 'remotes/macno/pushatom'

* remotes/macno/pushatom:
  As per spec, we permit to have more then 1 hub
  As suggested by Elrond, we use only one setting
  Default is now PuSH disabled
  Added PuSH capability

12 years agoChanged license.html to fit new layout better
Aaron Williamson [Tue, 17 Jan 2012 06:23:21 +0000 (01:23 -0500)]
Changed license.html to fit new layout better

12 years agoFixed a syntax error in edit/views and added back in some missing license stuff from...
Aaron Williamson [Tue, 17 Jan 2012 06:22:02 +0000 (01:22 -0500)]
Fixed a syntax error in edit/views and added back in some missing license stuff from models

12 years agoAdded new files
Aaron Williamson [Tue, 17 Jan 2012 06:13:55 +0000 (01:13 -0500)]
Added new files

12 years agoFixed merge with upstream
Aaron Williamson [Tue, 17 Jan 2012 06:05:15 +0000 (01:05 -0500)]
Fixed merge with upstream

12 years agoMerged changes with upstream
Aaron Williamson [Tue, 17 Jan 2012 05:59:21 +0000 (00:59 -0500)]
Merged changes with upstream

12 years agoFirst crack at basic license support.
Aaron Williamson [Tue, 17 Jan 2012 05:33:55 +0000 (00:33 -0500)]
First crack at basic license support.

12 years agoSmall fix to simplify font style
Jef van Schendel [Sun, 15 Jan 2012 16:23:21 +0000 (17:23 +0100)]
Small fix to simplify font style

12 years agoAnother small text style fix
Jef van Schendel [Sun, 15 Jan 2012 16:10:35 +0000 (17:10 +0100)]
Another small text style fix

12 years agoSmall margin/font-weight fix
Jef van Schendel [Sun, 15 Jan 2012 16:07:15 +0000 (17:07 +0100)]
Small margin/font-weight fix

12 years agoDrop sessions with invalid ObjectIds
Elrond [Fri, 13 Jan 2012 21:59:14 +0000 (22:59 +0100)]
Drop sessions with invalid ObjectIds

The session can contain invalid objectids when switching a
more or less live instance (with logged in users) from
mongo to sql or vice versa.
So drop the complete session and force the user to login
again.

12 years agoMove maketarball.sh into devtools/
Elrond [Sat, 14 Jan 2012 11:54:16 +0000 (12:54 +0100)]
Move maketarball.sh into devtools/

Now that there is a devtools directory, use it!

12 years agomake this script executable
Christopher Allan Webber [Sat, 14 Jan 2012 02:27:53 +0000 (20:27 -0600)]
make this script executable

12 years agoSimple translation update script
Christopher Allan Webber [Sat, 14 Jan 2012 02:26:36 +0000 (20:26 -0600)]
Simple translation update script

12 years agoFix request.user==None error
Elrond [Fri, 13 Jan 2012 22:38:21 +0000 (23:38 +0100)]
Fix request.user==None error

If one isn't logged in and views the profile of a user
without media, one gets a problem, because request.user is
None and has no _id attribute.

Fix this.

12 years agoRemove unnecessary piece of text in media.html. Fix "Markdown text" indentation so...
Jef van Schendel [Fri, 13 Jan 2012 22:23:02 +0000 (23:23 +0100)]
Remove unnecessary piece of text in media.html. Fix "Markdown text" indentation so they are the same.

12 years agoAdd CC0 license header to Sphinx MediaGoblin theme (mg.css)
Jef van Schendel [Fri, 13 Jan 2012 16:38:20 +0000 (17:38 +0100)]
Add CC0 license header to Sphinx MediaGoblin theme (mg.css)

12 years agoAs per spec, we permit to have more then 1 hub
Michele Azzolari [Thu, 12 Jan 2012 10:05:05 +0000 (11:05 +0100)]
As per spec, we permit to have more then 1 hub

12 years agoAs suggested by Elrond, we use only one setting
Michele Azzolari [Wed, 11 Jan 2012 23:00:28 +0000 (00:00 +0100)]
As suggested by Elrond, we use only one setting

12 years agoDefault is now PuSH disabled
Michele Azzolari [Wed, 11 Jan 2012 15:11:23 +0000 (16:11 +0100)]
Default is now PuSH disabled

12 years agoAdded PuSH capability
Michele Azzolari [Wed, 11 Jan 2012 14:48:37 +0000 (15:48 +0100)]
Added PuSH capability

12 years agoAdd MediaFile table and related infrastructure.
Elrond [Sat, 31 Dec 2011 22:01:34 +0000 (23:01 +0100)]
Add MediaFile table and related infrastructure.

- This adds a new SQL table field type for path tuples.
  They're stored as '/' separated unicode strings.

- Uses it to implement a MediaFile table.

- Add relationship and proxy fields on MediaEntry to give a
  nice media_files "view" there.

- Let the converter fill the MediaFile.

12 years agoDot-Notation: Some random places
Elrond [Sun, 25 Dec 2011 19:04:41 +0000 (20:04 +0100)]
Dot-Notation: Some random places

12 years agoFix url_for_self mixup
Elrond [Wed, 11 Jan 2012 10:16:35 +0000 (11:16 +0100)]
Fix url_for_self mixup

Move changes from mongo/models:url_for_self back into
mixin:url_for_self.

12 years agoMerge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Christopher Allan Webber [Tue, 10 Jan 2012 14:12:30 +0000 (08:12 -0600)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

Conflicts:
mediagoblin/db/mongo/models.py

12 years agoFixed #724 and added extra infos to the atom feed (author uri and links to the html...
Michele Azzolari [Thu, 5 Jan 2012 17:48:23 +0000 (18:48 +0100)]
Fixed #724 and added extra infos to the atom feed (author uri and links to the html version of each entry)

12 years agoAdded check for request.user to media.html attachment-related conditional
Joar Wandborg [Tue, 10 Jan 2012 12:12:14 +0000 (13:12 +0100)]
Added check for request.user to media.html attachment-related conditional