2666 Commits

Author SHA1 Message Date
Christopher Allan Webber
203f51a866 Merge remote-tracking branch 'refs/remotes/pythonsnake/581_config' 2013-02-24 13:52:13 -06:00
Christopher Allan Webber
a587492729 Merge remote-tracking branch 'refs/remotes/pythonsnake/629_autoplay' 2013-02-24 13:06:53 -06:00
Christopher Allan Webber
cac17c156b Renaming "extrahead" template hooks to "head".
As Elrond points out, the "extra" is implied by it being a hook!

This commit sponsored by Andrew Fustini.  Thanks, Drew!
2013-02-24 12:42:17 -06:00
Christopher Allan Webber
f6d1d28d45 extra_head template hook. This will allow plugins to add extra js/css more easily.
This commit sponsored by Moritz Berberich.  Thank you!
2013-02-24 12:33:54 -06:00
Elrond
5a05016896 Add owner to list of collections.
When listing the collections, that a media is contained in,
also show the owner of the collection.

Also simplify the whole looping a lot.
2013-02-24 18:44:29 +01:00
Elrond
96a2249bc0 Use media.id for collecting media too.
Also remove some useless whitespace while at it.
2013-02-24 16:22:48 +01:00
Elrond
954b407cf8 Use the media id for attachmemt editing.
And remove some stray white space from the output.
2013-02-24 12:36:07 +01:00
Christopher Allan Webber
ac7c918096 Committing extracted and compiled translations 2013-02-23 10:47:51 -06:00
Christopher Allan Webber
f722b49f8f Committing present MediaGoblin translations before pushing extracted messages 2013-02-23 10:46:56 -06:00
Joar Wandborg
6e2e5b3600 Fix stray comma in listings.views.atom_feed 2013-02-22 22:36:00 +01:00
Joar Wandborg
b33b360858 Added some empty templates
- Make it possible for site owners to hook into base.html without
  tainting the repository.
2013-02-22 22:24:29 +01:00
András Veres-Szentkirályi
0037706a57 simplified get_useful 2013-02-22 22:24:29 +01:00
András Veres-Szentkirályi
f2da5bef9a use dict.iteritems() instead of dict.items() 2013-02-22 22:24:29 +01:00
András Veres-Szentkirályi
6dc508d27f use list expression instead of 3-deep for 2013-02-22 22:24:29 +01:00
András Veres-Szentkirályi
5e746bfdd3 simplified clean_exif 2013-02-22 22:24:29 +01:00
András Veres-Szentkirályi
9aff782ba7 close file properly and remove unneeded variable 2013-02-22 22:24:29 +01:00
András Veres-Szentkirályi
64376dc0bc typofix in comment 2013-02-22 22:24:29 +01:00
András Veres-Szentkirályi
dd51c03985 use key in dict instead of key in dict.keys() 2013-02-22 22:24:29 +01:00
András Veres-Szentkirályi
596b3410db removed unused import cgi.FieldStorage 2013-02-22 22:24:29 +01:00
András Veres-Szentkirályi
bedc215b44 removed unused import re 2013-02-22 22:24:29 +01:00
András Veres-Szentkirályi
92fae6d8cd removed unnecessary collection lookup 2013-02-22 22:24:29 +01:00
András Veres-Szentkirályi
e5e2c5e7aa removed unused import NotFound 2013-02-22 22:24:29 +01:00
Christopher Allan Webber
ec3f1012b1 Changing name for atom feed view to be more generic than tags.
This commit sponsored by Ben Hutchings.  Thanks, Ben!
2013-02-22 15:04:52 -06:00
Sebastian Spaeth
251db013fd Integrate all atom feed in template
Embed the atom feed link in the root template (most recent media
page) for easier discovery. Delete the (listings/all.html) template
as contributed in commit 195e79098b5 as it was unused and the feed
is essentially showing the most recent media anyway.
2013-02-22 15:04:52 -06:00
Sebastian Spaeth
b624ca0f8b Adding an Atom RSS feed for all media on the server
Go to /atom/ in your browser to see it.
2013-02-22 15:04:52 -06:00
Elrond
cde7a07d5e Create wtforms_util.render_label(_p) and use it around.
- This makes many places more readable.
- Gives us translation in two places.
- Allows easier changing of labels in a central place.
2013-02-22 14:24:37 +01:00
Elrond
d647b62699 Use wtforms_util.render_field_div more in media_collect.html
If we have to render fields individually, we still can use
wtforms_util.render_field_div for each field. Makes things
much smaller and readable.
2013-02-22 14:23:16 +01:00
Christopher Allan Webber
aa9ac2b287 Merge remote-tracking branch 'aleksej/632_config_spec_comment_typo' 2013-02-21 17:58:27 -06:00
Christopher Allan Webber
b9d1d13743 Remove "translation legos" and linkify the tag to more generic tag listing
By "translation legos" I mean having multiple strings to be translated
appended together.  This isn't a good idea because you can't assume
that syntax will work together in the same way in another language, so
you may be making things hard or impossible for translators.

Between this and the last commit, this means that tags now link to
user tagged media specifically, and if people want a more general tag
listing, they can click on the tag link to get to a more general
listing.  I feel this is a good and intuitive route to handling this.

This sponsored commit brought to you by Debarshi Ray!  Thank you!
2013-02-21 16:29:16 -06:00
Christopher Allan Webber
631784a2d7 Making the tags on media pages point to the user's tag listing specifically.
This commit sponsored by Torsten Meissner.  Thanks, Torsten!
2013-02-21 16:19:43 -06:00
Christopher Allan Webber
38905733e8 Fixing user gallery tags filter to be on slug rather than name.
This commit sponsored by Kat Walsh.  Thanks, Kat!
2013-02-21 16:13:56 -06:00
Christopher Allan Webber
60a7eb9ca5 Merge remote-tracking branch 'refs/remotes/spaetz/WIP/user_tag_gallery' 2013-02-21 15:55:26 -06:00
Runar Petursson
9b2cd962af plugins/api: fix for cross origin requests
The response headers were never getting set because of a bug in the 7c552c0
commit.  This expands the loop into a more readable form and results in the
headers getting set.
2013-02-20 23:41:36 +01:00
Elrond
155438cdc1 Fix some small bits in base.html.
1. Add a trailing slash to the mediagoblin.org URL.
   (The string changed anyway, so translations are not
   affected more than already.)
2. Order was wrong for those two at the end (old version):
     {% endblock mediagoblin_body %}
     </div>
3. Fix some little indenting issues.
4. Remove some useless space from the output.
2013-02-19 17:44:04 +01:00
Elrond
0c8073a3a3 Merge remote-tracking branch 'pythonsnake/537_version'
* pythonsnake/537_version:
  Added "version" before the version
  Fix bug 537
2013-02-19 13:34:13 +01:00
Elrond
df5b142ab9 Fix deleting media with attachments.
If one deletes a media with attachments, there have been
various problems:
1) If the file in the storage did not exist any more (maybe
   because due to a previous deletion attempt?), the error
   propagation failed, because the wrong thing was
   gathered.
2) The attachment database entries were not deleted.
   Using cascade for this, for now.

Also add a simple unit test, that tests both by having a
broken attachment on a media.
2013-02-18 14:55:42 +01:00
Joar Wandborg
61e39d90e5 Fix errors in collection views
When a collection does not exist, render the 404 page.
2013-02-18 14:41:34 +01:00
Joar Wandborg
ab9b0b4175 Change from email format in tag URI to domain format
Also fixed a bug (thanks pyflakes)
2013-02-13 23:12:55 +01:00
Joar Wandborg
19ad2e0cd0 Address concerns in Issue #543
- Fixed PEP-008 issues.
- Removed .user-{user} from the tag URI and put it before the domain,
  such as {user}@{host} instead.
- Use year from collection.created instead of current year.
2013-02-13 22:23:27 +01:00
pythonsnake
dc000b70ff Mention mediagoblin/config_spec.ini 2013-02-13 16:56:24 +01:00
Elrond
b4ea20fa98 Add markdown notice to collection description.
Use wtforms_util.render_field_div on the collection
description, so that the markdown notice in the wtform is
actually rendered to html.
2013-02-13 00:02:56 +01:00
pythonsnake
1bd9ee4112 Added "version" before the version 2013-02-11 16:57:33 +01:00
Christopher Allan Webber
fc6616ed26 Fixing MANIFEST.in: graft expects one directory per line 2013-02-10 13:49:35 -06:00
Christopher Allan Webber
140f703fc4 Updating MANIFEST.in for more files... trying to make this work on pypi :) 2013-02-10 13:48:18 -06:00
Joar Wandborg
8d355df617 Tuned logging and added comments to 511 fix 2013-02-10 20:19:13 +01:00
pythonsnake
34c35c8cec Fixed issue #511. 2013-02-10 20:11:47 +01:00
pythonsnake
6f6471aa5e Fix bug 629 2013-02-10 15:08:15 +01:00
pythonsnake
2a0aed84a6 Fix bug 537 2013-02-10 12:01:24 +01:00
Aleksej
cd3058373c correct typo in a comment in config_spec.ini 2013-02-10 14:13:46 +04:00
Christopher Allan Webber
591c116098 Merge remote-tracking branch 'refs/remotes/elrond/sql/media_data' 2013-02-09 15:33:06 -06:00