aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
|\| | | | | | | | | | | | | | | | | Conflicts: .gitmodules mediagoblin/static/css/base.css
| * | 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
|\ \ | | | | | | | | | | | | | | | Conflicts: mediagoblin/db/util.py mediagoblin/gmg_commands/dbupdate.py
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/templates/mediagoblin/base.html mediagoblin/tools/template.py
| * | | Added rtl language supportJiyda Mint Moussa2013-04-293-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RTL languages like Arabic, Hebrew etc were displayed from left to right. I fixed this by adding a function to check whether the language of the locale is rtl and change the direction of the html in "base.html" accordingly. [Fixes #220]
* | | | Don't fail transcoding if we fail to generate a thumbnail.Christopher Allan Webber2014-01-022-0/+6
| | | | | | | | | | | | | | | | This patch by Sergio Durigan Junior. Thank you, Sergio!
* | | | 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. ↵Alon Levy2013-12-261-0/+1
| | | | | | | | | | | | Required when not using celery
* | | 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
| | | | | | | | | | | | | | | Within the blog plugin, rename a few files and clean up a few things that can be cleaned up.
* | | Remove "Create blog" from admin top barSebastian Spaeth2013-12-123-24/+0
| | | | | | | | | | | | | | | | | | 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.
* | | Add the profile_hook in case of user with or without mediaSebastian Spaeth2013-12-121-5/+1
| | | | | | | | | | | | | | | | | | | | | 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...
* | | Force evaluation of Query() through count()Sebastian Spaeth2013-12-122-6/+4
| | | | | | | | | | | | | | | | | | 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.
* | | Fix "middot" when blog plugin is disabledSebastian Spaeth2013-12-122-3/+1
| | | | | | | | | | | | | | | | | | 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.
* | | Undo changes since gsoc in media_confirm_deleteSebastian Spaeth2013-12-121-22/+4
| | | | | | | | | | | | | | | | | | Since the Gsoc the use of decorators has simplified this function. Reintroduce the same code as before Adidits blog branch made these changes.
* | | 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
| | | | | | | | | | | | | | | there is no user.is_admin anymore. Adapt to use the new privileges system.