aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code
2,237 Commits 32 Branches 59 Tags
Commit Graph

1556 Commits

Author SHA1 Message Date
James Booth
b86164d70b Merge branch 'master' into plugins 2014-02-23 01:19:33 +00:00
James Booth
66424565dd Show OTR status on /msg usr when usr has already started an OTR session 
fixes #308
 2014-02-23 01:17:03 +00:00
James Booth
b529dffaaf Merge branch 'master' into plugins 2014-02-23 00:55:41 +00:00
James Booth
23281d6741 Merge branch 'master' into otr-query 2014-02-23 00:53:22 +00:00
James Booth
e9b6e277fa Merge branch 'master' into plugins 2014-02-23 00:49:19 +00:00
James Booth
118909b07f Removed debug on error messages 2014-02-23 00:48:10 +00:00
James Booth
09472e43c4 Added OTR supported versions in initial start query message 2014-02-18 22:31:27 +00:00
James Booth
f4f1167188 Merge branch 'master' into plugins 2014-02-17 23:10:36 +00:00
James Booth
82ad0cd306 Added /otr myfp test 2014-02-17 21:52:42 +00:00
James Booth
396991c191 Fixed merge 2014-02-16 23:15:51 +00:00
James Booth
4a26c4dd0a Merge branch 'master' into plugins 2014-02-16 23:13:09 +00:00
James Booth
a21ab6d4c8 Mock otr module for cmd_otr tests 2014-02-16 19:14:15 +00:00
James Booth
40ff1a1dee Merge branch 'master' into plugins 
Conflicts:
	src/command/commands.c
 2014-02-16 02:24:14 +00:00
James Booth
7e956fb347 Added tests for /otr warn 2014-02-16 02:22:29 +00:00
James Booth
6295336284 Added cmd_otr tests 2014-02-16 00:04:53 +00:00
James Booth
0a49fc32c7 Fixed /tiny OTR messages 2014-02-15 21:53:38 +00:00
James Booth
34e4c1c3b2 Merge branch 'master' into plugins 2014-02-15 21:25:47 +00:00
James Booth
f010dfb004 Show message on /alias list when no aliases 2014-02-15 21:25:13 +00:00
James Booth
b981f92c92 Merge branch 'master' into plugins 2014-02-15 21:18:27 +00:00
James Booth
17d3751306 Fixed /alias add, when alias already exists 2014-02-15 21:17:31 +00:00
James Booth
b1290ebe1a Merge branch 'master' into plugins 2014-02-15 19:49:08 +00:00
James Booth
bdfcc81b07 Only show error message when err != 0 
fixes #307
 2014-02-15 19:47:36 +00:00
James Booth
f5dd30c4c6 Merge branch 'master' into plugins 
Conflicts:
	src/command/command.c
	src/profanity.c
	src/server_events.c
 2014-02-13 23:32:11 +00:00
James Booth
9ff7a2a1fe Removed free message function from otrlibv3 2014-02-13 23:09:52 +00:00
James Booth
450c01ecb4 Refactored common otr library code 2014-02-13 23:07:09 +00:00
James Booth
4e81707b27 Renamed otr implementations 2014-02-12 23:29:08 +00:00
James Booth
b30155a10e Moved otr sources into folder 2014-02-12 22:19:21 +00:00
James Booth
819e3f1a8b Merge branch 'master' into plugins 2014-02-11 23:52:08 +00:00
James Booth
25131e3f36 Added command to show libotr version 2014-02-11 23:19:09 +00:00
James Booth
42630139c2 Use instag master, and skip fragmentation 2014-02-11 23:03:07 +00:00
James Booth
e07209ec49 Allow V3, use OTRL_INSTAG_BEST, output error event when no message 2014-02-11 21:21:33 +00:00
James Booth
5b260af999 Changed OTR policy for otr4.c 2014-02-10 23:24:07 +00:00
James Booth
88e8c0151d Merge branch 'libotr4' of github.com:boothj5/profanity into libotr4 2014-02-10 23:23:11 +00:00
James Booth
5e56515f4f Merge branch 'master' into plugins 2014-02-10 23:20:35 +00:00
James Booth
291c977473 Changed OTR policy allow V1 and V2 2014-02-10 23:20:06 +00:00
James Booth
d5ba4dfd38 Changed functions for libotr4 compatibility 2014-02-09 02:53:07 +00:00
James Booth
26e1fd545c Added libotr4 message handlers 2014-02-09 02:24:47 +00:00
James Booth
4bd5cf35ff Added otr4.c 2014-02-09 00:34:00 +00:00
James Booth
fa89e2aa62 Check for libotr version 2014-02-09 00:32:11 +00:00
James Booth
3e02921859 Removed id from bookmarks add 2014-02-03 19:35:26 +00:00
James Booth
fb00889e6b Merge branch 'master' into plugins 2014-02-03 00:00:50 +00:00
James Booth
0f0cd4cdab Use wnoutrefresh, pnoutrefresh and doupdate 
Issue #298
 2014-02-02 23:58:01 +00:00
James Booth
af11eab3f1 Merge branch 'master' into plugins 2014-02-02 02:41:44 +00:00
James Booth
9394091f04 Implemented add bookmark for XEP-0223 
Issue #194
 2014-02-02 02:39:36 +00:00
James Booth
b6d7b4be05 Merge branch 'master' into plugins 2014-02-02 01:07:22 +00:00
James Booth
95c48a0f47 Test message when removing autojoin for non existent bookmark 2014-02-02 01:05:52 +00:00
James Booth
9d957e5f93 Show message on /bookmark remove when bookmark does not exist 2014-02-02 00:59:32 +00:00
James Booth
92b85bb7f1 Added message when bookmark updated 2014-02-02 00:49:02 +00:00
James Booth
a8ecbccc9c Added /bookmark remove tests 2014-02-02 00:37:37 +00:00
James Booth
d4f5955518 Merge branch 'master' into plugins 2014-02-02 00:02:05 +00:00