aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Get nick color name correctly in weechat < 1.5Trygve Aaberge2017-07-121-2/+9
* Rename version variable to weechat_versionTrygve Aaberge2017-07-121-2/+2
* Merge pull request #384 from cmatheson/fix-349Ryan Huber2017-07-111-1/+2
|\
| * Stop polling dead websockets. Fixes #349Cameron Matheson2017-07-051-1/+2
|/
* Correct URL in READMETollef Fog Heen2017-05-021-2/+2
* Merge pull request #351 from wee-slack/settings_cleanupRyan Huber2017-04-211-10/+0
|\
| * Remove colorize_messages settingTollef Fog Heen2017-04-161-1/+0
| * Remove dead code related to cacheTollef Fog Heen2017-04-161-9/+0
* | Merge pull request #356 from ToxicFrog/toxicfrog/missing-textRyan Huber2017-04-211-2/+2
|\ \
| * | Fix channel history not appearing when an earlier message has 'text': NoneBen Kelly2017-04-211-2/+2
|/ /
* | Merge pull request #347 from V13Axel/status_commandRyan Huber2017-04-182-0/+38
|\ \
| * | Remove redundant team reference retrievalV13Axel2017-04-171-1/+0
| * | Add command for setting Slack StatusV13Axel2017-04-132-0/+39
* | | Merge pull request #348 from trygveaa/fix/unicodeTollef Fog Heen2017-04-181-59/+133
|\ \ \
| * | | Decode arguments sent to callback functionsTrygve Aaberge2017-04-151-0/+36
| * | | Do encode/decode in websocket and urllib callsTrygve Aaberge2017-04-151-3/+3
| * | | Create a wrapper around weechat which handles encodingTrygve Aaberge2017-04-151-1/+51
| * | | Remove all calls to encode and decodeTrygve Aaberge2017-04-151-20/+9
| * | | Remove utf8 argument from get_senderTrygve Aaberge2017-04-151-5/+2
| * | | Use unicode literals everywhereTrygve Aaberge2017-04-151-30/+32
| | |/ | |/|
* | | Merge pull request #353 from deepy/documentationTollef Fog Heen2017-04-181-7/+7
|\ \ \ | |/ / |/| |
| * | Changes aliases example to have multiple entries.Alex Nordlund2017-04-181-1/+1
| * | Adds key:value to aliases. Closes #337Alex Nordlund2017-04-181-1/+1
| * | Corrects server_alias -> server_aliases.Alex Nordlund2017-04-181-1/+1
| * | Updates README to give correct instructions for settings.Alex Nordlund2017-04-181-7/+7
|/ /
* | Merge pull request #344 from wee-slack/pep8Ryan Huber2017-04-141-168/+374
|\ \ | |/ |/|
| * PEP8 fixupsTollef Fog Heen2017-04-131-168/+374
|/
* Merge pull request #342 from wee-slack/show_channels_with_hash_symbol_properlyRyan Huber2017-04-131-1/+3
|\
| * do it for channels but not users, hence new elifRyan Huber2017-04-131-1/+3
|/
* Merge pull request #341 from wee-slack/actually_unfurl_againRyan Huber2017-04-131-13/+13
|\
| * yay for unfurlsRyan Huber2017-04-131-13/+13
|/
* Merge pull request #340 from wee-slack/fix_joinRyan Huber2017-04-131-1/+1
|\
| * wrong var nameRyan Huber2017-04-131-1/+1
|/
* Merge pull request #336 from bronzehedwick/patch-2Ryan Huber2017-04-131-6/+6
|\
| * Fix readme markdownChris DeLuca2017-04-131-6/+6
* | Merge pull request #339 from ToxicFrog/toxicfrog/nick-coloursRyan Huber2017-04-131-11/+7
|\ \
| * | Defer nick colourization to weechat's built in supportBen Kelly2017-04-131-11/+7
| |/
* | Merge pull request #338 from ToxicFrog/toxicfrog/formattingRyan Huber2017-04-131-1/+5
|\ \
| * | Translate slack formatting codes to/from IRC formatting codesBen Kelly2017-04-131-1/+5
| |/
* | Merge pull request #287 from ToxicFrog/toxicfrog/action-supportRyan Huber2017-04-132-7/+17
|\ \ | |/ |/|
| * Handling incoming me_message subtypes.Ben Kelly2017-04-132-7/+17
|/
* Merge pull request #320 from oschwald/patch-11.0-RC1Ryan Huber2017-04-131-1/+1
|\
| * Update token linkGregory Oschwald2017-03-051-1/+1
* | Merge pull request #334 from wee-slack/wee-ng-mergeRyan Huber2017-04-12150-2210/+4117
|\ \ | |/ |/|
| * Merge pull request #335 from trygveaa/wee-ng-mergeRyan Huber2017-04-121-0/+11
| |\
| | * Merge remote-tracking branch 'wee-ng/master' into wee-ng-mergeTrygve Aaberge2017-04-12150-2210/+4117
| |/| |/| |
| | * much much better handling of read markersRyan Huber2017-04-051-4/+4
| | * remove dbgRyan Huber2017-03-271-1/+0
| | * fix here/group/channelRyan Huber2017-03-271-5/+7
| | * fix broken linkifying wrong-lyRyan Huber2017-03-271-1/+1