Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton | jpope777 | 2014-01-11 | 1 | -0/+28 |
|\ | |||||
| * | another airy update | jpope | 2014-01-10 | 1 | -0/+5 |
| | | |||||
| * | minor updates for airy | jpope | 2014-01-10 | 1 | -0/+23 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton | jpope777 | 2014-01-08 | 5 | -17/+18 |
|\| | |||||
| * | move "wide" view to seperate branch | jpope | 2014-01-08 | 2 | -10/+11 |
| | | |||||
| * | rename couple of css classes | jpope | 2014-01-07 | 5 | -7/+7 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton | jpope777 | 2014-01-07 | 6 | -9/+14 |
|\| | |||||
| * | adjust thumbnails | jpope | 2014-01-07 | 1 | -0/+3 |
| | | |||||
| * | center media within media container | jpope | 2014-01-07 | 1 | -4/+6 |
| | | |||||
| * | add warning color to delete buttons. | jpope | 2014-01-07 | 4 | -4/+4 |
| | | |||||
| * | style cancel "button" on attachments page | jpope | 2014-01-07 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton | jpope777 | 2014-01-07 | 7 | -40/+113 |
|\| | |||||
| * | add a little button color and new media page layout | jpope | 2014-01-07 | 3 | -11/+66 |
| | | |||||
| * | skeletonize frontpage welcome | jpope | 2014-01-07 | 2 | -22/+40 |
| | | |||||
| * | adjust 404 page | jpope | 2014-01-07 | 1 | -1/+1 |
| | | |||||
| * | adjust banned page | jpope | 2014-01-07 | 1 | -1/+1 |
| | | |||||
| * | realign columns on mod user page | jpope | 2014-01-07 | 1 | -5/+5 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton | jpope777 | 2014-01-07 | 3 | -26/+27 |
|\| | |||||
| * | debone and redo the header | jpope | 2014-01-07 | 2 | -22/+21 |
| | | |||||
| * | adjust mod report page | jpope | 2014-01-06 | 2 | -4/+6 |
| | | |||||
* | | 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 |
| | | |