summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added: UserAssociation for LDAPHEADmasterNico von Geyso2013-06-021-0/+8
|
* Added: Migrator for OSQANico von Geyso2013-06-021-0/+245
|
* Merge pull request #137 from bobbydavid/quietEvgeny Fadeev2013-05-291-6/+9
|\ | | | | refactor cache test to not print on success
| * refactor cache test to not print on successRobert Martin2013-05-291-6/+9
| |
* | Merge pull request #136 from bobbydavid/quietEvgeny Fadeev2013-05-291-6/+1
|\| | | | | make email clean test quieter
| * make email clean test quieterRobert Martin2013-05-291-6/+1
|/ | | | | | Email clean test was printing two strings from the test, even if they match, which was unnecessary. Fixed so it only prints if they are different; the default behavior for assertEqual().
* fixed the folded editor option on the ask page and allowed to go to a ↵Evgeny Fadeev2013-05-292-3/+40
| | | | specific question by hitting enter when selection in the dropdown is made
* added meta referrer to the head of base.htmlEvgeny Fadeev2013-05-281-0/+1
|
* added management command apply_hinted_tagsEvgeny Fadeev2013-05-284-0/+122
|
* adjusted test cases to fit the change on following the questionEvgeny Fadeev2013-05-271-0/+26
|
* merged the "subscribe" checkbox with "follow" button functionallyEvgeny Fadeev2013-05-275-13/+36
|
* simplified navigation of questions from the user profile pageEvgeny Fadeev2013-05-271-1/+1
|
* fixed hovercard cssEvgeny Fadeev2013-05-262-8/+16
|
* fixed a phraseEvgeny Fadeev2013-05-261-1/+1
|
* added a hovercard to the user karma display shown in the page headerEvgeny Fadeev2013-05-2613-15/+318
|
* fixed some issues in the groups menu jsEvgeny Fadeev2013-05-251-27/+69
|
* fixed some general js coding issues in the Groups dropdown codeEvgeny Fadeev2013-05-252-80/+63
|
* small change in the group dropdown cssEvgeny Fadeev2013-05-252-34/+21
|
* Merge pull request #133 from bobbydavid/slugEvgeny Fadeev2013-05-241-2/+5
|\ | | | | tweak slugify code to avoid double-unidecode
| * tweak slugify code to avoid double-unidecodeRobert Martin2013-05-241-2/+5
| | | | | | | | | | | | | | | | Previously, slugify would run a unidecode() on the input_text if unicode slugs were disallowed. This caused a warning if the input_text was already de-unicode. This splits the logic into two steps: first demote input_text if unicode is disallowed; then, choose the appropriate slugify function based on the result.
* | Merge pull request #132 from bobbydavid/globaltestEvgeny Fadeev2013-05-241-2/+5
|\ \ | | | | | | prevent db_api test from clobbering global name
| * | prevent db_api test from clobbering global nameRobert Martin2013-05-241-2/+5
| | | | | | | | | | | | | | | | | | | | | One of the tests checks that we can rename the GLOBAL_GROUP_NAME, but never reverts it to its original value. This causes future tests to fail even though they shouldn't. This fix reverts GLOBAL_GROUP_NAME after testing it can be changed.
* | | Merge pull request #129 from bobbydavid/nomigrateEvgeny Fadeev2013-05-242-6/+16
|\ \ \ | | | | | | | | Fix most of the tests when run in MySQL
| * | | set test charset & collation to utf-8Robert Martin2013-05-221-0/+2
| | | | | | | | | | | | | | | | | | | | Without these settings, MySQL chooses the wrong charset and collation, which causes some utf-8 tests to fail.
| * | | prevent south migrate during testsRobert Martin2013-05-222-6/+14
| | |/ | |/| | | | | | | | | | | | | Many tests would fail when run in MySQL because the test database was not being set up correctly. With this setting, the MySQL database constructs itself correctly.
* | | Merge branch 'github'Evgeny Fadeev2013-05-241-3/+2
|\ \ \
| * \ \ Merge pull request #131 from bobbydavid/mysqlEvgeny Fadeev2013-05-231-3/+2
| |\ \ \ | | | |/ | | |/| remove key restriction in test.
| | * | remove key restriction in test.Robert Martin2013-05-231-3/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | At this point in the test, there should only be one `Thread` object. However, because of previous tests, MySQL does not necessarily give that object id=1. By not specifying the id, the test does the intended thing. The get() function will fail if more than one object matches, so the test will still barf if more than one Thread object exists.
* | / added option to hide ad blocks from logged in usersEvgeny Fadeev2013-05-2410-27/+83
|/ /
* | added Robert Martin to the list of contributorsEvgeny Fadeev2013-05-231-0/+1
| |
* | small css changesEvgeny Fadeev2013-05-232-64/+8
| |
* | Merge pull request #130 from bobbydavid/privatekeyEvgeny Fadeev2013-05-231-6/+5
|\ \ | |/ |/| fix bug where private key was hard-coded as 2.
| * fix bug where private key was hard-coded as 2.Robert Martin2013-05-231-6/+5
|/ | | | | | | Previously this test failed in MySQL because the private key for user_two was hard-coded as 2. This change determines it programatically from user_two, which lets the MySQL test work properly.
* fixed lost moderator functions on the question pageEvgeny Fadeev2013-05-221-1/+1
|
* added Kevin Porterfield from shotgunsoftware.com to the list of contributorsEvgeny Fadeev2013-05-221-0/+1
|
* a minor css fixEvgeny Fadeev2013-05-222-2/+2
|
* Merge pull request #127 from kporangehat/unicode_fixesEvgeny Fadeev2013-05-212-3/+9
|\ | | | | fix errors caused by user names with unicode data
| * fix errors caused by user names with unicode dataKP2013-05-222-3/+9
| |
* | Merge pull request #126 from kporangehat/zendesk_truncate_fieldsEvgeny Fadeev2013-05-211-6/+9
|\ \ | |/ |/| truncate zendesk data to respect Field max_length param
| * truncate zendesk data to respect Field max_length paramKP2013-05-211-6/+9
|/ | | | some zendesk data like Forum descriptions can be lengthy and exceed the max_length defined in askbot for the mapped field. This is a brute force truncation at max_length.
* minor update to the deployment documentationEvgeny Fadeev2013-05-212-1/+9
|
* moved the "add a comment" button up to save vertical spaceEvgeny Fadeev2013-05-215-12/+38
|
* added class to the cancel add comment buttonEvgeny Fadeev2013-05-211-1/+1
|
* added missing translationEvgeny Fadeev2013-05-201-1/+1
|
* added an optional service url prefix to later support namespacesEvgeny Fadeev2013-05-194-227/+237
|
* fixed a css issue for the "give answer box" on the question pageEvgeny Fadeev2013-05-182-6/+6
|
* fixed a css issue with the messages falling from the headerEvgeny Fadeev2013-05-182-9/+8
|
* fixed bug in the main page paginationEvgeny Fadeev2013-05-181-2/+13
|
* recompiled all localizationsEvgeny Fadeev2013-05-1867-0/+0
|
* Merge branch 'master' of github.com:/ASKBOT/askbot-develEvgeny Fadeev2013-05-1865-19490/+125966
|\