aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* debugging helpCharlie Allom2018-02-161-0/+9
* Merge pull request #502 from trygveaa/nicklist-dont-add-deleted-usersTrygve Aaberge2018-02-051-0/+2
|\
| * Don't add deleted users to the nicklistTrygve Aaberge2018-02-031-0/+2
|/
* Merge pull request #490 from SandyRogers/autocomplete-nicks-in-threadsTrygve Aaberge2018-02-021-4/+6
|\
| * Use self.team throughtout SlackThreadChannel classSandy Rogers2018-02-021-5/+5
| * Include members set and team in SlackThreadChannelSandy Rogers2018-01-171-0/+2
* | Merge pull request #500 from trygveaa/fix-quit-callbackTrygve Aaberge2018-01-311-2/+2
|\ \
| * | Fix quit callback functionTrygve Aaberge2018-01-301-2/+2
|/ /
* | Merge pull request #499 from immae/presence_subscriptionTrygve Aaberge2018-01-291-1/+6
|\ \
| * | Temporary fix user presence subscription crashing big teamsIsmaël Bouya2018-01-291-1/+6
|/ /
* | Merge pull request #494 from ToxicFrog/toxicfrog/display-namesBen Kelly2018-01-281-7/+14
|\ \
| * | SlackUser: use profile.display_name if availableBen Kelly2018-01-281-7/+14
* | | Merge pull request #487 from ajdavis/restore-slack-oauthTrygve Aaberge2018-01-282-1/+77
|\ \ \ | |/ / |/| |
| * | Respond to Trygve's commentsA. Jesse Jiryu Davis2018-01-272-14/+14
| * | update README for new /slack register commandA. Jesse Jiryu Davis2018-01-171-1/+26
| * | oauth cleanupsA. Jesse Jiryu Davis2018-01-171-36/+39
| * | add token once oauth completesA. Jesse Jiryu Davis2018-01-171-2/+16
| * | update oauth logic for new command codeA. Jesse Jiryu Davis2018-01-151-5/+8
| * | add oauth codeRyan Huber2018-01-151-0/+31
* | | Merge pull request #496 from immae/presence_subscriptionTrygve Aaberge2018-01-271-3/+20
|\ \ \
| * | | Fix presence subscription now mandatory to get state changesIsmaël Bouya2018-01-271-3/+20
|/ / /
* | | Merge pull request #495 from ToxicFrog/toxicfrog/sslwantreadBen Kelly2018-01-201-0/+3
|\ \ \
| * | | Suppress SSLWantReadError errorsBen Kelly2018-01-201-0/+3
|/ / /
* | | Merge pull request #493 from ToxicFrog/toxicfrog/nicklistBen Kelly2018-01-201-5/+8
|\ \ \ | |_|/ |/| |
| * | Handle memberlist updates in channelsinfo messageBen Kelly2018-01-191-5/+8
|/ /
* | Merge pull request #437 from trygveaa/completion-of-custom-emojisTrygve Aaberge2018-01-162-11/+37
|\ \ | |/ |/|
| * Reload emoji list on emoji change eventTrygve Aaberge2018-01-141-0/+5
| * Ensure that EMOJI is always definedTrygve Aaberge2017-09-171-7/+7
| * Add completion of custom emojisTrygve Aaberge2017-09-171-2/+19
| * Add documentation for emoji completionsTrygve Aaberge2017-09-171-0/+8
| * Refactor emoji list loadingTrygve Aaberge2017-09-171-7/+5
| * Improve error message when weemoji.json is not foundTrygve Aaberge2017-09-171-2/+2
| * Remove unnecessary dbg statementTrygve Aaberge2017-09-171-2/+0
* | Merge pull request #444 from trygveaa/feat/unfurl-prevent-auto-linkingTrygve Aaberge2018-01-142-7/+54
|\ \
| * | test: Add tests for unfurl_auto_link_displayTrygve Aaberge2017-10-011-1/+24
| * | refactor: Get config variables in unfurl_refsTrygve Aaberge2017-10-011-7/+14
| * | feat: Make it possible to only display url when text matchesTrygve Aaberge2017-10-011-9/+14
| * | feat: Remove Slacks auto prefixing of url protocolsTrygve Aaberge2017-10-011-1/+13
* | | Merge pull request #440 from trygveaa/use-last-msg-timestamp-for-mark-readTrygve Aaberge2018-01-141-23/+22
|\ \ \
| * | | refactor: Make use of message keys more clear and efficientTrygve Aaberge2017-10-151-11/+11
| * | | refactor: Use OrderedDict for SlackChannel.messagesTrygve Aaberge2017-10-151-15/+13
| * | | fix: Use the timestamp of the last message in mark_readTrygve Aaberge2017-09-231-1/+2
| |/ /
* | | Merge pull request #438 from trygveaa/attachment-tests-and-minor-fixesTrygve Aaberge2018-01-102-6/+157
|\ \ \
| * | | fix: Unescape html before checking attachment linksTrygve Aaberge2017-10-152-5/+6
| * | | Add a newline between attachmentsTrygve Aaberge2017-09-202-4/+26
| * | | Don't render equal title_link and from_url in attachments twiceTrygve Aaberge2017-09-202-1/+14
| * | | test: Add tests for unwrap_attachmentsTrygve Aaberge2017-09-201-0/+115
| |/ /
* | | Merge pull request #452 from ericdwang/query-mpdmTrygve Aaberge2017-12-172-25/+65
|\ \ \
| * | | Clean up /query related codeEric Wang2017-11-291-23/+12
| * | | Fix MPDM joins not syncing with Slack and switch to mpim.openEric Wang2017-11-291-7/+21