1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Commit Graph

3704 Commits

Author SHA1 Message Date
James Booth
c36d4b3643 Merge branch 'master' into pgp 2015-03-29 02:51:05 +01:00
James Booth
1917d4c095 Added password to direct invites 2015-03-29 02:46:59 +01:00
James Booth
c1eceebcba Merge branch 'master' into pgp 2015-03-29 00:59:42 +00:00
James Booth
714faeb2e6 Add callback data to room disco info response handler 2015-03-29 00:55:33 +00:00
James Booth
24a45e5292 Set members only property when getting room features 2015-03-29 00:21:18 +00:00
James Booth
fac2b2cf66 Added check members only room to send mediated invites 2015-03-28 22:51:41 +00:00
James Booth
0f6bc9b55d Decrypt incoming messages 2015-03-25 00:05:32 +00:00
James Booth
eb5cb7b2f8 Send encrypted messages 2015-03-24 23:34:24 +00:00
James Booth
551f7df1f7 Added signature verification, /pgp fps command 2015-03-24 00:47:13 +00:00
James Booth
b87130b601 Added check for HAVE_LIBGPGME in presence.c 2015-03-23 23:51:35 +00:00
James Booth
027fa2a700 Fixed tabs 2015-03-23 23:42:04 +00:00
James Booth
73e1654f28 Fixed tabs 2015-03-23 23:41:09 +00:00
James Booth
475dfebd97 Added pgpkeyid account setting, send signed presence 2015-03-23 23:38:06 +00:00
James Booth
8a5d1fef29 Added Id and fingerprint to pgp key list 2015-03-22 01:03:06 +00:00
James Booth
fd86615549 Added /pgp libver command 2015-03-22 00:29:57 +00:00
James Booth
1d90cc7894 Fixed whitespace 2015-03-22 00:15:23 +00:00
James Booth
2490c3ed20 Added pgp key list command 2015-03-22 00:12:14 +00:00
James Booth
f1f047889e Added individual options to send and request delivery receipts 2015-03-19 22:57:51 +00:00
James Booth
8e80a8ccf7 Merge remote-tracking branch 'origin/master' 2015-03-18 21:31:58 +00:00
James Booth
e7e94eed7f Added keybindings for rxvt 2015-03-18 21:30:43 +00:00
James Booth
d6977e31cd Fix buffer entry free 2015-03-17 20:42:21 +00:00
James Booth
311b64a379 Tidy cmd_tiny 2015-03-16 23:03:31 +00:00
James Booth
848baa95a2 Added static function for sending otr tagged messages 2015-03-16 21:59:11 +00:00
James Booth
11966d39b0 Added otr_tag_message, removed commands.c dependency on libotr 2015-03-16 21:41:35 +00:00
James Booth
ec57c72fb4 Use static functions in cmd_msg 2015-03-16 01:48:12 +00:00
James Booth
d50754aac6 Removed window checks before logging in cmd_msg 2015-03-16 01:39:43 +00:00
James Booth
981618b7da Added static functions to commands.c for sending messages 2015-03-16 01:29:03 +00:00
James Booth
e7e1688d8a Moved _strtoi to common, strtoi_range 2015-03-16 01:06:40 +00:00
James Booth
23ef3498b5 Removed console dependency from strtoi 2015-03-16 01:03:37 +00:00
James Booth
9bf5a68329 Moved default and alias command execution 2015-03-16 00:03:07 +00:00
James Booth
eeabbc9bb3 Fix for chat logging 2015-03-15 23:31:39 +00:00
James Booth
8944a3b5bb Move common chat logging code to log.c 2015-03-15 23:19:00 +00:00
James Booth
6f1119d225 Updated CHANGELOG 2015-03-15 20:28:09 +00:00
James Booth
fae2717f27 Tidied help 2015-03-15 20:04:53 +00:00
James Booth
2762f18a3e Added /receipts command 2015-03-15 19:48:19 +00:00
James Booth
b21edfaa51 Added receipt.sent theme setting 2015-03-15 19:35:25 +00:00
James Booth
48e06c5a68 Merge branch 'master' into xep-0184 2015-03-15 15:31:59 +00:00
James Booth
f0ffceefdd Added freebsd check for libnotify 2015-03-15 15:30:16 +00:00
James Booth
448c91af61 Fixed merge 2015-03-15 01:30:27 +00:00
James Booth
8c552e8a70 Merge branch 'master' into xep-0184 2015-03-15 01:27:09 +00:00
James Booth
49022068ef Added OTR error messages 2015-03-15 01:26:09 +00:00
James Booth
125719673b Return after message receipt 2015-03-14 23:25:20 +00:00
James Booth
ca30ff3910 Merge branch 'master' into xep-0184
Conflicts:
	src/server_events.c
	src/ui/core.c
	src/ui/ui.h
	tests/ui/stub_ui.c
2015-03-14 23:10:51 +00:00
James Booth
385336c10b Don't switch window on sent carbon 2015-03-14 22:59:49 +00:00
James Booth
a79ea3cbe2 Merge branch 'master' into xep-0184 2015-03-14 16:45:44 +00:00
James Booth
ede3368f7a Check for sent and received carbons 2015-03-14 16:44:21 +00:00
James Booth
060dcc24e3 Merge branch 'master' into xep-0184
Conflicts:
	src/xmpp/message.c
2015-03-14 16:41:40 +00:00
James Booth
2fc7937dcd Fixed error with /otr start with carbons enabled 2015-03-14 16:37:33 +00:00
James Booth
1014244408 Use colouring for message receipts 2015-03-14 16:05:13 +00:00
James Booth
bc6e32175d Removed from argument from outgoing message functions 2015-03-14 14:50:45 +00:00