1426 Commits

Author SHA1 Message Date
Christopher Allan Webber
61c5306d24 Made the image processing use intermediary conversion file.
This should fix the problem with PIL and the cloudfiles storage system
fighting.
2011-11-20 22:12:51 -06:00
Christopher Allan Webber
2e8fbc8fab Slightly clearer docs on copy_local_to_storage 2011-11-20 22:02:02 -06:00
Christopher Allan Webber
98f6efb068 copy_local_to_storage, both general and specialized-for-BasicFileStorage versions
This utility should allow for easy copying from a local filesystem to
the storage instance.
2011-11-20 22:01:43 -06:00
Joar Wandborg
a63b640f12 Stashing changes 2011-11-21 00:06:59 +01:00
Jakob Kramer
fe0a8f53e2 fixed identation 2011-11-20 21:40:51 +01:00
Jakob Kramer
a00f1c1e1c eyecandy for programmers 2011-11-20 21:30:46 +01:00
Jakob Kramer
9404a9fed2 don't use 'and' anymore, if there is only one tag 2011-11-20 21:15:07 +01:00
Elrond
5dbeda8a0f Fix redirect to logical path
redirects should in nearly all cases go to a logical path
like 'mediagoblin.auth.login' and not to an absolute path
like "/auth/login".
2011-11-20 20:15:21 +01:00
Elrond
e51af0e620 Merge remote branch 'remotes/aaronw/bug614_verification_crash'
* remotes/aaronw/bug614_verification_crash:
  Update english translation file.
  Reverse order of sanity checks: check email_verified after making sure there's a user in the request.
  Make sure user isn't already verified before resending verification.
  Check request.user to determine if user is logged in.
  Regenerated English .po file to include new string.
  Display and error and redirect to login page if unauthenticated user tries to access resend_verification.

Conflicts:
	mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po
2011-11-20 20:00:08 +01:00
Jef van Schendel
0b3cdd6a25 Navigation buttons edits. Removed images as they are no longer needed. Related: bug #504 2011-11-20 17:01:23 +01:00
Jef van Schendel
7807f5a513 Remove Edit/Delete icons, since they are not required yet. 2011-11-20 16:45:45 +01:00
Jef van Schendel
16a444444a Change tag list from a list to a paragraph. Wrap text for translation. 2011-11-20 16:18:27 +01:00
Jef van Schendel
cee794a8f7 Fix for bug #467, "Add explanatory copy to add/edit picture pages saying that tags are comma-separated" 2011-11-20 15:34:40 +01:00
Jef van Schendel
88f20b58b2 Slight style changes to button_action_highlight 2011-11-20 01:57:29 +01:00
Jef van Schendel
c6c08a2f29 Small correction, this button should be button_action, not button_form 2011-11-20 01:57:02 +01:00
Jef van Schendel
5ab3855e1f Slight change to error wording 2011-11-20 01:46:21 +01:00
Jef van Schendel
13423daae2 Another change to button style. Renamed header_submit, header_submit_highlight and button classes, correct all references to these 2011-11-20 01:43:48 +01:00
Jef van Schendel
5bd523eb23 Change to background of "empty_space", it now uses an image 2011-11-20 01:12:10 +01:00
Jakob Kramer
c8ccd23e8e added unittests, now using form errors and fixed bug when no GET parameter is given for /edit/profile/ 2011-11-20 00:37:19 +01:00
Jakob Kramer
4837b2f253 added support for changing the password, issue #643 2011-11-20 00:37:19 +01:00
Jef van Schendel
909dda1f85 Change button style a bit 2011-11-20 00:28:19 +01:00
Jef van Schendel
aea6d577cb Change form structure and add relevant CSS rules 2011-11-19 23:46:42 +01:00
Christopher Allan Webber
7880168526 Added back the title block 2011-11-19 14:06:48 -06:00
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
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