Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | ASCII media type support & fix a bug in file submission error handling | Joar Wandborg | 2011-12-31 | 3 | -0/+76 |
| | | | | | | | | | | | | | | | * Added ASCII media processing * Added ASCII media display * Added ASCII media type Rebased from Joar Wandborg's ascii art branch (squashed to remove the commits borrowing code of dubious license) Fixed a bug in file submission error handling: - Moved file-extension condition out of loop (what did it do there?) - Updated file submission tests - Changed error handling in file submission, should now report more than absolutely necessary. | ||||
* | Fix #712: Comment counter always uses plural | Jef van Schendel | 2011-12-30 | 1 | -40/+46 |
| | |||||
* | Isolate JavaScript; add new show_password.js to forgot-password-page as well | Jef van Schendel | 2011-12-29 | 2 | -21/+7 |
| | |||||
* | Finished #485 and worked out bugs: password fields always update, added ↵ | Jef van Schendel | 2011-12-29 | 1 | -1/+5 |
| | | | | margins, fixed Chrome width bug, wrapped checkbox in label element | ||||
* | Turn media.get_uploader into a property | Elrond | 2011-12-27 | 4 | -10/+10 |
| | | | | | | | sqlalchemy gives autoloading (hopefully caching) link to other objects as properties. So turn get_uploader on the current mongo based stuff into a property to ease transition. | ||||
* | Use media.url_for_self instead of calling urlgen directly | Elrond | 2011-12-27 | 1 | -4/+2 |
| | | | | | | | | | Replace urlgen('ID', user=media.get_uploader().username, media=media.*) by media.url_for_self(urlgen) in a few places. It's just a lot nicer! | ||||
* | Translate one string | Elrond | 2011-12-25 | 1 | -1/+5 |
| | | | | | | "There doesn't seem to be any media here yet..." is now translated also here (it's already in the list from another place). | ||||
* | Turn MediaComment's author() into get_author property | Elrond | 2011-12-23 | 1 | -1/+1 |
| | | | | | | | | | 1) MediaComment's author method conflicts with the author field. So rename it to get_author. 2) Turn it from a normal function into a python property. That means you call it by ".get_author" not by ".get_author()". This is exactly what sqlalchemy gives us free of charge. | ||||
* | added translation tags to html5 wwarning | Karen Rustad | 2011-12-23 | 1 | -2/+6 |
| | |||||
* | Added a 'you don't have HTML5 so this video will not work' warning using ↵ | Karen Rustad | 2011-12-23 | 1 | -0/+5 |
| | | | | just the inherent properties of the <video> tag (and some css for style) | ||||
* | Merge remote branch 'remotes/joar/webfinger' | Elrond | 2011-12-20 | 2 | -0/+54 |
|\ | | | | | | | | | | | | | | | | | | | * remotes/joar/webfinger: Added references to docstring in mediagoblin.webfinger Removed mediagoblin.tools.feed which was accidentally included Polishing the webfinger implementation webfinger fully compliant with webfinger.org! Still *preliminary* solution. Changed some thngs to be compatible with webfinger.org, still *very preliminary* Added *very preliminary* support for webfinger | ||||
| * | Polishing the webfinger implementation | Joar Wandborg | 2011-12-20 | 2 | -17/+15 |
| | | | | | | | | | | | | | | - Changed quotes in the templates from " to ' - Changed all link generation to use request.urlgen - Moved xrd links data generation from template to view - Added parsing of the account URI using urlparse | ||||
| * | webfinger fully compliant with webfinger.org! Still *preliminary* solution. | Joar Wandborg | 2011-12-15 | 1 | -1/+1 |
| | | |||||
| * | Changed some thngs to be compatible with webfinger.org, still *very preliminary* | Joar Wandborg | 2011-12-15 | 1 | -0/+3 |
| | | |||||
| * | Added *very preliminary* support for webfinger | Joar Wandborg | 2011-12-15 | 2 | -0/+53 |
| | | |||||
* | | Show actual comment number. Only shows plural for now (ticket #712) | Jef van Schendel | 2011-12-18 | 1 | -1/+1 |
|/ | |||||
* | Change "Submit" to "Add" for ticket #466 | Jef van Schendel | 2011-12-14 | 2 | -3/+3 |
| | |||||
* | Remove "X license" placeholder from media page | Jef van Schendel | 2011-12-14 | 1 | -1/+1 |
| | |||||
* | Change wording for change_fp; improved the button text | Jef van Schendel | 2011-12-14 | 1 | -2/+2 |
| | |||||
* | Merge jQuery branch, resolve conflicts | Jef van Schendel | 2011-12-13 | 5 | -75/+110 |
|\ | |||||
| * | Style changes for media_uploader (now media_specs); removed margins from ↵ | Jef van Schendel | 2011-12-10 | 1 | -11/+5 |
| | | | | | | | | button_action buttons | ||||
| * | Remove pagination images and replace them with unicode characters | Jef van Schendel | 2011-12-10 | 1 | -4/+2 |
| | | |||||
| * | Change wording in tags.html | Jef van Schendel | 2011-12-09 | 1 | -2/+2 |
| | | |||||
| * | Open Markdown link in new windows; I know _blank is sometimes frowned upon ↵ | Jef van Schendel | 2011-12-09 | 1 | -1/+1 |
| | | | | | | | | but it may be useful here | ||||
| * | Lots of changes to media page; rearranged things, added new styles, added ↵ | Jef van Schendel | 2011-12-09 | 1 | -33/+46 |
| | | | | | | | | jquery bits, gave the comment section a refresh | ||||
| * | Move author text, "By X", to the sidebar | Jef van Schendel | 2011-12-07 | 1 | -6/+9 |
| | | |||||
| * | Add show-password checkbox and make it work | Jef van Schendel | 2011-12-02 | 2 | -1/+22 |
| | | |||||
* | | Merge branch 'sql/dot-notation' | Elrond | 2011-12-12 | 7 | -20/+20 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sql/dot-notation: Dot-Notation for MediaEntry.media_data Dot-Notation for MediaEntry.media_type Dot-Notation for MediaEntry.description(_html) Dot-Notation for MediaEntry.slug Dot-Notation for MediaEntry.title Dot-Notation for MediaEntry.uploader Dot-Notation for MediaEntry.created Dot-Notation: tests/test_edit.py Dot-Notation for Users.fp_token_expire Dot-Notation for Users.fp_verification_key Dot-Notation for Users.bio and .bio_html Dot-Notation for Users.url Dot-Notation for Users.is_admin Dot-Notation for Users.verification_key Dot-Notation for Users.status Dot-Notation for Users.email_verified Dot-Notation for Users.pw_hash Dot-Notation for Users.email Dot-Notation for Users.username | ||||
| * | | Dot-Notation for MediaEntry.title | Elrond | 2011-12-05 | 3 | -5/+5 |
| | | | |||||
| * | | Dot-Notation for MediaEntry.uploader | Elrond | 2011-12-05 | 1 | -2/+2 |
| | | | |||||
| * | | Dot-Notation for MediaEntry.created | Elrond | 2011-12-05 | 1 | -1/+1 |
| | | | |||||
| * | | Dot-Notation for Users.url | Elrond | 2011-12-05 | 1 | -1/+1 |
| | | | |||||
| * | | Dot-Notation for Users.is_admin | Elrond | 2011-12-05 | 2 | -3/+3 |
| | | | |||||
| * | | Dot-Notation for Users.status | Elrond | 2011-12-05 | 1 | -1/+1 |
| | | | |||||
| * | | Dot-Notation for Users.username | Elrond | 2011-12-05 | 3 | -7/+7 |
| | | | |||||
* | | | Removed extraneous whitespace from video.html | Christopher Allan Webber | 2011-12-12 | 1 | -1/+1 |
| | | | |||||
* | | | Mark "newer/older" buttons for translation | Christopher Allan Webber | 2011-12-12 | 1 | -4/+4 |
|/ / | |||||
* | | Update comment URLs to use the media slug. | Christopher Allan Webber | 2011-12-05 | 1 | -1/+1 |
| | | |||||
* | | Update the delete item to use the _id after all... it's the safest way. | Christopher Allan Webber | 2011-12-05 | 2 | -2/+2 |
| | | | | | | | | See http://bugs.foocorp.net/issues/695 | ||||
* | | Merge remote-tracking branch ↵ | Christopher Allan Webber | 2011-12-04 | 2 | -3/+3 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 'remotes/lorochka85/bug852_use_media_slug_instead_of_id' Conflicts: mediagoblin/decorators.py mediagoblin/templates/mediagoblin/user_pages/media.html mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html | ||||
| * \ | Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin | lora | 2011-11-19 | 12 | -109/+101 |
| |\ \ | |||||
| * | | | issue 582: use media.slug instead of media.id | lora | 2011-11-19 | 2 | -3/+3 |
| | | | | |||||
* | | | | Removing the conditional that checks if there's a media in media.html | Christopher Allan Webber | 2011-12-04 | 1 | -125/+121 |
| | | | | | | | | | | | | | | | | | | | | If there isn't a media, we shouldn't hit that template! The view should ensure that. | ||||
* | | | | Change "Your finest source of goblin related media" to something else | Christopher Allan Webber | 2011-12-04 | 1 | -1/+1 |
| |_|/ |/| | | | | | | | | We don't want to insist everyone hold a goblin-related gallery :) | ||||
* | | | Mark two strings for translation | Elrond | 2011-11-28 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | 1. "Go to page:" in pagination 2. "Submit" in the forget password form | ||||
* | | | Removing these video javascript files, which are currently unused | Christopher Allan Webber | 2011-11-25 | 1 | -5/+0 |
| | | | |||||
* | | | Merge remote-tracking branch 'remotes/jwandborg/master' | Christopher Allan Webber | 2011-11-24 | 4 | -14/+49 |
|\ \ \ |