Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | fixed css of the search bar | Evgeny Fadeev | 2013-03-23 | 5 | -611/+192 | |
| | | ||||||
* | | fixed a failing test | Evgeny Fadeev | 2013-03-23 | 1 | -1/+1 | |
| | | ||||||
* | | merged with the master branch | Evgeny Fadeev | 2013-03-23 | 44 | -274/+494 | |
|\ \ | ||||||
| * | | updated the contributors file | Evgeny Fadeev | 2013-03-22 | 1 | -0/+1 | |
| | | | ||||||
| * | | Merge pull request #118 from adobo/fixshareencoding | Evgeny Fadeev | 2013-03-22 | 1 | -1/+1 | |
| |\ \ | | | | | | | | | Fix encoding problems when sharing a question with special characters | |||||
| | * | | Fix encoding problems when sharing a question with special characters | Jorge López Pérez | 2013-03-22 | 1 | -1/+1 | |
| |/ / | | | | | | | | | | escape() doesn't work with UTF-8 characters | |||||
| * | | allowed to enable and disable scopes on the main page | Evgeny Fadeev | 2013-03-22 | 13 | -31/+161 | |
| | | | ||||||
| * | | Merge branch 'adolfo' into scopes | Evgeny Fadeev | 2013-03-21 | 4 | -13/+24 | |
| |\ \ | ||||||
| | * | | display error messages via exceptions on livesettings | Adolfo Fitoria | 2013-03-20 | 4 | -13/+24 | |
| | | | | ||||||
| * | | | added setting to turn on and off selected scopes of questions | Evgeny Fadeev | 2013-03-21 | 1 | -0/+71 | |
| |/ / | ||||||
| * | | commented out the unnecessary setting | Evgeny Fadeev | 2013-03-19 | 3 | -13/+2 | |
| | | | ||||||
| * | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-03-19 | 3 | -6/+11 | |
| |\ \ | ||||||
| | * | | styling changes in the tag selector, added exception handling for skin | Evgeny Fadeev | 2013-03-18 | 3 | -6/+11 | |
| | | | | ||||||
| * | | | Merge branch 'master' of git://github.com/ASKBOT/askbot-devel | Adolfo Fitoria | 2013-03-17 | 21 | -207/+250 | |
| |\| | | ||||||
| | * | | unified css of buttons | Evgeny Fadeev | 2013-03-17 | 20 | -199/+202 | |
| | | | | ||||||
| * | | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-03-14 | 4 | -5/+5 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-03-13 | 25 | -126/+148 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-03-11 | 18 | -108/+1674 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-03-07 | 17 | -94/+263 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-03-05 | 4 | -0/+4 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-03-01 | 3 | -1/+502 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | fixed typo en WYSIWYG editor | Adolfo Fitoria | 2013-02-26 | 1 | -2/+2 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-02-26 | 9 | -63/+6599 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-02-25 | 18 | -60/+95 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | fixed django-tinymce version | Adolfo Fitoria | 2013-02-14 | 4 | -5/+5 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | updated settings template and startup procedures to make tinymce work | Adolfo Fitoria | 2013-02-14 | 4 | -14/+15 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-02-14 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | fixed import-data url in urls.py | Adolfo Fitoria | 2013-02-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-02-13 | 9 | -50/+115 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-02-06 | 10 | -22/+1162 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: askbot/migrations/0161_add_field__user_languages.py | |||||
| * | | | | | | | | | | | | | | wrapping migration 0161 in try/except because of auth_user table modification" | Adolfo Fitoria | 2013-02-04 | 1 | -3/+6 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | fixed logging formating | Adolfo Fitoria | 2013-02-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-02-01 | 1 | -3/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-01-31 | 3 | -9/+16 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-01-29 | 10 | -31/+70 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-01-25 | 11 | -37/+57 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2013-01-21 | 21 | -99/+197 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | added ASKBOT_MULTILINGUAL to settings.py template, tests fails if this is ↵ | Adolfo Fitoria | 2013-01-15 | 2 | -0/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not present | |||||
* | | | | | | | | | | | | | | | | | | | | updated the changelog | Evgeny Fadeev | 2013-03-23 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | better compress support on the main and question pages | Evgeny Fadeev | 2013-03-23 | 13 | -129/+157 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | some additional work on the compressor branch | Evgeny Fadeev | 2013-03-23 | 5 | -19/+96 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Add django_compressor to compress CSS, JS and automatically compile LESS | Tyler Mandry | 2013-03-16 | 6 | -12/+34 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Add ability to use LESS development mode with extra.less | Tyler Mandry | 2013-03-16 | 2 | -4/+11 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | recompiled the style.css file | Evgeny Fadeev | 2013-03-14 | 1 | -8/+48 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | changed the .org link to .com in the footer | Evgeny Fadeev | 2013-03-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | a typo in the documentation | Evgeny Fadeev | 2013-03-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | some bugfixes | Evgeny Fadeev | 2013-03-11 | 2 | -3/+3 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge pull request #96 from siovene/box-overflow | Evgeny Fadeev | 2013-03-11 | 2 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds overflow:hidden to .box selector. | |||||
| * | | | | | | | | | | | | | | | | | Adds overflow:hidden to .box selector. | Salvatore Iovene | 2012-11-03 | 2 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without it, the .box would not be as tall as its content. While that works fine for Askbot's default skin (boxes are white on a white background), it will fail on skins in which boxes have a border or a different background color. There's no reason not to fix this in the default skin. | |||||
* | | | | | | | | | | | | | | | | | | Merge pull request #97 from siovene/conditional-sidebar-footer | Evgeny Fadeev | 2013-03-11 | 1 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents sidebar footer from showing, if it's not defined. |