Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Forgot to add these layout changes. Everything should work now. | Jef van Schendel | 2012-02-21 | 7 | -124/+113 |
| | |||||
* | Resolve merge conflicts | Jef van Schendel | 2012-02-21 | 7 | -114/+124 |
|\ | |||||
| * | Revert "Layout overhaul time!" | Christopher Allan Webber | 2012-02-13 | 7 | -114/+124 |
| | | | | | | | | | | | | | | | | This reverts a whole bunch of commits, fb1dc4f5 thru 92e8ca79, where an experimental new layout was played with. Unfortunately, this layout broke the look and feel of master, even though it was going in the right direction for mobile stuff. Jef said he'll do things in a branch! | ||||
* | | Change button style in edit.html | Jef van Schendel | 2012-02-15 | 1 | -1/+1 |
| | | |||||
* | | Removed cancel_link class; slight changes to button_form style | Jef van Schendel | 2012-02-15 | 1 | -2/+2 |
| | | |||||
* | | Add clear div to correct floating divs | Jef van Schendel | 2012-02-14 | 1 | -0/+1 |
|/ | |||||
* | Fix comment input field width/padding; change some text; remove weird ↵ | Jef van Schendel | 2012-02-12 | 1 | -22/+13 |
| | | | | #form_comment duplicate rules; move Edit/Delete buttons next to title | ||||
* | Make media thumbnail gallery a list instead of a table | Jef van Schendel | 2012-02-12 | 1 | -21/+15 |
| | |||||
* | Move "Added on" date to sidebar | Jef van Schendel | 2012-02-12 | 1 | -3/+5 |
| | |||||
* | Move Attachments from sidebar to default pane | Jef van Schendel | 2012-02-12 | 1 | -23/+23 |
| | |||||
* | Consistencify sidebar bits (same headers and such) | Jef van Schendel | 2012-02-12 | 4 | -7/+8 |
| | |||||
* | Restore sidebar | Jef van Schendel | 2012-02-12 | 1 | -26/+28 |
| | |||||
* | Layout overhaul time! | Jef van Schendel | 2012-02-11 | 2 | -31/+31 |
| | |||||
* | It's 2012 all up in here | Christopher Allan Webber | 2012-02-02 | 34 | -34/+34 |
| | |||||
* | Merge remote-tracking branch 'joar/exif-rebase' | Joar Wandborg | 2012-01-28 | 4 | -6/+99 |
|\ | |||||
| * | Scripts and styleshets for geolocation map - Conditional | Joar Wandborg | 2012-01-27 | 1 | -6/+10 |
| | | | | | | | | | | Scripts and stylesheets for the geolocation map are now switched on/off with the geolocation map itself. | ||||
| * | Refractored media.html template and related includes | Joar Wandborg | 2012-01-25 | 4 | -45/+86 |
| | | | | | | | | | | | | | | - 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 | ||||
| * | Moved EXIF to sidebar, added conditions for visibility configuration settings | Joar Wandborg | 2012-01-25 | 1 | -17/+20 |
| | | |||||
| * | EXIF fixes | Joar Wandborg | 2012-01-25 | 1 | -7/+9 |
| | | | | | | | | | | | | | | - 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 | ||||
| * | EXIF extraction, geolocation map, image rotation | Joar Wandborg | 2012-01-25 | 1 | -0/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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. | ||||
* | | Let some code support "media without slug" | Elrond | 2012-01-28 | 1 | -1/+1 |
|/ | | | | | | | | | | | | | | 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. | ||||
* | Moved get_license_data to mixin.py, added license to sql media model, added ↵ | Aaron Williamson | 2012-01-18 | 1 | -4/+4 |
| | | | | translation tags to license template. | ||||
* | Changed license.html to fit new layout better | Aaron Williamson | 2012-01-17 | 1 | -1/+1 |
| | |||||
* | Added new files | Aaron Williamson | 2012-01-17 | 1 | -0/+26 |
| | |||||
* | Merged changes with upstream | Aaron Williamson | 2012-01-17 | 29 | -382/+530 |
|\ | |||||
| * | Fix request.user==None error | Elrond | 2012-01-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | 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. | ||||
| * | Remove unnecessary piece of text in media.html. Fix "Markdown text" ↵ | Jef van Schendel | 2012-01-13 | 1 | -1/+1 |
| | | | | | | | | indentation so they are the same. | ||||
| * | Added check for request.user to media.html attachment-related conditional | Joar Wandborg | 2012-01-10 | 1 | -0/+1 |
| | | |||||
| * | Fix reset.css reference and drop link to video-js.css | Elrond | 2012-01-09 | 1 | -3/+1 |
| | | | | | | | | | | | | | | 1. reset.css was moved to /css/extlib/ some time ago. So update the staticdirect link to it. 2. We don't have video-js.css (any more?). Drop link to it. | ||||
| * | Fix div breaking in user.html; add media query bits | Jef van Schendel | 2012-01-06 | 1 | -3/+3 |
| | | |||||
| * | * Rename mediagoblin_header, mediagoblin_body, mediagoblin_footer, ↵ | Jef van Schendel | 2012-01-05 | 1 | -11/+13 |
| | | | | | | | | | | | | | | mediagoblin_header_right, mediagoblin_logo * Add html5shiv for older browsers * Small size fix (940px instead of 960pgx) | ||||
| * | Remove last 960.gs leftover; fix classes for edit forms | Jef van Schendel | 2012-01-05 | 3 | -4/+4 |
| | | |||||
| * | Fix merge conflicts | Jef van Schendel | 2012-01-05 | 17 | -108/+75 |
| |\ | |||||
| | * | Several changes for mobile layout | Jef van Schendel | 2012-01-05 | 2 | -1/+2 |
| | | | |||||
| | * | Lots of little fixes and removal of all 960.gs classes: | Jef van Schendel | 2011-12-30 | 15 | -92/+68 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Removed <p> margin-top * Vertically align logo so Add-media button does not fall off * Remove last 960.gs traces (grid_X/container_X) and add custom classes/sizes to css * Add clear class * Update form_box and add form_box_xl for bigger forms * Switch all pages that use forms to new classes * Remove padding from notification messages so they take full width * Other tiny fixes I forgot about | ||||
| | * | Add styles to make media.html not fall apart entirely | Jef van Schendel | 2011-12-18 | 1 | -2/+2 |
| | | | |||||
| | * | Remove first 960.gs classes | Jef van Schendel | 2011-12-18 | 1 | -9/+3 |
| | | | |||||
| | * | Remove 960.gs stylesheets, add Eric Meyer's reset.css | Jef van Schendel | 2011-12-18 | 1 | -5/+1 |
| | | | |||||
| * | | Always show 'Change account settings' link | Jef van Schendel | 2012-01-05 | 1 | -7/+6 |
| | | | |||||
| * | | Make show-password-js work for change password too | Elrond | 2012-01-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | The show password js depends on the password field to have an id of "password". So give it a proper id. Also fixed the label generation for the case of field.name and field.id being different. | ||||
| * | | Fix more StrictUndefined issues | Elrond | 2012-01-05 | 1 | -2/+2 |
| | | | |||||
| * | | Add change-account-settings link to user.html | Jef van Schendel | 2012-01-05 | 1 | -0/+5 |
| | | | |||||
| * | | Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin | Jef van Schendel | 2012-01-05 | 2 | -3/+5 |
| |\ \ | |||||
| | * | | f691: Use StrictUndefined for templates and fix some issues | Elrond | 2012-01-04 | 2 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | References to undefined variables in templates were silently ignored/converted to None/empty strings. This makes coding lazy stuff easy, but it makes catching typos harder. (It would have catched one of the SQL things earlier!) But on the other hand it might make the current templates error out everywhere. In fact, early testing has shown two instances, that errored out. Those are fixed with this commit too. If this turns out to make things more complex and useless than actually solving any problems, it can easily be dropped again. | ||||
| * | | | Create edit_account.html | Jef van Schendel | 2012-01-05 | 1 | -0/+45 |
| |/ / | |||||
| * | | Add Markdown for submit page, edit page, profile edit page; thus fixing ↵ | Jef van Schendel | 2012-01-04 | 2 | -2/+2 |
| | | | | | | | | | | | | ticket #690 | ||||
| * | | Dot-Notation for MediaEntry.media_files | Elrond | 2012-01-04 | 7 | -10/+10 |
| | | | |||||
| * | | Seperate jQuery bit that was still in media.html | Jef van Schendel | 2012-01-01 | 1 | -11/+2 |
| | | | |||||
| * | | Remove fp_changed_success.html, use log in page + notification message instead | Jef van Schendel | 2012-01-01 | 1 | -27/+0 |
| | | | |||||
| * | | Remove fp_email_sent.html and refs to it | Jef van Schendel | 2012-01-01 | 1 | -28/+0 |
| | | |