heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,787 Commits 1 Branch 0 Tags
Commit Graph

2787 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Allan Webber
aecd65b789 Simplifying the test for whether or not a user and slug combo exists. 
Thanks to tchernobog for catching this (it was breaking on postgres)
and Elrond for the suggestion on how to fix it.

This commit sponsored by Caleb Cooper.  Thanks Caleb!
 2013-02-27 09:56:56 -06:00
Christopher Allan Webber
8db7eed3bc Removing html5shiv for not complying with its own licenses and racism 
Issues of racism seem to have been resolved and removed from upstream,
but make having this as a dependency somewhat uncomfortable:
  https://github.com/aFarkas/html5shiv/issues/91

Regardless, at the time of writing the project doesn't comply with its
own license... it states to be dual licensed under MIT and GPLv2 but
distributes neither of these licenses with its source.
 2013-02-26 17:50:11 -06:00
Joar Wandborg
6bdf9a1044 Allow media managers without sniff_handler 2013-02-27 00:30:51 +01:00
Christopher Allan Webber
443dcf867c Copying the license from the jquery repository rather than the generic MIT one. 
Damned MIT and BSD licenses encouraging modification by every project
makes compliance annoying.
 2013-02-26 17:17:27 -06:00
Christopher Allan Webber
e4e50a2765 Simplifying the "id:" url detection, per Elrond's suggestion. 
As pointed out, we didn't need that nested if.

This commit sponsored by Paul Kuriakose.  Thank you!
 2013-02-26 14:04:26 -06:00
Christopher Allan Webber
697c74c2de Replacing several request.matchdict['media'] -> media_slug ... shorter! 
Thanks for pointing this out, Elrond ;)

This commit sponsored by Gerardo Joven Valdivia.  Thank you!
 2013-02-26 13:54:19 -06:00
Christopher Allan Webber
7de20e5234 Media URLs with ids in them are now like /u/cwebber/m/id:4112/ rather than /u/cwebber/m/4112/ 
This avoids some potential name collision issues.

This commit sponsored by Asokan Pichai.  Thank you!
 2013-02-26 13:38:11 -06:00
Christopher Allan Webber
397c22d139 Stylistic cleanups to some urlgen calls. 
This commit sponsored by Stephane Berube.  Thank you!
 2013-02-26 13:08:23 -06:00
Christopher Allan Webber
67c7c81162 Small PEP-8 compliance fix. 
This commit sponsored by Mats Sjöberg.  Thanks!
 2013-02-26 10:33:51 -06:00
Christopher Allan Webber
ab1f65e6d7 Import sqlalchemy's and_ and use it in our select statement 
This commit sponsored by Hans-Jörg Dollansky.  Thank you!
 2013-02-26 10:15:26 -06:00
Christopher Allan Webber
0b7cdb6f3e And of course, we need to actually commit at the end of a migration. 
This commit sponsored by Tamas Kemenczy.  Thanks, Tamas!
 2013-02-26 09:58:25 -06:00
Christopher Allan Webber
0c6a34bf5c Dope'ily missed .count() on the query where we're counting 
Thanks for catching, Elrond.

This commit sponsored by Graham King.  Thank you!
 2013-02-25 16:35:05 -06:00
Christopher Allan Webber
e66431f4c3 Supplying migrations for a bold new era of mediagoblin entry slugs 
Okay, that's a totally confusing statement, but the docstring of this
migration summarizes it well:

  Entries without slugs now display differently in the url like:
    /u/cwebber/m/id=251/

  ... because of this, we should back-convert:
   - entries without slugs should be converted to use the id, if possible, to
     make old urls still work
   - slugs with = (or also : which is now also not allowed) to have those
     stripped out (small possibility of breakage here sadly)

This commit sponsored by John Sullivan.  Thanks johnsu01! :)
 2013-02-25 16:16:21 -06:00
Christopher Allan Webber
86f0ff75e3 You can now set the PASTE_CONFIG environment variable to control logging setup 
So this should work:

  PASTE_CONFIG=/path/to/paste_foo.ini ./lazycelery.sh

Thanks to Laurent Fournier for sponsoring this commit!
 2013-02-25 12:15:12 -06:00
Christopher Allan Webber
a49c741f11 Removing stray character from pythonsnake's doc change and filling comment 
This commit sponsored by Johannes Knabbe.  Thank you!
 2013-02-24 16:38:01 -06:00
pythonsnake
37b48053e9 Fix bug 461 2013-02-24 16:38:01 -06:00
Jef van Schendel
a5b9a066bf Improved dropdown styling, part deux 2013-02-24 21:09:16 +01:00
Jef van Schendel
42a8de4932 Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin 2013-02-24 20:54:10 +01:00
Jef van Schendel
fe253e31b3 Improved dropdown styling 2013-02-24 20:53:34 +01:00
Christopher Allan Webber
76b399a3ef Changing the order so that config_spec.ini is mentioned after mediagoblin_local.ini 
This commit sponsored by Matteo Settenvini.  Thanks!
 2013-02-24 13:53:15 -06:00
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