Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'adolfo' into user-groups | Evgeny Fadeev | 2012-09-13 | 3 | -1/+10 |
|\ | |||||
| * | fixed bug when converting comments caused by db constraint, fixed styling errors | Adolfo Fitoria | 2012-09-13 | 3 | -1/+10 |
| | | |||||
* | | hopefully fixed the answer publishing problem where asker and answerer share ↵ | Evgeny Fadeev | 2012-09-13 | 3 | -6/+32 |
| | | | | | | | | custom groups | ||||
* | | 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 | 12 | -36/+107 |
| | | | |||||
* | | | merged Adolfo's branch | Evgeny Fadeev | 2012-09-12 | 4 | -6/+113 |
|\ \ \ | | |/ | |/| | |||||
| * | | fixed convert to comment link hiding | Adolfo Fitoria | 2012-09-11 | 1 | -1/+1 |
| | | | |||||
| * | | added test cases for convert to comment/answer | Adolfo Fitoria | 2012-09-11 | 2 | -4/+96 |
| | | | |||||
| * | | 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 | 8 | -8/+102 |
| |/ |/| | |||||
* | | moderated response sharing model seems to work internally | Evgeny Fadeev | 2012-09-12 | 4 | -8/+90 |
| | | |||||
* | | added toggle to the group profile page allowing to publish only selected ↵ | Evgeny Fadeev | 2012-09-11 | 3 | -1/+21 |
| | | | | | | | | answers to outsiders | ||||
* | | added model field for the moderated publishing of answers | Evgeny Fadeev | 2012-09-11 | 4 | -5/+798 |
| | | |||||
* | | Merge branch 'adolfo-master' into user-groups | Evgeny Fadeev | 2012-09-11 | 10 | -16/+139 |
|\| | |||||
| * | Convert answer to comment. | Adolfo Fitoria | 2012-09-10 | 10 | -16/+139 |
| | | |||||
* | | added several test cases for groups-related functions | Evgeny Fadeev | 2012-09-11 | 5 | -17/+87 |
| | | |||||
* | | merged Adolfo's branch | Evgeny Fadeev | 2012-09-09 | 7 | -52/+460 |
|\ \ | |||||
| * | | fixed bug in widget creation | Adolfo Fitoria | 2012-09-07 | 2 | -2/+22 |
| | | | |||||
| * | | fixed css for error display, fixed upload from widgets, added groups support ↵ | Adolfo Fitoria | 2012-09-06 | 6 | -50/+417 |
| | | | | | | | | | | | | again for widgets | ||||
| * | | fixed edit widget view" | Adolfo Fitoria | 2012-09-06 | 1 | -2/+2 |
| | | | |||||
* | | | 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 |
| | | | |||||
* | | | added beautifusoup4 library to the list of requirements | Evgeny Fadeev | 2012-09-09 | 2 | -0/+2 |
| | | | |||||
* | | | tinymce editor works in the popups too | Evgeny Fadeev | 2012-09-09 | 13 | -57/+176 |
| |/ |/| | |||||
* | | Merge branch 'adolfo' into user-groups | Evgeny Fadeev | 2012-09-06 | 2 | -7/+3 |
|\ \ | |||||
| * | | hopefully fixed the jump issue in some browsers | Adolfo Fitoria | 2012-09-04 | 2 | -7/+3 |
| | | | |||||
* | | | merged with adolfos master branch | Evgeny Fadeev | 2012-09-06 | 23 | -46/+230 |
|\ \ \ | | |/ | |/| | |||||
| * | | hidding convert links, fixed style | Adolfo Fitoria | 2012-09-05 | 5 | -9/+29 |
| | | | |||||
| * | | added convertlink to the utils.js and post.js | Adolfo Fitoria | 2012-09-04 | 4 | -1/+48 |
| | | | |||||
| * | | comment 2 answer convertion start | Adolfo Fitoria | 2012-09-04 | 5 | -51/+169 |
| | | | |||||
| * | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-09-04 | 20 | -40/+124 |
| |\ \ | |||||
| | * | | added items per transaction on the clean_session management command | Evgeny Fadeev | 2012-09-01 | 1 | -0/+9 |
| | | | | |||||
| | * | | simplified the clean_session command | Evgeny Fadeev | 2012-09-01 | 1 | -30/+17 |
| | | | | |||||
| | * | | added null=True to text fields in the first migration | Evgeny Fadeev | 2012-08-25 | 1 | -5/+5 |
| | | | | |||||
| | * | | fix for usage of web fonts in IE8 | Evgeny Fadeev | 2012-08-25 | 1 | -1/+2 |
| | | | | |||||
| | * | | Merge branch 'tmp' | Evgeny Fadeev | 2012-08-25 | 0 | -0/+0 |
| | |\ \ | |||||
| | | * | | allowed user names > 30 chars | Evgeny Fadeev | 2012-08-23 | 8 | -2/+29 |
| | | | | | |||||
| | * | | | added js patch for the noscript tag to hide red margin on IE and disabled ↵ | Evgeny Fadeev | 2012-08-25 | 10 | -3/+44 |
| | |/ / | | | | | | | | | | | | | Lamson on Windows | ||||
| | * | | applied the blockquote bug in Chrome as suggested by dajafa | Evgeny Fadeev | 2012-08-23 | 3 | -0/+48 |
| | | | | |||||
* | | | | group join moderation works | Evgeny Fadeev | 2012-09-06 | 19 | -261/+286 |
| | | | | |||||
* | | | | a part of "ask to join group" moderation | Evgeny Fadeev | 2012-09-05 | 11 | -18/+245 |
| | | | | |||||
* | | | | 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 | 7 | -41/+68 |
| |\ \ \ | |||||
| * | | | | fixes tinymce upload file/image issue | Adolfo Fitoria | 2012-09-03 | 1 | -1/+9 |
| | | | | | |||||
| * | | | | fixed display of form validation errors | Adolfo Fitoria | 2012-09-03 | 2 | -5/+22 |
| | | | | | |||||
* | | | | | users now can ask to join group, but there is no approval process yet | Evgeny Fadeev | 2012-09-04 | 5 | -28/+89 |
| | | | | | |||||
* | | | | | populated askbot group membership field | Evgeny Fadeev | 2012-09-03 | 1 | -0/+378 |
| | | | | | |||||
* | | | | | added the GroupMembership model | Evgeny Fadeev | 2012-09-03 | 4 | -2/+392 |
| | | | | |