aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Turn media.{backref_nam} from a list to a scalar.Elrond2013-02-015-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | For all our media_types, let the backref on the media_entry be a scalar (there is only one media_data per media_entry) instead of a list with zero or one entry. The media_data toolchain on MediaEntry currently handles both transparently.
| * | Rewrite media_data handling to use relationshipsElrond2013-02-011-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of doing query by hand, use the relationships on the models to find the media_data. Is is made possible by the BACKREF_NAME in each models.py, which lets us know the local attr to ask for. Also initialize the relationship attribute on new media_data instead of the media_id. Also do not add it to the session. This gives us: - This automatically initializes the other side of the relationship, which will allow later acces via that way. - If the media_data is too early in the session, when the (new) media_entry is not yet in there, this could get conflicts. Avoid those by not adding to session. - Uses cascading to commit media_data together with the media_entry.
| * | Some tests for media_data, yeah!Elrond2013-02-012-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | One in the submissions, that posts a jpg with gps data. One in the modelmethods to test some behaviours. The later test fails. Fixes coming up.
* | | Add type="text/javascript" for <script>.Elrond2013-02-091-1/+2
| | | | | | | | | | | | | | | Our jquery <script> tag did not have a proper type attribute.
* | | Add translation tags; remove unnecessary title attribute from linkJef van Schendel2013-02-081-3/+2
| | |
* | | Remove unused translation variableJef van Schendel2013-02-081-1/+1
| | |
* | | Fix "Add to collection" button: remove icon, add text, add to collections.htmlJef van Schendel2013-02-083-31/+29
| | |
* | | Remove the collection counter because it's not neededJef van Schendel2013-02-081-1/+1
| | |
* | | Kill monkeypatching of ProcessingState.Elrond2013-02-087-27/+15
| | | | | | | | | | | | | | | | | | | | | And change the process_foo() API to accept a processingstate now. image and video are tested, the others are UNTESTED.
* | | Also refactor "copy original into public storage".Elrond2013-02-083-7/+8
| | | | | | | | | | | | | | | | | | | | | This makes the processing code easier to read/write and alos will help the reprocessing once we get to it. Thanks to Joar Wandborg for testing!
* | | Use ProcessingState for video.Elrond2013-02-081-7/+7
| | | | | | | | | | | | | | | | | | Rewrite video to use the new ProcessingState. Thanks to Joar Wandborg for testing!
* | | ProcessingState: Document monkey patching.Elrond2013-02-081-0/+10
| | |
* | | Implement ProcessingState class and use for imagesElrond2013-02-083-12/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea is to have a class that has the knowledge of the currently being processed media and also has tools for that. The long term idea is to make reprocessing easier by for example hiding the way the original comes into the processing code.
* | | Use logging.config.fileConfig()Joar Wandborg2013-02-071-41/+2
| | | | | | | | | | | | Instead of the monster I had built before.
* | | Use system wide EXIF package, if available.Elrond2013-02-071-1/+5
| | | | | | | | | | | | | | | | | | Created and tested by Simon Fondrie-Teitler. Thanks!
* | | Committing extracted and compiled translationsChristopher Allan Webber2013-02-0554-5154/+7209
| | |
* | | Committing present MediaGoblin translations before pushing extracted messagesChristopher Allan Webber2013-02-053-145/+148
| | |
* | | Rename {{title}} to {{media_title}}.Elrond2013-02-051-4/+9
| | | | | | | | | | | | | | | | | | | | | Rename a variable in a translated string to make it easier for translators to know what they're dealing with. And add a <title/> block.
* | | Mark "Collection" for translation in media_collect.Elrond2013-02-051-1/+3
| | |
* | | Small changes to "Add <media> to collection" stringAleksej2013-02-051-1/+1
| | | | | | | | | | | | Add quotation marks and "a" ("a" was proposed by Elrond).
* | | issue 615: config geolocation_map_visible gone.Elrond2013-02-021-2/+1
|/ / | | | | | | | | | | | | | | The template in the geolocation plugin still used the old config option. Just remove that. To enable it, you enable the plugin. No need for extra config. Tested by manwesulimo2004 (via IRC).
* | Improve formatting for hook template docs.Elrond2013-01-311-1/+8
| |
* | Switching set syntax to python2.6 compatibleChristopher Allan Webber2013-01-311-1/+1
| |
* | Even better documentation for get_hook_templates!Christopher Allan Webber2013-01-301-1/+9
| | | | | | | | Tells how you *can* use it in templates if you really like.
* | Improved documentation for get_hook_templates, noting the template tagChristopher Allan Webber2013-01-301-0/+9
| |
* | Moved the docstring for the plugin template stuff from the class to module ↵Christopher Allan Webber2013-01-301-13/+19
| | | | | | | | method
* | No need for an __init__ at all in the TemplateHookExtension, really.Christopher Allan Webber2013-01-301-4/+1
| |
* | Move template hook over to a template_hook tag. Seems to work! :)Christopher Allan Webber2013-01-304-36/+42
| |
* | Removing unused geolocation_map_visible variable and turning geolocation on ↵Christopher Allan Webber2013-01-301-1/+0
| | | | | | | | in default config
* | Geolocation stuff, including including templates seems to be working-ishChristopher Allan Webber2013-01-307-8/+105
| | | | | | | | | | | | | | - I'm having trouble seeing if the geolocation stuff actually works, but plugins are included - including a list of template hooks works, however the macro to include them does not, so it's kinda verbose
* | Very start of plugin hooks and openstreetmap pluginificationChristopher Allan Webber2013-01-304-9/+40
| | | | | | | | | | | | | | | | - Added start of template hook code to pluginapi.py - Started to break openstreetmap into plugin; moved templates - Added plugin hooks in media and image media templates ... almost certainly, none of this works yet. :)
* | Better Py3 compat: d.has_key(k) -> k in dElrond2013-01-305-26/+14
| | | | | | | | | | | | | | | | py3 does not have dict.has_key any more. You have to use "key in dict" instead. As that works in python2 as well, let's use that. Also some small bits of pep8.
* | Improve runtime of one test.Elrond2013-01-291-4/+10
| | | | | | | | Do not commit so often. flushing is enough.
* | Fix issue 611: Proper (back)relationship on MediaComment.Elrond2013-01-291-1/+7
| | | | | | | | well, fix the relationship on the comments.
* | Failing testcase for issue 611.Elrond2013-01-292-2/+68
| | | | | | | | | | | | | | | | | | | | This currently fails (with foreign key constrain error): 1. Have user A and B. 2. User B creates media M. 3. User A post a comment on M. 4. User A deletes his own account. The test is a little bit wider.
* | Fix reference of get_test_app->get_app in test_modelmethodsChristopher Allan Webber2013-01-251-2/+2
| | | | | | | | | | (This changed in master while this test was being written; correcting post-merge.)
* | Merge branch '216_cwebber_style_unique_slugs'Christopher Allan Webber2013-01-253-10/+192
|\ \
| * | New mediaentry slug tests now pass!Christopher Allan Webber2013-01-232-3/+134
| | | | | | | | | | | | | | | | | | - fixed some issues with "whacking uuid junk on the slug" - uuid4() -> uuid.uuid4() so that mock will work right - added all the tests!
| * | We don't want any empty string slugs, so make "" -> NoneChristopher Allan Webber2013-01-231-0/+4
| | |
| * | Switching uuid4()[1:4] -> uuid4().hex[:4]Christopher Allan Webber2013-01-231-1/+1
| | | | | | | | | | | | | | | | | | .hex is what we need to access to get at the ascii (hex) version anyway. Also, not sure why the previous version grabbed starting at the index of 1... just grab the first characters instead.
| * | Simplifying string concatenation in generate_slug and fixing docstringChristopher Allan Webber2013-01-151-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | - made the mistake of copying some commit message things into the docstring. Fixed. - elrond points out that += is nicer and we don't need u"" in this case since we're not concatenating a variable, we're concatenating a known ascii string.
| * | A revised algorithm for generating slugs.Christopher Allan Webber2013-01-151-11/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This one does not *force* slugs, but usually it will probably result in a niceish one. The end *result* of the algorithm will (presumably, I have not tested it) result in these resolutions for these situations: - If we have a slug, make sure it's clean and sanitized, and if it's unique, we'll use that. - If we have a title, slugify it, and if it's unique, we'll use that. - If we can't get any sort of thing that looks like it'll be a useful slug out of a title or an existing slug, bail, and don't set the slug at all. Don't try to create something just because. Make sure we have a reasonable basis for a slug first. - If we have a reasonable basis for a slug (either based on existing slug or slugified title) but it's not unique, first try appending the entry's id, if that exists - If that doesn't result in something unique, tack on some randomly generated bits until it's unique. That'll be a little bit of junk, but at least it has the *basis* of a nice slug!
| * | Need to import uuid4 for generate_slug to totally workChristopher Allan Webber2013-01-151-0/+2
| | |
| * | Make generate_slug assign a slug in any caseSebastian Spaeth2013-01-151-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generate_slug could assign "none" as slug. Make sure it assigns a unique slug in any case. We now try based on: a) existing slug values b) media.title c) media.id d) random garbage Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
| * | Sanitize slug input on media editSebastian Spaeth2013-01-151-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we allowed EVERYTHING, even slashes as slug when editing the media. Make sure we slugify the input to sanitize it. (+ string formdata is unicode, so there is no need to convert it) Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
| * | Disallow ":" as part of a media slugSebastian Spaeth2013-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | We might want to use "id:IDN" as a special case slug to point to a media's id. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* | | Use better relationships to delete collections.Elrond2013-01-231-5/+8
| | | | | | | | | | | | | | | | | | When deleting a User, his/her collections can be deleted by sqlalchemy: Collections do not need any special code to be executed on deletion.
* | | Made pil_filters a PIL_FILTERS (global)Joar Wandborg2013-01-221-8/+8
| | |
* | | Changed sampling filter default to AAJoar Wandborg2013-01-221-2/+2
| | |
* | | Made the image sampling filter configurableJoar Wandborg2013-01-222-1/+23
| | | | | | | | | | | | - Changed the default to BICUBIC instead of previous ANTIALIAS