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

4049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jpope
3db134b88c updated 2014-01-05 16:56:47 -06:00
jpope
0172ad0001 Merge remote-tracking branch 'upstream/master' into skeletongobblin 2014-01-05 16:55:58 -06:00
Christopher Allan Webber
64eab630bf Not only the web server starts MediaGoblin app! Better phrasing. 2014-01-02 15:07:54 -06:00
Christopher Allan Webber
e0bf6b4bf7 Merge remote-tracking branch 'refs/remotes/rodney757/dbupdate' 
Conflicts:
	mediagoblin/db/util.py
	mediagoblin/gmg_commands/dbupdate.py
 2014-01-02 15:01:54 -06:00
Christopher Allan Webber
408aa9cf3b Merge remote-tracking branch 'remotes/jiyda/220_rtl_language_support' 
Conflicts:
	mediagoblin/templates/mediagoblin/base.html
	mediagoblin/tools/template.py
 2014-01-02 14:49:04 -06:00
Christopher Allan Webber
f4703ae9cd Don't fail transcoding if we fail to generate a thumbnail. 
This patch by Sergio Durigan Junior.  Thank you, Sergio!
 2014-01-02 11:17:59 -06:00
Christopher Allan Webber
f7f38fb047 sqlalchemy-migrate 0.8.X doesn't get along with sqlalchemy 0.9.0 2014-01-01 16:42:04 -06:00
jpope
1e298b10c7 fix misplaced body tag when I moved the javascript to bottom of page 2014-01-01 11:54:23 -06:00
jpope777
5970a855f6 incorporate skeleton layout in the galleries 2014-01-01 00:48:23 -06:00
jpope777
b5ab205d3c update base.html 2013-12-31 15:52:44 -06:00
jpope777
3e2a1f155e add symlinks to skeleton 2013-12-31 15:00:16 -06:00
jpope777
054cfee4b4 add skeleton submodule 2013-12-31 14:50:21 -06:00
Alon Levy
7c6646a01a media_types/sniff_media: reset file back to 0 offset for actual copy. Required when not using celery 2013-12-26 19:00:02 -06:00
Alon Levy
0021c06886 pdf/processing: fix non pdf regression, copy correct file 2013-12-26 18:35:27 -06:00
Alon Levy
690f50de1c pdf/processing: avoid possible dead goblin if pdfinfo failed 2013-12-26 18:34:40 -06:00
Sebastian Spaeth
eebd8fe3ed Rename a few files and minor cleanup 
Within the blog plugin, rename a few files and clean up a few things
that can be cleaned up.
 2013-12-12 18:56:36 +01:00
Sebastian Spaeth
0a97e5e16f Remove "Create blog" from admin top bar 
This is such a rare event that we do not need a "Create blog" button
in the top navbar. It suffices to have the link on the "blog dashboard"
page. Also, this saves us a hook to run on all pages that we render, basically.
 2013-12-12 18:25:29 +01:00
Sebastian Spaeth
fcdc976ffd Add the profile_hook in case of user with or without media 
the hook was only run in case the user had no media uploaded yet.
This does not make any sense, so we run the hook in all cases now.
The designers might have to think about the placement of the stuff
being inserted at some point...
 2013-12-12 18:12:13 +01:00
Sebastian Spaeth
461cd7c10d Force evaluation of Query() through count() 
Otherwise "blogs" is a query that evaluates to true, even if the user
has no blogs. This fixes the bug that the blog link is shown on a user's
profile page even if she has no blogs at all.
 2013-12-12 18:03:47 +01:00
Sebastian Spaeth
c518d5421d Fix "middot" when blog plugin is disabled 
The blog plugin accidentally introduced two "middots in the admin bar,
which were visible when the blog plugin was disabled. Fixing this by
moving the second dot in the blog template.
 2013-12-12 17:50:34 +01:00
Sebastian Spaeth
686cbcd974 Undo changes since gsoc in media_confirm_delete 
Since the Gsoc the use of decorators has simplified this function.
Reintroduce the same code as before Adidits blog branch made these
changes.
 2013-12-12 17:38:18 +01:00
Sebastian Spaeth
52a0387fc6 Use MEDIA_TYPE, not hardcoded variable of same value 2013-12-12 17:29:48 +01:00
Sebastian Spaeth
39fbb83490 Convert blog plugin to use new privileges system 
there is no user.is_admin anymore. Adapt to use the new privileges
system.
 2013-12-12 17:13:48 +01:00
Sebastian Spaeth
14103077e9 Revert "Replace hardcoded URL by variable for the same." 
This reverts commit e0e02e98bcd4664b1c0a57e422ea4c0e5b6ba059.
There is absolutely no need for this.
 2013-12-12 16:51:18 +01:00
Sebastian Spaeth
7b2f3d2a9e Finalize merging of the blog branch by Aditi (Gsoc 2013) 
Comment out the blog plugin by default. Remove the blog README.md in
the root directory.
 2013-12-12 16:38:35 +01:00
Sebastian Spaeth
a42dda21f9 Merge branch 'master' into upstream-master 
Conflicts:
	mediagoblin/templates/mediagoblin/base.html
	mediagoblin/templates/mediagoblin/user_pages/user.html
 2013-12-12 16:24:34 +01:00
Christopher Allan Webber
070bc99c1e Fixing Josie's name 2013-12-11 12:30:12 -06:00
tilly-Q
50ee657607 Fixed a small typo that was causing the mediagoblin.moderation.users_detail 
page to crash.
 2013-12-08 12:40:47 -05:00
Christopher Allan Webber
40322832b4 Committing extracted and compiled translations 2013-12-03 13:24:20 -06:00
Christopher Allan Webber
97e445ccd4 Committing present MediaGoblin translations before pushing extracted messages 2013-12-03 13:23:25 -06:00
Christopher Allan Webber
daf91e3777 Make "Username's privileges" translatable 
This commit sponsored by Aaron Borden.  Thank you!
 2013-12-03 13:22:47 -06:00
Christopher Allan Webber
e9e3ecc2e6 v0.6.2.dev 2013-12-03 13:20:38 -06:00
Christopher Allan Webber
74488d15af Now on v0.6.1, officially! 2013-12-03 12:19:48 -06:00
Christopher Allan Webber
29166813ff Release notes for v0.6.1, also instructions to check out a specific tag 
The instructions to check out a specific tag comes at the recommendation
of Mike Linksvayer.

It's only appropriate then that this sponsored commit go to Mike
Linksvayer then.  Thanks, Mike! :)
 2013-12-03 12:17:02 -06:00
Christopher Allan Webber
732ebe0cad Turning off the Terms of Service feature by default 
This commit sponsored by Jessica Coates.  Thank you!
 2013-12-03 11:51:46 -06:00
Christopher Allan Webber
7731e7c90b We're in the 0.6.1 dev zone! But we shouldn't stay here long ;) 2013-12-03 11:32:43 -06:00
Christopher Allan Webber
94658aba1d Removing the assertion that this site is run by StatusNet (major oops) and adding <p> tags 
The StatusNet one was a pretty goofy mistake.  But at least now it's fixed! :)

This commit sponsored by Jon Buckley.  Thank you!
 2013-12-03 11:31:09 -06:00
Christopher Allan Webber
3600bb34aa At v0.6.0! Woohoo! 2013-12-02 13:55:07 -06:00
Christopher Allan Webber
732a5199d4 Adding Asheesh Laroia to AUTHORS! 2013-12-02 13:54:50 -06:00
Christopher Allan Webber
edb55f7f8f Previous ordering seemed weird. 2013-12-02 13:38:45 -06:00
Christopher Allan Webber
e73afbd57f Including python-dateutil in our dependency list 2013-12-02 13:36:55 -06:00
Asheesh Laroia
26990bc0e0 In the case of setuptools/sqlalchemy conflict, explain the issue 
This commit tri-licensed under:
  CC0 1.0, AGPLv3 or later (at your option), and Apache License 2.0
 2013-12-02 12:13:31 -06:00
Christopher Allan Webber
7dfd538fbc Committing extracted and compiled translations 2013-12-02 09:29:05 -06:00
Christopher Allan Webber
5a033eece8 Committing present MediaGoblin translations before pushing extracted messages 2013-12-02 09:28:05 -06:00
Christopher Allan Webber
501e160665 Also adding contributor "Josie". Not sure of full name! 2013-12-02 09:06:36 -06:00
Alon Levy
048eab5a7a mediagoblin/templates/mediagoblin/user_pages/collection.html: fix typo 2013-12-01 10:24:07 -06:00
Christopher Allan Webber
c507a3e9bc Adding Lenna Peterson to AUTHORS 2013-11-30 14:59:32 -06:00
Christopher Allan Webber
c6b6be17a4 LDAP readme link 2013-11-30 14:46:06 -06:00
Christopher Allan Webber
2691bfe11b 0.6.0 release notes 2013-11-30 14:45:53 -06:00
Christopher Allan Webber
e5c4f678ec Provide an easy option to turn off the terms of service 2013-11-30 14:25:29 -06:00