aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixes after merging video into master - part 2Joar Wandborg2011-11-213-71/+74
* Fixes after merging video branch into masterJoar Wandborg2011-11-219-280/+90
* Merge branch 'video_gstreamer-only'Joar Wandborg2011-11-2125-32/+2993
|\
| * Refractored GStreamer element linkingJoar Wandborg2011-11-211-21/+22
| * Stashing changesJoar Wandborg2011-11-218-65/+43
| * Fixed video transcodingJoar Wandborg2011-11-161-212/+1
| * Committing some futile attempts to make GStreamer transcode the audio properly.Joar Wandborg2011-11-151-7/+38
| * moved from videoscale => ffvideoscale *and* put queus before video and audio ...Joar Wandborg2011-11-151-5/+13
| * Minor fixesJoar Wandborg2011-11-012-2/+5
| * Added pygtk to dependenciesJoar Wandborg2011-10-271-0/+1
| * Added new thumbnailer, renamed old.Joar Wandborg2011-10-272-194/+474
| * Image media exceptionsJoar Wandborg2011-10-151-29/+2
| * Removed arista dependencyJoar Wandborg2011-10-141-1/+0
| * Video transcoding is now gstreamer directly instead of through aristaJoar Wandborg2011-10-143-88/+135
| * import_export - Added some error handlingJoar Wandborg2011-10-141-4/+6
| * - Refractored the video thumbnailerJoar Wandborg2011-10-112-20/+303
| * Fixed incorrect logger.[...] callsJoar Wandborg2011-10-062-5/+7
| * Added parameter to transcoding_errorJoar Wandborg2011-10-051-2/+2
| * Multimedia refractoring, and added video thumbnail supportJoar Wandborg2011-10-056-85/+213
| * Renamed video.presets => video.devicesJoar Wandborg2011-09-294-0/+0
| * Added arista to install requiresJoar Wandborg2011-09-281-0/+1
| * Multimedia support - Refractored video processing.Joar Wandborg2011-09-248-66/+1875
| * Multimedia support - Commiting from a not yet finished state - Details belowJoar Wandborg2011-09-2313-24/+650
* | Tests for StorageInterface*.copy_local_to_storage()Christopher Allan Webber2011-11-201-0/+27
* | Made the image processing use intermediary conversion file.Christopher Allan Webber2011-11-201-8/+22
* | Slightly clearer docs on copy_local_to_storageChristopher Allan Webber2011-11-201-0/+4
* | copy_local_to_storage, both general and specialized-for-BasicFileStorage vers...Christopher Allan Webber2011-11-202-0/+22
* | fixed identationJakob Kramer2011-11-201-3/+3
* | eyecandy for programmersJakob Kramer2011-11-201-11/+13
* | don't use 'and' anymore, if there is only one tagJakob Kramer2011-11-201-1/+4
* | Fix redirect to logical pathElrond2011-11-201-1/+1
* | Merge remote branch 'remotes/aaronw/bug614_verification_crash'Elrond2011-11-202-3/+28
|\ \
| * | Update english translation file.Aaron Williamson2011-10-031-28/+32
| * | Reverse order of sanity checks: check email_verified after making sure there'...Aaron Williamson2011-10-031-6/+6
| * | Make sure user isn't already verified before resending verification.Aaron Williamson2011-10-031-0/+8
| * | Fixed conflict in /auth/views.py.Aaron Williamson2011-10-0354-863/+1242
| |\ \
| * | | Check request.user to determine if user is logged in.Aaron Williamson2011-10-031-1/+1
| * | | Regenerated English .po file to include new string.Aaron Williamson2011-10-011-8/+12
| * | | Display and error and redirect to login page if unauthenticated user tries to...Aaron Williamson2011-10-011-2/+11
* | | | Navigation buttons edits. Removed images as they are no longer needed. Relate...Jef van Schendel2011-11-205-10/+6
* | | | Remove Edit/Delete icons, since they are not required yet.Jef van Schendel2011-11-203-9/+2
* | | | Change tag list from a list to a paragraph. Wrap text for translation.Jef van Schendel2011-11-201-6/+13
* | | | Fix for bug #467, "Add explanatory copy to add/edit picture pages saying that...Jef van Schendel2011-11-202-2/+6
* | | | Slight style changes to button_action_highlightJef van Schendel2011-11-201-1/+3
* | | | Small correction, this button should be button_action, not button_formJef van Schendel2011-11-201-1/+1
* | | | Slight change to error wordingJef van Schendel2011-11-201-1/+1
* | | | Another change to button style. Renamed header_submit, header_submit_highligh...Jef van Schendel2011-11-2015-39/+40
* | | | Change to background of "empty_space", it now uses an imageJef van Schendel2011-11-202-1/+1
* | | | added unittests, now using form errors and fixed bug when no GET parameter is...Jakob Kramer2011-11-202-9/+126
* | | | added support for changing the password, issue #643Jakob Kramer2011-11-202-10/+37