| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton | jpope777 | 2014-01-06 | 3 | -19/+15 |
| |\ | |||||
| | * | move js back to the head | jpope | 2014-01-06 | 1 | -9/+9 |
| | | | |||||
| | * | small adjustments to user mod page again | jpope | 2014-01-06 | 2 | -10/+6 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton | jpope777 | 2014-01-06 | 2 | -109/+132 |
| |\| | |||||
| | * | realign the user admin page | jpope | 2014-01-06 | 2 | -109/+132 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton | jpope777 | 2014-01-06 | 4 | -73/+74 |
| |\| | |||||
| | * | migrate media page to skeleton | jpope | 2014-01-06 | 2 | -76/+37 |
| | | | |||||
| | * | more skeleton migrations | jpope | 2014-01-06 | 3 | -12/+52 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton | jpope | 2014-01-05 | 2 | -105/+98 |
| |\| | | | | | | | | | | | Conflicts: .gitmodules mediagoblin/static/css/base.css | ||||
| | * | start moving more to skeleton | jpope | 2014-01-05 | 2 | -105/+98 |
| | | | |||||
| | * | undo that "update" | jpope | 2014-01-05 | 1 | -1/+1 |
| | | | |||||
| | * | updated | jpope | 2014-01-05 | 1 | -1/+1 |
| | | | |||||
| | * | Merge remote-tracking branch 'upstream/master' into skeletongobblin | jpope | 2014-01-05 | 9 | -6/+46 |
| | |\ | |||||
| | * | | fix misplaced body tag when I moved the javascript to bottom of page | jpope | 2014-01-01 | 1 | -1/+1 |
| | | | | |||||
| | * | | incorporate skeleton layout in the galleries | jpope777 | 2014-01-01 | 6 | -32/+62 |
| | | | | |||||
| | * | | update base.html | jpope777 | 2013-12-31 | 1 | -0/+6 |
| | | | | |||||
| | * | | add symlinks to skeleton | jpope777 | 2013-12-31 | 4 | -0/+4 |
| | | | | |||||
| | * | | add skeleton submodule | jpope777 | 2013-12-31 | 2 | -0/+3 |
| | | | | |||||
| * | | | initial skeleton push | jpope777 | 2014-01-05 | 8 | -25/+67 |
| | |/ |/| | |||||
| * | | Not only the web server starts MediaGoblin app! Better phrasing. | Christopher Allan Webber | 2014-01-02 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'refs/remotes/rodney757/dbupdate' | Christopher Allan Webber | 2014-01-02 | 3 | -1/+22 |
| |\ \ | | | | | | | | | | | | | | | | Conflicts: mediagoblin/db/util.py mediagoblin/gmg_commands/dbupdate.py | ||||
| | * | | don't set logging level to debug | Rodney Ewing | 2013-09-02 | 1 | -2/+0 |
| | | | | |||||
| | * | | check if db is up to date | Rodney Ewing | 2013-09-02 | 2 | -1/+20 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'remotes/jiyda/220_rtl_language_support' | Christopher Allan Webber | 2014-01-02 | 3 | -4/+17 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/templates/mediagoblin/base.html mediagoblin/tools/template.py | ||||
| | * | | | Added rtl language support | Jiyda Mint Moussa | 2013-04-29 | 3 | -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 Webber | 2014-01-02 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | | This patch by Sergio Durigan Junior. Thank you, Sergio! | ||||
| * | | | | sqlalchemy-migrate 0.8.X doesn't get along with sqlalchemy 0.9.0 | Christopher Allan Webber | 2014-01-01 | 1 | -1/+1 |
| | |_|/ |/| | | |||||
| * | | | media_types/sniff_media: reset file back to 0 offset for actual copy. ↵ | Alon Levy | 2013-12-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | Required when not using celery | ||||
| * | | | pdf/processing: fix non pdf regression, copy correct file | Alon Levy | 2013-12-26 | 1 | -2/+4 |
| | | | | |||||
| * | | | pdf/processing: avoid possible dead goblin if pdfinfo failed | Alon Levy | 2013-12-26 | 1 | -0/+5 |
| | | | | |||||
| * | | | Rename a few files and minor cleanup | Sebastian Spaeth | 2013-12-12 | 5 | -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 bar | Sebastian Spaeth | 2013-12-12 | 3 | -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 media | Sebastian Spaeth | 2013-12-12 | 1 | -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 Spaeth | 2013-12-12 | 2 | -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 disabled | Sebastian Spaeth | 2013-12-12 | 2 | -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_delete | Sebastian Spaeth | 2013-12-12 | 1 | -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 value | Sebastian Spaeth | 2013-12-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Convert blog plugin to use new privileges system | Sebastian Spaeth | 2013-12-12 | 4 | -6/+6 |
| | | | | | | | | | | | | | | | | there is no user.is_admin anymore. Adapt to use the new privileges system. | ||||
| * | | | Revert "Replace hardcoded URL by variable for the same." | Sebastian Spaeth | 2013-12-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | This reverts commit e0e02e98bcd4664b1c0a57e422ea4c0e5b6ba059. There is absolutely no need for this. | ||||
| * | | | Finalize merging of the blog branch by Aditi (Gsoc 2013) | Sebastian Spaeth | 2013-12-12 | 2 | -3/+2 |
| | | | | | | | | | | | | | | | | Comment out the blog plugin by default. Remove the blog README.md in the root directory. | ||||
| * | | | Merge branch 'master' into upstream-master | Sebastian Spaeth | 2013-12-12 | 118 | -5/+4314 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: mediagoblin/templates/mediagoblin/base.html mediagoblin/templates/mediagoblin/user_pages/user.html | ||||
| | * | | | Write docstringg for view functions. | Aditi Mittal | 2013-09-24 | 1 | -9/+25 |
| | | | | | |||||
| | * | | | some fixes | Aditi Mittal | 2013-09-21 | 6 | -13/+18 |
| | | | | | |||||
| | * | | | Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin | Aditi Mittal | 2013-09-18 | 34 | -229/+7817 |
| | |\ \ \ | |||||
| | * | | | | Write template to render blog about page. | Aditi Mittal | 2013-09-18 | 1 | -0/+38 |
| | | | | | | |||||
| | * | | | | Change the text of url to blogs on user profile page. | Aditi Mittal | 2013-09-18 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | Url mapping for blog about page. | Aditi Mittal | 2013-09-18 | 1 | -1/+9 |
| | | | | | | |||||
| | * | | | | Add view button and create blog button on blogs dashboard. | Aditi Mittal | 2013-09-18 | 1 | -19/+28 |
| | | | | | | |||||
| | * | | | | Add url to blog post listing page on blog dashboard of a blog. | Aditi Mittal | 2013-09-18 | 1 | -0/+5 |
| | | | | | | |||||
| | * | | | | Write view for blog about page. | Aditi Mittal | 2013-09-18 | 1 | -2/+29 |
| | | | | | | |||||
 |
index : mediagoblin.git | |
| MediaGoblin is a free software media publishing platform that anyone can run, with Plyr player for default, search and without nodejs | heckyel |
| aboutsummaryrefslogtreecommitdiffstats |