summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Moving away from session storage for user email confirmation processAdolfo Fitoria2013-06-186-33/+188
|
* removed some tables from the user profile pageEvgeny Fadeev2013-06-155-214/+242
|
* fixed get_yes_or_no functionEvgeny Fadeev2013-06-142-1/+2
|
* Merge branch 'shotgunsoftware'Evgeny Fadeev2013-06-143-133/+1189
|\
| * complete rewrite of Zendesk importerKP2013-06-132-131/+1095
| |
| * add default option to yes/no promptKP2013-06-131-2/+20
| |
| * add numeric-based choice and multiple choice menusKP2013-06-131-0/+74
| |
* | small changes in the login screen and a minor change in other templateEvgeny Fadeev2013-06-145-12/+20
|/
* added questions search to the user profile pageEvgeny Fadeev2013-06-132-2/+6
|
* added a utility function to the autocompleterEvgeny Fadeev2013-06-091-0/+11
|
* a small change in the migrationsEvgeny Fadeev2013-06-062-2/+2
|
* small change in a message in auth module + split out a templateEvgeny Fadeev2013-06-043-30/+27
|
* added site name to the heading in the email greetingEvgeny Fadeev2013-06-042-6/+7
|
* fixed a bug in the email recovery with non-existing emailEvgeny Fadeev2013-06-031-1/+1
|
* fixed up CSS and error reporting on adding user to group and removing fromEvgeny Fadeev2013-06-035-47/+55
|
* Merge branch 'kporangehat'Evgeny Fadeev2013-06-032-12/+14
|\
| * fix group description attributeKP2013-05-301-1/+1
| |
| * group name parameter is name not group_nameKP2013-05-291-1/+1
| |
| * add missing DOM element and fix closing tagKP2013-05-291-10/+12
| |
* | edited documentation and the contributors fileEvgeny Fadeev2013-06-033-0/+7
| |
* | Merge branch 'pcompassion'Evgeny Fadeev2013-06-037-14/+701
|\ \
| * | 'Not sure if deleting this was a right thing to do as we don't want tags ↵Eugene Kim2013-05-271-4/+6
| | | | | | | | | | | | | | | | | | tag1 and TAG1 we always want a single case variant. If someone attempts to create a case variant we should auto-correct.' reverting it
| * | If tagsynonym tag1->tag2 exists when a user asks to rename tag3->tag1, abortEugene Kim2013-05-273-8/+28
| | | | | | | | | | | | | | | | | | If tagsynonym tag1->tag2 exists when a user wants to rename tag2->tag3, update tagsynonym table When create_tag_synonym creates a new target_tag, we copy source_tag's info to target_tag.
| * | tag synonymsEugene Kim2013-05-228-16/+681
| | | | | | | | | | | | model, management command, and test code
* | | Merge branch 'github'Evgeny Fadeev2013-06-032-12/+10
|\ \ \
| * \ \ 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().
* / / / made "send_email_alerts" language awareEvgeny Fadeev2013-06-032-16/+36
|/ / /
* | | 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
|\ \ \ \