Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | 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. | |||||
| | * | | | | | | | | | | | | | | | | | | Prevents sidebar footer from showing, if it's not defined. | Salvatore Iovene | 2012-11-03 | 1 | -3/+5 | |
| | |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #106 from emonty/master | Evgeny Fadeev | 2013-03-11 | 15 | -113/+101 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix things for MySQL InnoDB users | |||||
| | * | | | | | | | | | | | | | | | | | | Fix fake migration errors so we can find the real ones. | Monty Taylor | 2012-12-24 | 13 | -105/+83 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | Make column changes actually work with InnoDB | Monty Taylor | 2012-12-24 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | Add MySQL support for safe_add_column. | Monty Taylor | 2012-12-24 | 1 | -8/+13 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | Merge pull request #114 from tmandry/master | Evgeny Fadeev | 2013-03-11 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Fix bug causing askbot-setup script to never accept a sqlite filename | |||||
| | * | | | | | | | | | | | | | | | | | | Fix bug causing askbot-setup script to never accept a sqlite filename. | Tyler Mandry | 2013-03-10 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | patched min search word length for japanese | Evgeny Fadeev | 2013-03-25 | 3 | -3/+13 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | added a hack for short japanese queries | Evgeny Fadeev | 2013-03-24 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | merged with the master branch | Evgeny Fadeev | 2013-03-11 | 14 | -12/+1547 | |
|\| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | updated the changelog file | Evgeny Fadeev | 2013-03-11 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | allowed to created tags upon subscribing to them | Evgeny Fadeev | 2013-03-11 | 4 | -9/+32 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | disabled launchpad login by default | Evgeny Fadeev | 2013-03-11 | 1 | -1/+5 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | fixed some issues in postgres full text search and transferred "deleted" ↵ | Evgeny Fadeev | 2013-03-10 | 6 | -2/+1500 | |
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info onto the thread objects | |||||
| * | | | | | | | | | | | | | | | | | added launchpad login as option | Evgeny Fadeev | 2013-03-09 | 4 | -0/+9 | |
| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | added minor edit function to the comment edits | Evgeny Fadeev | 2013-03-09 | 7 | -9/+48 | |
| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | merged with the master branch | Evgeny Fadeev | 2013-03-08 | 10 | -110/+156 | |
|\| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | minor edit option for question and answer to suppress email alerts | Evgeny Fadeev | 2013-03-08 | 8 | -91/+145 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | corrected check for anonymous user in the visit question task | Evgeny Fadeev | 2013-03-08 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | fixed an exception with bad data on comment delete | Evgeny Fadeev | 2013-03-07 | 2 | -2/+14 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | fixed a bug where an invalid query parameter triggers exception on the ↵ | Evgeny Fadeev | 2013-03-07 | 2 | -10/+2 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | question page | |||||
| * | | | | | | | | | | | | | | | | fixed a pluralization bug in the timedelta display | Evgeny Fadeev | 2013-03-06 | 1 | -4/+6 | |
| | | | | | | | | | | | | | | | | |