Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merged with the master branch | Evgeny Fadeev | 2013-03-23 | 1 | -1/+7 |
|\ | |||||
| * | styling changes in the tag selector, added exception handling for skin | Evgeny Fadeev | 2013-03-18 | 1 | -1/+7 |
| | | |||||
* | | some additional work on the compressor branch | Evgeny Fadeev | 2013-03-23 | 1 | -3/+8 |
| | | |||||
* | | Add django_compressor to compress CSS, JS and automatically compile LESS | Tyler Mandry | 2013-03-16 | 1 | -3/+3 |
| | | |||||
* | | Add ability to use LESS development mode with extra.less | Tyler Mandry | 2013-03-16 | 1 | -2/+8 |
|/ | |||||
* | merged with the master branch | Evgeny Fadeev | 2012-12-05 | 1 | -7/+7 |
|\ | |||||
| * | compiled less and fixed a bug in the skins | Evgeny Fadeev | 2012-11-28 | 1 | -7/+7 |
| | | |||||
* | | removed debugging code | Evgeny Fadeev | 2012-11-28 | 1 | -3/+0 |
| | | |||||
* | | added full text title search for mysql | Evgeny Fadeev | 2012-11-27 | 1 | -1/+4 |
|/ | |||||
* | added django-style template loader class and replaced render_into_skin with ↵ | Evgeny Fadeev | 2012-11-17 | 1 | -37/+17 |
| | | | | render | ||||
* | Fixed issue with feed, changed settings.py template, fixed issue with | Adolfo Fitoria | 2012-10-10 | 1 | -1/+3 |
| | | | | | | | | skin loader, fixed urls.py for feeds fixed bug in messages hack with django 1.4.1 all test pass in 1.3.1, haystack and email parsing tests fails on 1.4.1 | ||||
* | combined all dev branches for kp | Evgeny Fadeev | 2012-09-20 | 937 | -99452/+31 |
| | |||||
* | fixed bug in one template, TOOD: fix ↵ | Adolfo Fitoria | 2012-09-19 | 1 | -0/+1 |
| | | | | test_moderated_question_answerable_approval_notification | ||||
* | added templates for hardcoded emails | Adolfo Fitoria | 2012-09-18 | 4 | -1/+51 |
| | |||||
* | initial work for email templates | Adolfo Fitoria | 2012-09-18 | 8 | -17/+73 |
| | |||||
* | Merge branch 'master' into email_templates | Adolfo Fitoria | 2012-09-15 | 355 | -1100/+51104 |
|\ | | | | | | | | | Conflicts: askbot/tests/__init__.py | ||||
| * | merged with the tag-editor branch | Evgeny Fadeev | 2012-09-15 | 4 | -30/+56 |
| |\ | |||||
| | * | added a temporary case sensitive tag search notice | Evgeny Fadeev | 2012-09-10 | 1 | -1/+1 |
| | | | |||||
| | * | added label to the tag search input | Evgeny Fadeev | 2012-09-06 | 1 | -0/+1 |
| | | | |||||
| | * | expanded default help page | Evgeny Fadeev | 2012-09-06 | 1 | -2/+26 |
| | | | |||||
| | * | attempt to fix posting comments in IE | Evgeny Fadeev | 2012-08-29 | 2 | -20/+21 |
| | | | |||||
| | * | removed red margin on top in IE | Evgeny Fadeev | 2012-08-25 | 1 | -3/+9 |
| | | | |||||
| * | | group description editing works again | Evgeny Fadeev | 2012-09-14 | 4 | -11/+22 |
| | | | |||||
| * | | Merge branch 'adolfo' into user-groups | Evgeny Fadeev | 2012-09-13 | 2 | -0/+4 |
| |\ \ | |||||
| | * | | fixed bug when converting comments caused by db constraint, fixed styling errors | Adolfo Fitoria | 2012-09-13 | 2 | -0/+4 |
| | | | | |||||
| * | | | Merge branch 'adolfo' into user-groups | Evgeny Fadeev | 2012-09-13 | 2 | -3/+4 |
| |\ \ \ | |||||
| | * | | | solved issue with widget validation output and css | Adolfo Fitoria | 2012-09-12 | 2 | -3/+4 |
| | | | | | |||||
| * | | | | answer publishing seems to work fully | Evgeny Fadeev | 2012-09-13 | 7 | -28/+63 |
| | | | | | |||||
| * | | | | merged Adolfo's branch | Evgeny Fadeev | 2012-09-12 | 2 | -2/+2 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | fixed convert to comment link hiding | Adolfo Fitoria | 2012-09-11 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Fixed hiding comment convert links | Adolfo Fitoria | 2012-09-11 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | added simple UI for publishing selected answers | Evgeny Fadeev | 2012-09-12 | 2 | -2/+27 |
| | |/ / | |/| | | |||||
| * | | | added toggle to the group profile page allowing to publish only selected ↵ | Evgeny Fadeev | 2012-09-11 | 2 | -0/+20 |
| | | | | | | | | | | | | | | | | answers to outsiders | ||||
| * | | | Merge branch 'adolfo-master' into user-groups | Evgeny Fadeev | 2012-09-11 | 8 | -15/+104 |
| |\| | | |||||
| | * | | Convert answer to comment. | Adolfo Fitoria | 2012-09-10 | 8 | -15/+104 |
| | | | | |||||
| * | | | added several test cases for groups-related functions | Evgeny Fadeev | 2012-09-11 | 1 | -1/+0 |
| | | | | |||||
| * | | | merged Adolfo's branch | Evgeny Fadeev | 2012-09-09 | 3 | -18/+33 |
| |\ \ \ | |||||
| | * | | | fixed css for error display, fixed upload from widgets, added groups support ↵ | Adolfo Fitoria | 2012-09-06 | 2 | -19/+13 |
| | | | | | | | | | | | | | | | | | | | | again for widgets | ||||
| * | | | | merged fix for hiding the convert comment to answer links | Evgeny Fadeev | 2012-09-09 | 2 | -1/+1 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | fixed the hide functions in javascript | Adolfo Fitoria | 2012-09-06 | 2 | -1/+1 |
| | | | | | |||||
| * | | | | tinymce editor works in the popups too | Evgeny Fadeev | 2012-09-09 | 10 | -56/+125 |
| | |/ / | |/| | | |||||
| * | | | Merge branch 'adolfo' into user-groups | Evgeny Fadeev | 2012-09-06 | 1 | -4/+3 |
| |\ \ \ | |||||
| | * | | | hopefully fixed the jump issue in some browsers | Adolfo Fitoria | 2012-09-04 | 1 | -4/+3 |
| | | | | | |||||
| * | | | | merged with adolfos master branch | Evgeny Fadeev | 2012-09-06 | 10 | -3/+126 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | group join moderation works | Evgeny Fadeev | 2012-09-06 | 8 | -229/+158 |
| | | | | | |||||
| * | | | | a part of "ask to join group" moderation | Evgeny Fadeev | 2012-09-05 | 2 | -0/+115 |
| | | | | | |||||
| * | | | | Merge branch 'adolfo' into user-groups | Evgeny Fadeev | 2012-09-04 | 2 | -10/+31 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | fixed css issue with bootstrap | Adolfo Fitoria | 2012-09-03 | 1 | -5/+1 |
| | | | | | |||||
| | * | | | Merge branch 'user-groups' of github.com:ASKBOT/askbot-devel into user-groups | Adolfo Fitoria | 2012-09-03 | 3 | -14/+34 |
| | |\ \ \ | |||||
| | * | | | | fixes tinymce upload file/image issue | Adolfo Fitoria | 2012-09-03 | 1 | -1/+9 |
| | | | | | |