aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | Refactor command_talk and fix MPDMs not being createdEric Wang2017-11-292-45/+51
| * | Add ability to open multiparty DMs with /query and /slack talkEric Wang2017-11-292-10/+41
|/ /
* | Merge pull request #464 from trygveaa/send-special-messagesTrygve Aaberge2017-11-212-1/+9
|\ \
| * | Allow sending special messages by prefixing them with a slash or a spaceTrygve Aaberge2017-11-072-1/+9
* | | Merge pull request #478 from alyssais/hide_closed_group_dmsTrygve Aaberge2017-11-211-14/+12
|\ \ \
| * | | Don't show closed group DMsAlyssa Ross2017-11-201-1/+4
| * | | Refactor check_should_openAlyssa Ross2017-11-201-14/+9
* | | | Merge pull request #471 from com4/masterTrygve Aaberge2017-11-211-1/+6
|\ \ \ \
| * | | | Add option to disable sending typing notification to Slackjason2017-11-081-1/+6
* | | | | Merge pull request #475 from immae/team_identifierTrygve Aaberge2017-11-211-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Hilight team identifier in slackIsmaël Bouya2017-11-131-1/+1
| |/ / /
* | | | Merge pull request #461 from trygveaa/remove-team-nicklistTrygve Aaberge2017-11-161-1/+0
|\ \ \ \
| * | | | Remove the nicklist from the team buffersTrygve Aaberge2017-10-261-1/+0
| | |/ / | |/| |
* | | | Allow query with @'esIsmaël Bouya2017-11-131-0/+2
| |/ / |/| |
* | | Display nicklist in MPDM messagesjason2017-11-081-1/+1
* | | Merge pull request #468 from ToxicFrog/toxicfrog/tagsBen Kelly2017-11-071-9/+9
|\ \ \ | |/ / |/| |
| * | Add irc_privmsg to message tags; remove unused "highlightme" tagsetBen Kelly2017-11-041-9/+9
|/ /
* | Merge pull request #460 from auscompgeek/fix-server-buffer-varTrygve Aaberge2017-10-261-0/+1
|\ \
| * | Set the server buffer variable on server buffersDavid Vo2017-10-261-0/+1
|/ /
* | Merge pull request #449 from dzfweb/masterTrygve Aaberge2017-10-251-0/+24
|\ \
| * | created '/slack users' and '/slack channels' commandDouglas Zanco Franco2017-10-251-0/+24
|/ /
* | Merge pull request #451 from ericdwang/masterTrygve Aaberge2017-10-231-15/+26
|\ \
| * | Fix channel joins not syncing with SlackEric Wang2017-10-201-1/+1
| * | Use Conversations API for join/open and leave/close methodsEric Wang2017-10-161-19/+15
| * | Add mpim API type for multiparty DMsEric Wang2017-10-161-1/+16
* | | Merge pull request #458 from trygveaa/decorator-for-decode-utf8Trygve Aaberge2017-10-222-44/+114
|\ \ \ | |/ / |/| |
| * | Decode exceptions from utf8Trygve Aaberge2017-10-191-2/+2
| * | Add decoding utf8 to some functions that were missing itTrygve Aaberge2017-10-191-0/+3
| * | Create a decorator for decoding function argumentsTrygve Aaberge2017-10-192-40/+48
| * | Add tests for decode_from_utf8/encode_to_utf8Trygve Aaberge2017-10-191-0/+59
| * | Preserve mapping types in decode_from_utf8/encode_to_utf8Trygve Aaberge2017-10-191-2/+2
|/ /
* | Merge pull request #453 from ericdwang/fix-dm-errorsTrygve Aaberge2017-10-111-3/+3
|\ \
| * | Use True instead of "true" for "return_im" in requestsEric Wang2017-10-111-2/+2