aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | pdf/processing: fix non pdf regression, copy correct fileAlon Levy2013-12-261-2/+4
* | | pdf/processing: avoid possible dead goblin if pdfinfo failedAlon Levy2013-12-261-0/+5
* | | Rename a few files and minor cleanupSebastian Spaeth2013-12-125-20/+17
* | | Remove "Create blog" from admin top barSebastian Spaeth2013-12-123-24/+0
* | | Add the profile_hook in case of user with or without mediaSebastian Spaeth2013-12-121-5/+1
* | | Force evaluation of Query() through count()Sebastian Spaeth2013-12-122-6/+4
* | | Fix "middot" when blog plugin is disabledSebastian Spaeth2013-12-122-3/+1
* | | Undo changes since gsoc in media_confirm_deleteSebastian Spaeth2013-12-121-22/+4
* | | Use MEDIA_TYPE, not hardcoded variable of same valueSebastian Spaeth2013-12-121-1/+1
* | | Convert blog plugin to use new privileges systemSebastian Spaeth2013-12-124-6/+6
* | | Revert "Replace hardcoded URL by variable for the same."Sebastian Spaeth2013-12-121-1/+1
* | | Finalize merging of the blog branch by Aditi (Gsoc 2013)Sebastian Spaeth2013-12-122-3/+2
* | | Merge branch 'master' into upstream-masterSebastian Spaeth2013-12-12118-5/+4314
|\ \ \
| * | | Write docstringg for view functions.Aditi Mittal2013-09-241-9/+25
| * | | some fixesAditi Mittal2013-09-216-13/+18
| * | | Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblinAditi Mittal2013-09-1834-229/+7817
| |\ \ \
| * | | | Write template to render blog about page.Aditi Mittal2013-09-181-0/+38
| * | | | Change the text of url to blogs on user profile page.Aditi Mittal2013-09-181-3/+3
| * | | | Url mapping for blog about page.Aditi Mittal2013-09-181-1/+9
| * | | | Add view button and create blog button on blogs dashboard.Aditi Mittal2013-09-181-19/+28
| * | | | Add url to blog post listing page on blog dashboard of a blog.Aditi Mittal2013-09-181-0/+5
| * | | | Write view for blog about page.Aditi Mittal2013-09-181-2/+29