1504 Commits

Author SHA1 Message Date
Christopher Allan Webber
5bb37b9480 Merge remote branch 'remotes/inconexo/613_custom_title' 2011-11-19 14:04:56 -06:00
Christopher Allan Webber
1bc231c766 Added Pablo Santos to the AUTHORS file 2011-11-19 14:03:01 -06:00
Christopher Allan Webber
7c378f2cd5 Allow user to set whether comments are ascending or descending 2011-11-19 14:01:38 -06:00
Christopher Allan Webber
5db324f7c6 Merge remote branch 'remotes/inconexo/441_comment_order' 2011-11-19 13:54:49 -06:00
Christopher Allan Webber
b4b7b6a57a Added Corey Farwell to the list of contributors 2011-11-19 13:42:30 -06:00
Corey Farwell
fc5695c538 incorrect path in nginx config 2011-11-19 10:43:31 -08:00
Pablo J. Urbano Santos
1a3138addd media_home: order comments by ascending date. 2011-11-19 19:15:41 +01:00
Pablo J. Urbano Santos
e62fc61194 Added parameter ascending to MediaEntry::get_comments, if true, comments
will be ordered ascending, otherwise descending
2011-11-19 19:11:42 +01:00
Pablo J. Urbano Santos
3c0411f51f Allow instance owners to customize html titles of page:
Added html_title config option.
	Made base.html template use html_title option as page title.
2011-11-19 17:07:41 +01:00
Christopher Allan Webber
53bc39755b Add app_config and global_config to the template environment 2011-11-19 08:33:29 -06:00
Christopher Allan Webber
6950c6c77c Adding app_config and global_config to the template environment 2011-11-19 08:31:37 -06:00
Christopher Allan Webber
817066506d Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Conflicts:
	mediagoblin/templates/mediagoblin/user_pages/user.html
2011-11-18 09:34:09 -06:00
Christopher Allan Webber
ccca0fbfc3 Beginnings of sqlalchemy models 2011-11-17 08:28:23 -06:00
Christopher Allan Webber
76c6c806ca Accidentally had user['profile'] where it shoulda been user['bio'] 2011-11-16 17:53:46 -06:00
Joar Wandborg
359781f075 Fixed video transcoding
- Added audiorate with tolerance 80 million
- Removed deprecated thumbnailer
2011-11-16 14:20:27 +01:00
Joar Wandborg
64fd0462bd Committing some futile attempts to make GStreamer transcode the audio properly.
- Added CPU count detection
- Added videorate
- Added audiorate
2011-11-15 22:43:05 +01:00
Elrond
3618a9ac51 Dot-Notation: x._id = ObjectId() doesn't seem to work properly
For whatever reason, this does not work as expected:
	entry._id = ObjectId()
Need to go this way:
	entry['_id'] = ObjectId()
2011-11-15 11:32:13 +01:00
Elrond
eabe6b678a Dot-Notation for "_id"
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.
2011-11-15 11:32:13 +01:00
Elrond
7cbddc96a8 Enable mongokit's "Dot notation"
mongokit documents can allow to use x.FIELD instead of
x["FIELD"].
First it looks a lot more pythonic.
Second it might allow us an easier migration path towards
an sqlalchemy database backend.

Docs: http://namlook.github.com/mongokit/tutorial.html#dot-notation
2011-11-15 11:32:13 +01:00
Elrond
a9c7af9040 export: Handle Unicode titles better in logging
log("ascii %s" % unicode_string) tries to convert unicode
to ascii, which might fail.

Better use log(u"unicode format %s" % unicode_string) and
let the logging framework handle the conversion. This works
much better and the exceptions still happening aren't
stopping the main app.

Also remove one useless import.
2011-11-15 11:21:15 +01:00
Joar Wandborg
b33701b851 moved from videoscale => ffvideoscale *and* put queus before video and audio pipes 2011-11-15 00:27:21 +01:00
Christopher Allan Webber
2b7aa99d3c Only show "post a comment" link if comments already exist
The purpose of the link is to help you jump past comments to the
comment box, and so...

Even with this new conditional, I'm not entirely sure I like that link ;)
2011-11-13 20:39:42 -06:00
Christopher Allan Webber
ee91c2b88d Merge remote-tracking branch 'remotes/nyergler/pep8-ification'
Conflicts:
	mediagoblin/db/migrations.py
	mediagoblin/db/models.py
	mediagoblin/user_pages/views.py
	mediagoblin/util.py
2011-11-13 20:23:26 -06:00
Christopher Allan Webber
4671fda345 Improving <title> on tag page *and* adjusting translation for RTL reasons
Basically moving the variable inside the translation to give
translators more flexibility
2011-11-13 14:48:51 -06:00
Christopher Allan Webber
ab56689017 Enhanced title on the user's main media gallery 2011-11-13 14:42:03 -06:00
Christopher Allan Webber
7fc25d2720 If the gallery view makes sure we have a user anyway, do we need this check?
Seems like the classic annoying "SHOULD NEVER HAPPEN" else: statement :)
2011-11-13 14:40:11 -06:00
Christopher Allan Webber
017d6ca350 Enhanced title for user profile page 2011-11-13 14:38:40 -06:00
Christopher Allan Webber
688f56c2dc Improved title block on media page 2011-11-13 14:34:22 -06:00
Christopher Allan Webber
7f851c655e Merge remote-tracking branch 'remotes/nyergler/issue-653-csrf-exception' 2011-11-13 14:20:16 -06:00
Nathan Yergler
d9ed3aeb40 Issue 653: This time for sure! 2011-11-13 12:07:09 -08:00
Nathan Yergler
ad3f1233df Issue 653: Handle the case where request.vary is None 2011-11-13 11:59:24 -08:00
Nathan Yergler
b97ae0fd7d Issue 653: Don't throw exception if response has no vary header. 2011-11-13 11:41:43 -08:00
Elrond
efd0a42ca1 Mark two strings for translation 2011-11-13 19:51:11 +01:00
Christopher Allan Webber
d0504cfa87 Final step for non-force-conversion to jpeg 2011-11-12 15:12:39 -06:00
Christopher Allan Webber
0cf5b8ad24 Don't force-convert resized images to JPEG.
That's just not nice for those of us who like transparency!
2011-11-12 13:55:00 -06:00
Christopher Allan Webber
8bb3eb185a Probably should have MANIFEST.in checked in, for doing python sdists 2011-11-12 08:10:46 -06:00
Elrond
daed11b812 640: Configuration files should mention their _local versions
Thanks go to Aleksej Serdjukov for bringing this up and
providing the patch in the bug!
2011-11-12 14:28:55 +01:00
Elrond
8daf78db4e Merge branch 'idea/check_mgoblin_static'
* idea/check_mgoblin_static:
  Move TestingMiddleware to tests/tools.py
  Some docs for the TestingMiddleware
  591: Let Testing Middleware check for staticdirect() usage
2011-11-12 13:39:50 +01:00
Elrond
33d11e995d Move TestingMiddleware to tests/tools.py
This middleware isn't needed outside of the tests, so let's
just put it there.
2011-11-12 13:21:41 +01:00
Elrond
34b0874d9a Some docs for the TestingMiddleware
To make the TestingMiddleware actually more useful in the
future, start to document it.
2011-11-12 13:10:48 +01:00
Christopher Allan Webber
76dd312ff5 Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin 2011-11-04 08:23:48 -05:00
Christopher Allan Webber
d871f4e0d1 Updating translations 2011-11-04 08:23:28 -05:00
Jef van Schendel
da76a8cbaa Tiny padding change to vertically center navigation button arrows 2011-11-04 02:34:00 +01:00
Jef van Schendel
80c9a7ee51 Small style changes to navigation buttons 2011-11-04 02:30:07 +01:00
Jef van Schendel
1b36a8e80c On second thought, let's use this title for forgot_password.html 2011-11-04 02:20:26 +01:00
Jef van Schendel
560af7ba43 Text edits and rearrangements to login.html 2011-11-04 02:19:35 +01:00
Jef van Schendel
b4b10a222d Add translation brackety things to forgot-password page, I forgot those 2011-11-04 02:15:52 +01:00
Jef van Schendel
d1bee08d5a Text changes to forgot-paddword page 2011-11-04 02:14:19 +01:00
Jef van Schendel
726afba3bb Text changes to front page, as described in ticket #637 2011-11-04 02:06:33 +01:00
Jef van Schendel
157c60267e Several small changes (reordering/restyling) for media descriptions and comments 2011-11-04 01:54:41 +01:00