Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'video_gstreamer-only' | Joar Wandborg | 2011-11-21 | 4 | -14/+49 |
|\ | | | | | | | | | | | Conflicts: mediagoblin/db/migrations.py mediagoblin/submit/views.py | ||||
| * | Stashing changes | Joar Wandborg | 2011-11-21 | 2 | -6/+19 |
| | | |||||
| * | Video transcoding is now gstreamer directly instead of through arista | Joar Wandborg | 2011-10-14 | 1 | -2/+5 |
| | | |||||
| * | Multimedia support - Refractored video processing. | Joar Wandborg | 2011-09-24 | 1 | -0/+8 |
| | | |||||
| * | Multimedia support - Commiting from a not yet finished state - Details below | Joar Wandborg | 2011-09-23 | 3 | -15/+26 |
| | | | | | | | | | | | | | | | | | | | | | | * DONE Initially testing with arista ** DONE Video display templates *** TODO Multi-browser support ** TODO Video thumbnails ** TODO Link to original video ** TODO Video cropping Also contains a lot of "debug" print's | ||||
* | | fixed identation | Jakob Kramer | 2011-11-20 | 1 | -3/+3 |
| | | |||||
* | | eyecandy for programmers | Jakob Kramer | 2011-11-20 | 1 | -11/+13 |
| | | |||||
* | | don't use 'and' anymore, if there is only one tag | Jakob Kramer | 2011-11-20 | 1 | -1/+4 |
| | | |||||
* | | Navigation buttons edits. Removed images as they are no longer needed. ↵ | Jef van Schendel | 2011-11-20 | 1 | -4/+4 |
| | | | | | | | | Related: bug #504 | ||||
* | | Remove Edit/Delete icons, since they are not required yet. | Jef van Schendel | 2011-11-20 | 1 | -9/+2 |
| | | |||||
* | | Change tag list from a list to a paragraph. Wrap text for translation. | Jef van Schendel | 2011-11-20 | 1 | -6/+13 |
| | | |||||
* | | Small correction, this button should be button_action, not button_form | Jef van Schendel | 2011-11-20 | 1 | -1/+1 |
| | | |||||
* | | Another change to button style. Renamed header_submit, ↵ | Jef van Schendel | 2011-11-20 | 14 | -20/+20 |
| | | | | | | | | header_submit_highlight and button classes, correct all references to these | ||||
* | | Change form structure and add relevant CSS rules | Jef van Schendel | 2011-11-19 | 1 | -7/+5 |
| | | |||||
* | | Added back the title block | Christopher Allan Webber | 2011-11-19 | 1 | -1/+1 |
| | | |||||
* | | Allow instance owners to customize html titles of page: | Pablo J. Urbano Santos | 2011-11-19 | 1 | -1/+1 |
| | | | | | | | | | | Added html_title config option. Made base.html template use html_title option as page title. | ||||
* | | Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin | Christopher Allan Webber | 2011-11-18 | 5 | -33/+51 |
|\ \ | | | | | | | | | | | | | Conflicts: mediagoblin/templates/mediagoblin/user_pages/user.html | ||||
| * | | Dot-Notation for "_id" | Elrond | 2011-11-15 | 2 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | Only show "post a comment" link if comments already exist | Christopher Allan Webber | 2011-11-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | 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 ;) | ||||
| * | | Improving <title> on tag page *and* adjusting translation for RTL reasons | Christopher Allan Webber | 2011-11-13 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | Basically moving the variable inside the translation to give translators more flexibility | ||||
| * | | Enhanced title on the user's main media gallery | Christopher Allan Webber | 2011-11-13 | 1 | -0/+6 |
| | | | |||||
| * | | If the gallery view makes sure we have a user anyway, do we need this check? | Christopher Allan Webber | 2011-11-13 | 1 | -22/+17 |
| | | | | | | | | | | | | Seems like the classic annoying "SHOULD NEVER HAPPEN" else: statement :) | ||||
| * | | Enhanced title for user profile page | Christopher Allan Webber | 2011-11-13 | 1 | -0/+11 |
| | | | |||||
| * | | Improved title block on media page | Christopher Allan Webber | 2011-11-13 | 1 | -0/+2 |
| | | | |||||
| * | | Mark two strings for translation | Elrond | 2011-11-13 | 1 | -1/+1 |
| | | | |||||
* | | | Accidentally had user['profile'] where it shoulda been user['bio'] | Christopher Allan Webber | 2011-11-16 | 1 | -1/+1 |
|/ / | |||||
* | | On second thought, let's use this title for forgot_password.html | Jef van Schendel | 2011-11-04 | 1 | -1/+1 |
| | | |||||
* | | Text edits and rearrangements to login.html | Jef van Schendel | 2011-11-04 | 1 | -14/+10 |
| | | |||||
* | | Add translation brackety things to forgot-password page, I forgot those | Jef van Schendel | 2011-11-04 | 1 | -1/+1 |
| | | |||||
* | | Text changes to forgot-paddword page | Jef van Schendel | 2011-11-04 | 1 | -7/+2 |
| | | |||||
* | | Text changes to front page, as described in ticket #637 | Jef van Schendel | 2011-11-04 | 1 | -14/+5 |
| | | |||||
* | | Several small changes (reordering/restyling) for media descriptions and comments | Jef van Schendel | 2011-11-04 | 1 | -19/+9 |
| | | |||||
* | | Removing comment_form link which doesn't do anything? | Christopher Allan Webber | 2011-10-29 | 1 | -1/+0 |
| | | |||||
* | | Unclosed anchor tags in the tags! Fixed :) | Christopher Allan Webber | 2011-10-27 | 1 | -1/+1 |
| | | |||||
* | | Only show the "post a comment" link if there's a logged in user | Christopher Allan Webber | 2011-10-27 | 1 | -1/+3 |
| | | |||||
* | | Renamed "Temporary button holder" to "actions" | Christopher Allan Webber | 2011-10-27 | 1 | -1/+1 |
| | | |||||
* | | Merge remote branch 'remotes/elrond/misc/i592_use_full_path' | Christopher Allan Webber | 2011-10-15 | 1 | -1/+1 |
|\ \ | |||||
| * | | i592: Use full path in various places | Elrond | 2011-10-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running mediagoblin in a sub path on a web server, most things inside mediagoblin need the "inside path", but when generating URLs for the webbrowser, full paths are needed. urlgen and routes already do that. Some (mostly pagination and login) need the URL of the current page. They used request.path_info. But this is the "inside" path, not the full. So now there is request.full_path and its used in various places. | ||||
* | | | Merge remote branch 'aaronw/bug608_checkbox_labels' | Elrond | 2011-10-15 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * aaronw/bug608_checkbox_labels: No need to translate label name. Add label tag to fix translation issue. Update english translation file. Checkbox label is being translated in the form definition -- translating it in the template is redundant and breaks <label> functionality. Conflicts: mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po | ||||
| * | | | No need to translate label name. | Aaron Williamson | 2011-10-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add label tag to fix translation issue. | Aaron Williamson | 2011-10-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Checkbox label is being translated in the form definition -- translating it ↵ | Aaron Williamson | 2011-10-03 | 1 | -1/+1 |
| |/ / | | | | | | | | | | in the template is redundant and breaks <label> functionality. | ||||
* | | | Improve indentation a bit | Elrond | 2011-10-15 | 1 | -12/+12 |
| | | | | | | | | | | | | Only change: Indentation, nothing else! | ||||
* | | | Put the trans tag in the right place. | Aaron Williamson | 2011-10-14 | 1 | -1/+1 |
| | | | |||||
* | | | Move comment form below comments. | Aaron Williamson | 2011-10-03 | 1 | -11/+14 |
|/ / | |||||
* | | Adding csrf token fields to the forgot password calls | Christopher Allan Webber | 2011-10-01 | 2 | -0/+4 |
| | | |||||
* | | Fixing indentation in start.html | Christopher Allan Webber | 2011-10-01 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/upstream/master' into ↵ | Nathan Yergler | 2011-10-01 | 10 | -27/+180 |
|\ \ | | | | | | | | | | | | | | | | | | | 569-application-middleware Conflicts: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html | ||||
| * \ | Merge remote branch 'remotes/elrond/misc/use_staticdirect' | Christopher Allan Webber | 2011-09-28 | 2 | -6/+6 |
| |\ \ | |||||
| | * | | Templates: Use request.staticdirect instead of /mgoblin_static | Elrond | 2011-09-14 | 2 | -6/+6 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | Any reference to static, shipped content should use request.staticdirect instead of the default path. Especially if hosting mediagoblin via fastcgi, the paths might need changing. |