3892 Commits

Author SHA1 Message Date
Christopher Allan Webber
9853a99bbf jpope's been helping a bunch, so of course we need to put him in AUTHORS! 2014-01-27 13:48:56 -06:00
Christopher Allan Webber
f6e9aa8aa2 Fixing the STL media page for post-skeleton merge 2014-01-26 13:08:01 -06:00
Christopher Allan Webber
cebd1ad71c Okay that broke the build process(?), testing if this fixes it 2014-01-23 09:32:54 -06:00
Christopher Allan Webber
16a952a4eb Once we can, that is. 2014-01-23 09:23:51 -06:00
Christopher Allan Webber
9a7d986304 Setting a specific pbr version in setup.py 2014-01-23 09:23:38 -06:00
Christopher Allan Webber
c5b8ff2c75 Have the hook handle happen in the root_view proxy view itself
This way it isn't set in stone at a module level, especially if this
gets imported before the whole application inits, or if run during
tests and possibly imported multiple times.
2014-01-14 12:13:36 -06:00
Christopher Allan Webber
cb76655ce2 Merge remote-tracking branch 'refs/remotes/tilly-q/variable-front-page' 2014-01-14 12:03:07 -06:00
jpope
9589346c8f fixes #829 plus a little more that was somewhat related 2014-01-13 15:04:02 -06:00
jpope
a19c00c1e3 adjust exif info alignment 2014-01-13 11:37:36 -06:00
jpope
27fc8ef26f adjust exif to match other sections and remove extra css 2014-01-13 08:14:00 -06:00
jpope777
d64f57977c Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton 2014-01-11 00:26:28 -06:00
jpope
12c42bd6d8 another airy update 2014-01-10 23:46:32 -06:00
jpope
2edeb960f3 minor updates for airy 2014-01-10 23:38:34 -06:00
tilly-Q
b1f996d7b5 This is a very minor change that makes it possible for plugins to provide an
alternative to the default root_view.
2014-01-10 13:01:19 -05:00
jpope777
833099ccf8 Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton 2014-01-08 00:08:55 -06:00
jpope
5cdf3a0a14 move "wide" view to seperate branch 2014-01-08 00:08:11 -06:00
jpope
4a9a796a7f rename couple of css classes 2014-01-07 23:23:53 -06:00
jpope777
b2de5021c6 Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton 2014-01-07 20:40:12 -06:00
jpope
1469f432fc adjust thumbnails 2014-01-07 20:39:33 -06:00
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