jpope
d598a403e5
center media within media container
2014-01-07 19:46:58 -06:00
jpope
87ce1e9e63
add warning color to delete buttons.
2014-01-07 18:21:51 -06:00
jpope
297983f7be
style cancel "button" on attachments page
2014-01-07 18:10:10 -06:00
jpope777
ab6cb46617
Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
2014-01-07 17:53:36 -06:00
jpope
da4d97e0fd
add a little button color and new media page layout
2014-01-07 17:52:38 -06:00
jpope
fe024f0be7
skeletonize frontpage welcome
2014-01-07 12:09:02 -06:00
jpope
7b40694e7b
adjust 404 page
2014-01-07 02:20:58 -06:00
jpope
b216047f04
adjust banned page
2014-01-07 02:19:46 -06:00
jpope
1450740275
realign columns on mod user page
2014-01-07 02:02:12 -06:00
jpope777
ec8dbf1dc8
Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
2014-01-07 01:06:09 -06:00
jpope
a5ac282c9b
debone and redo the header
2014-01-07 01:05:01 -06:00
jpope
ff9b6b51b0
adjust mod report page
2014-01-06 20:27:32 -06:00
jpope777
a42c871161
Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
2014-01-06 19:05:23 -06:00
jpope
9e9c9c509b
move js back to the head
2014-01-06 18:40:59 -06:00
jpope
7bc68035b5
small adjustments to user mod page again
2014-01-06 18:31:57 -06:00
jpope777
1b6831193f
Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
2014-01-06 18:21:29 -06:00
jpope
a054ab3d5a
realign the user admin page
2014-01-06 18:18:52 -06:00
jpope777
03abcd0841
Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
2014-01-06 15:20:53 -06:00
jpope
45842f840f
migrate media page to skeleton
2014-01-06 15:19:14 -06:00
jpope
3bb58e6f0a
more skeleton migrations
2014-01-06 10:52:11 -06:00
jpope
2fb6f1d03a
Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
...
Conflicts:
.gitmodules
mediagoblin/static/css/base.css
2014-01-05 20:56:28 -06:00
jpope
8b8698eff5
start moving more to skeleton
2014-01-05 20:47:36 -06:00
jpope777
da77b8e913
initial skeleton push
2014-01-05 19:04:44 -06:00
jpope
f13016943f
undo that "update"
2014-01-05 17:12:13 -06:00
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
