Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | initial work for better bulk moderation tool | Evgeny Fadeev | 2014-06-30 | 11 | -194/+702 |
| | |||||
* | Merge pull request #269 from daftu/issue-268-fix | Evgeny Fadeev | 2014-06-28 | 2 | -2/+2 |
|\ | | | | | #268 Added translation support for "Save" button in site and group settings | ||||
| * | Added translation support for "Save" button in site settings and group ↵ | root | 2014-06-28 | 2 | -2/+2 |
|/ | | | | settings (issue #268) | ||||
* | Merge pull request #266 from mgeisler/patch-1 | Evgeny Fadeev | 2014-06-25 | 1 | -1/+1 |
|\ | | | | | Add missing word | ||||
| * | Add missing word | Martin Geisler | 2014-06-25 | 1 | -1/+1 |
|/ | |||||
* | allow bulk deletion of content by user upon blocking | Evgeny Fadeev | 2014-06-20 | 7 | -5/+75 |
| | |||||
* | updated the contributors file | Evgeny Fadeev | 2014-06-15 | 1 | -0/+1 |
| | |||||
* | a minor fix in the settings templates | Evgeny Fadeev | 2014-06-15 | 2 | -4/+0 |
| | |||||
* | Merge pull request #156 from dmzio/corrsettings | Evgeny Fadeev | 2014-06-15 | 2 | -4/+8 |
|\ | | | | | fixes #155 | ||||
| * | fixes #155 | zio | 2013-08-19 | 2 | -4/+8 |
| | | |||||
* | | Merge pull request #160 from powlo/fix_delete_unused_tags | Evgeny Fadeev | 2014-06-15 | 2 | -2/+18 |
|\ \ | | | | | | | Remove manual transactions when deleting tags. | ||||
| * | | Remove manual transactions when deleting tags. | Paul Backhouse | 2013-08-23 | 2 | -2/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handling the transactions manually creates the possiblity of unclosed transactions as reported here: http://askbot.org/en/question/11230/errors-while-trying-to-rename-or-delete-unused-tags/ However, there's no need to do this manual handling; the simplest solution is to just remove the decorator. Also added tests. | ||||
* | | | changed single quotes to double in js trans strings | Evgeny Fadeev | 2014-06-15 | 1 | -4/+4 |
| | | | |||||
* | | | Merge pull request #181 from harobed/addadmin-noinput-option | Evgeny Fadeev | 2014-06-15 | 1 | -1/+11 |
|\ \ \ | | | | | | | | | Append help msg + noinput option to add_admin management command | ||||
| * | | | Append help msg + noinput option to add_admin management command | Stéphane Klein | 2013-10-12 | 1 | -1/+11 |
| | | | | |||||
* | | | | removed unused import | Evgeny Fadeev | 2014-06-15 | 1 | -2/+1 |
| | | | | |||||
* | | | | Merge pull request #215 from keto/fix-prefork-mode | Evgeny Fadeev | 2014-06-15 | 1 | -0/+4 |
|\ \ \ \ | | | | | | | | | | | Fix prefork mode | ||||
| * | | | | Close cache after startup procedures | Pami Ketolainen | 2014-03-17 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Same as with DB connection, the cache connection gets shared between child processes in prefork mode if it isn't closed after startup procedures | ||||
| * | | | | Fix database connection issues in prefork mode. | Pami Ketolainen | 2014-03-17 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running in prefork mode, open DB connection got shared between the child process as DB was accessed very early in the init process. One child would then close the connection and cause others to fail. To fix this, connection.close() was added to the end of startup procedures. | ||||
* | | | | | merged keto's work on better handler500 | Evgeny Fadeev | 2014-06-15 | 3 | -4/+24 |
|\ \ \ \ \ | |||||
| * | | | | | Fix 500 template processing error | Pami Ketolainen | 2014-03-18 | 3 | -2/+12 |
| |/ / / / | |||||
* | | | | | added validation to custom logo destination url | Evgeny Fadeev | 2014-06-15 | 4 | -4/+26 |
| | | | | | |||||
* | | | | | Merge pull request #238 from hackingspirit/custom_logo_url_destination | Evgeny Fadeev | 2014-06-15 | 4 | -3/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | Allow customization of the destional URL for the logo image | ||||
| * | | | | | Allow customization of the destional URL for the logo image | Zhenlei Cai | 2014-05-03 | 4 | -3/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | Chinese locale message for since you are not logged in right now ... | ||||
* | | | | | | Added option to allow asking without registration | Evgeny Fadeev | 2014-06-14 | 9 | -19/+46 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Added support for directly posting as anonymous with recaptcha | Egil Moeller | 2014-02-14 | 4 | -10/+35 |
| | | | | | | | |||||
* | | | | | | | added Andrew Chen to the contribs list | Evgeny Fadeev | 2014-06-14 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #206 from yongjhih/fb | Evgeny Fadeev | 2014-06-14 | 1 | -2/+3 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Oauth2: Facebook: Fix email not found | ||||
| * | | | | | | | Oauth2: Facebook: Fix email not found | Andrew Chen | 2014-02-06 | 1 | -2/+3 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #250 from BenjaminABEL/master | Evgeny Fadeev | 2014-06-14 | 11 | -32/+32 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Updated requirements of django-celery to >=3.0.11 | ||||
| * | | | | | | | | Fix deprecation warning in HttpResponse | Benjamin ABEL | 2014-06-13 | 8 | -29/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace `mimetype` by `content_type` in `HttpResponse` attributes. see: <https://docs.djangoproject.com/en/1.4/ref/request-response/#id5> | ||||
| * | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Benjamin ABEL | 2014-06-13 | 46 | -193/+261 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | small changes in the group messaging js | Evgeny Fadeev | 2014-06-13 | 1 | -2/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | put email footer two paragraphs into one | Evgeny Fadeev | 2014-06-11 | 1 | -2/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | hopefully fixed issue with the deletion of the login method under https | Evgeny Fadeev | 2014-06-10 | 2 | -2/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | fixes broken subscribed tags editor on the user profile subscriptions tab ↵ | Evgeny Fadeev | 2014-06-04 | 15 | -83/+95 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and removes unused class from buttons | ||||
* | | | | | | | | | removed unnecessary class from signup button | Evgeny Fadeev | 2014-06-04 | 1 | -1/+0 |
| | | | | | | | | | |||||
* | | | | | | | | | added remote ip fixer middleware | Evgeny Fadeev | 2014-06-02 | 1 | -0/+21 |
| | | | | | | | | | |||||
* | | | | | | | | | fixed captcha issue when posting question | Evgeny Fadeev | 2014-05-29 | 1 | -2/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | added recaptcha remote ip decorators to the recaptcha protected views | Evgeny Fadeev | 2014-05-29 | 2 | -0/+6 |
| | | | | | | | | | |||||
* | | | | | | | | | removed/disabled checking of avatar type synchronously as there were ↵ | Evgeny Fadeev | 2014-05-29 | 7 | -46/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeouts contacting gravatar server | ||||
* | | | | | | | | | recaptcha seems to work | Evgeny Fadeev | 2014-05-28 | 8 | -13/+16 |
| | | | | | | | | | |||||
* | | | | | | | | | added recaptcha on posts + first pass on watched user status | Evgeny Fadeev | 2014-05-28 | 19 | -58/+100 |
| | | | | | | | | | |||||
* | | | | | | | | | added recaptcha to the openid registration form | Evgeny Fadeev | 2014-05-27 | 2 | -1/+24 |
| | | | | | | | | | |||||
| * | | | | | | | | Updated requirements of django-celery to >=3.0.11 | Benjamin ABEL | 2014-05-15 | 3 | -3/+3 |
|/ / / / / / / / | |||||
* | | | | | | | | allowed use of custom csrf cookie name in js | Evgeny Fadeev | 2014-05-15 | 2 | -13/+17 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #217 from keto/protect-convert-views | Evgeny Fadeev | 2014-05-14 | 6 | -6/+59 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | CSRF protection and user checks for answer and comment converting views | ||||
| * | | | | | | | | Add CSRF token in comments loaded via Javascript | Pami Ketolainen | 2014-03-26 | 1 | -0/+19 |
| | | | | | | | | | |||||
| * | | | | | | | | Require loggedin user on answer/comment convert | Pami Ketolainen | 2014-03-18 | 1 | -0/+10 |
| | | | | | | | | | |||||
| * | | | | | | | | Check that user can convert comments or answers | Pami Ketolainen | 2014-03-18 | 2 | -2/+22 |
| | | | | | | | | |