1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Commit Graph

4853 Commits

Author SHA1 Message Date
James Booth
648c64f2fb Merge branch 'master' into clear 2017-02-02 23:01:38 +00:00
James Booth
b768c8b5c5 Update CHANGELOG 2017-01-28 20:30:33 +00:00
James Booth
72528dfab3 Merge branch 'master' into clear 2017-01-28 17:29:10 +00:00
James Booth
68a3daedb9 Update Copyright 2017-01-28 17:24:22 +00:00
James Booth
dfeb588953 Update CHANGELOG 2017-01-28 16:55:09 +00:00
James Booth
4b68d40a86 Merge branch 'master' into clear 2017-01-28 16:40:32 +00:00
James Booth
8978f809f2 Fix alias help
fixes #899
2017-01-28 16:39:04 +00:00
James Booth
6679b890a0 Fix multibyte chars in prof_occurrences
issue #901
2017-01-26 00:52:13 +00:00
James Booth
c4f5178e03 Merge branch 'master' into clear 2017-01-24 13:41:49 +00:00
James Booth
b712820c99 Check barejid in carbons 2017-01-24 13:37:28 +00:00
James Booth
4207873c8a Merge branch 'master' into clear 2017-01-23 22:35:37 +00:00
James Booth
8e75437a7e Add carbons from check 2017-01-23 22:25:36 +00:00
James Booth
c073418306 Check roster contact before displayng typing notification
fixes #896
2017-01-23 20:56:05 +00:00
James Booth
6001e5ac30 Merge branch 'master' into clear 2017-01-22 21:45:09 +00:00
James Booth
83385cdbc0 Add pre chat and room message blocking 2017-01-22 18:09:04 +00:00
James Booth
7090f85d85 Add chat and room show calls to plugins api 2017-01-21 20:23:28 +00:00
James Booth
1350cb0373 Merge branch 'master' into clear 2017-01-20 23:52:52 +00:00
James Booth
9cfd17821c Allow room display properies to be set by plugins 2017-01-20 23:26:14 +00:00
James Booth
c8874cd2e0 Allow chat prefix char to be set by plugins 2017-01-20 21:03:55 +00:00
James Booth
cde6bae5ad Merge remote-tracking branch 'origin/master' into clear 2017-01-20 00:27:52 +00:00
James Booth
ab1441a25c Update CHANGELOG 2017-01-19 23:13:39 +00:00
James Booth
1b25aa84cb Add titlebar encryption text to plugins api 2017-01-19 22:33:29 +00:00
James Booth
9905b62804 Merge branch 'master' into clear 2017-01-18 23:58:40 +00:00
James Booth
68496db0b4 Fix conditional compile 2017-01-18 23:16:23 +00:00
James Booth
fccf56be10 Add prof.encryption_reset to Plugins API
issue #885
2017-01-18 22:46:29 +00:00
James Booth
17efa01468 Merge branch 'master' into clear 2017-01-16 00:22:56 +00:00
James Booth
70e831e08b Fix tests 2017-01-16 00:21:57 +00:00
James Booth
0d0578b625 Fix compile 2017-01-16 00:07:17 +00:00
James Booth
fb10c588e5 Merge remote-tracking branch 'origin/clear' into clear 2017-01-16 00:01:55 +00:00
James Booth
1da55c310b Merge remote-tracking branch 'origin/master' into clear 2017-01-16 00:01:51 +00:00
James Booth
2b7894ccff Remove status from cl_ev_presence_send
fixes #888
2017-01-15 23:59:31 +00:00
James Booth
7d524cb574 Merge branch 'master' into clear 2016-11-24 00:09:47 +00:00
James Booth
b64646979e Remove unused function 2016-11-24 00:09:14 +00:00
James Booth
52e12d7761 Merge branch 'master' into clear 2016-11-23 00:18:27 +00:00
James Booth
926d935e26 Fix help tags for /account 2016-11-23 00:17:50 +00:00
James Booth
03a1d9c2ac Merge branch 'master' into clear 2016-11-22 00:40:59 +00:00
James Booth
e043029a50 Allow clearing account resource
issue #880
2016-11-22 00:39:52 +00:00
James Booth
edf9ab14a2 Merge branch 'master' into clear 2016-11-20 02:22:32 +00:00
James Booth
c441dbfa42 Fix typo 2016-11-20 02:21:22 +00:00
James Booth
7f7919ee33 Merge remote-tracking branch 'origin/clear' into clear 2016-11-20 02:18:30 +00:00
James Booth
d3a2119f8b Merge remote-tracking branch 'origin/master' into clear 2016-11-20 02:18:03 +00:00
James Booth
609d05366c Use server features for account muc service
issue #878
2016-11-20 02:09:34 +00:00
James Booth
d6444ec55b Merge branch 'master' into clear 2016-11-07 00:19:48 +00:00
James Booth
44979ac754 Update CHANGELOG 2016-11-06 23:09:00 +00:00
James Booth
24f3ad143c Merge remote-tracking branch 'origin/master' 2016-11-06 23:02:02 +00:00
James Booth
8008d8c3c6 Add get_room_nick to plugins api 2016-11-06 23:01:16 +00:00
James Booth
d88878d32f Update CHANGELOG 2016-11-06 22:34:07 +00:00
James Booth
e514853f29 Merge branch 'master' into clear 2016-10-30 17:23:40 +00:00
James Booth
ffa01a1a4c Add main.help.header to themes 2016-10-30 17:06:06 +00:00
James Booth
9516049e28 Merge remote-tracking branch 'lactide/master' 2016-10-30 16:50:44 +00:00