aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* adjust exif info alignmentjpope2014-01-131-0/+6
* adjust exif to match other sections and remove extra cssjpope2014-01-132-41/+10
* Merge remote-tracking branch 'upstream/skeletongobblin' into skeletonjpope7772014-01-111-0/+28
|\
| * another airy updatejpope2014-01-101-0/+5
| * minor updates for airyjpope2014-01-101-0/+23
* | Merge remote-tracking branch 'upstream/skeletongobblin' into skeletonjpope7772014-01-085-17/+18
|\|
| * move "wide" view to seperate branchjpope2014-01-082-10/+11
| * rename couple of css classesjpope2014-01-075-7/+7
* | Merge remote-tracking branch 'upstream/skeletongobblin' into skeletonjpope7772014-01-076-9/+14
|\|
| * adjust thumbnailsjpope2014-01-071-0/+3
| * center media within media containerjpope2014-01-071-4/+6
| * add warning color to delete buttons.jpope2014-01-074-4/+4
| * style cancel "button" on attachments pagejpope2014-01-071-1/+1
* | Merge remote-tracking branch 'upstream/skeletongobblin' into skeletonjpope7772014-01-077-40/+113
|\|
| * add a little button color and new media page layoutjpope2014-01-073-11/+66
| * skeletonize frontpage welcomejpope2014-01-072-22/+40
| * adjust 404 pagejpope2014-01-071-1/+1
| * adjust banned pagejpope2014-01-071-1/+1
| * realign columns on mod user pagejpope2014-01-071-5/+5
* | Merge remote-tracking branch 'upstream/skeletongobblin' into skeletonjpope7772014-01-073-26/+27
|\|
| * debone and redo the headerjpope2014-01-072-22/+21
| * adjust mod report pagejpope2014-01-062-4/+6
* | Merge remote-tracking branch 'upstream/skeletongobblin' into skeletonjpope7772014-01-063-19/+15
|\|
| * move js back to the headjpope2014-01-061-9/+9
| * small adjustments to user mod page againjpope2014-01-062-10/+6
* | Merge remote-tracking branch 'upstream/skeletongobblin' into skeletonjpope7772014-01-062-109/+132
|\|
| * realign the user admin pagejpope2014-01-062-109/+132
* | Merge remote-tracking branch 'upstream/skeletongobblin' into skeletonjpope7772014-01-064-73/+74
|\|
| * migrate media page to skeletonjpope2014-01-062-76/+37
| * more skeleton migrationsjpope2014-01-063-12/+52
* | Merge remote-tracking branch 'upstream/skeletongobblin' into skeletonjpope2014-01-052-105/+98
|\|
| * start moving more to skeletonjpope2014-01-052-105/+98
| * undo that "update"jpope2014-01-051-1/+1
| * updatedjpope2014-01-051-1/+1
| * Merge remote-tracking branch 'upstream/master' into skeletongobblinjpope2014-01-059-6/+46
| |\
| * | fix misplaced body tag when I moved the javascript to bottom of pagejpope2014-01-011-1/+1
| * | incorporate skeleton layout in the galleriesjpope7772014-01-016-32/+62
| * | update base.htmljpope7772013-12-311-0/+6
| * | add symlinks to skeletonjpope7772013-12-314-0/+4
| * | add skeleton submodulejpope7772013-12-312-0/+3
* | | initial skeleton pushjpope7772014-01-058-25/+67
| |/ |/|
* | Not only the web server starts MediaGoblin app! Better phrasing.Christopher Allan Webber2014-01-021-1/+1
* | Merge remote-tracking branch 'refs/remotes/rodney757/dbupdate'Christopher Allan Webber2014-01-023-1/+22
|\ \
| * | don't set logging level to debugRodney Ewing2013-09-021-2/+0
| * | check if db is up to dateRodney Ewing2013-09-022-1/+20
* | | Merge remote-tracking branch 'remotes/jiyda/220_rtl_language_support'Christopher Allan Webber2014-01-023-4/+17
|\ \ \
| * | | Added rtl language supportJiyda Mint Moussa2013-04-293-3/+15
* | | | Don't fail transcoding if we fail to generate a thumbnail.Christopher Allan Webber2014-01-022-0/+6
* | | | sqlalchemy-migrate 0.8.X doesn't get along with sqlalchemy 0.9.0Christopher Allan Webber2014-01-011-1/+1
| |_|/ |/| |
* | | media_types/sniff_media: reset file back to 0 offset for actual copy. Require...Alon Levy2013-12-261-0/+1