aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code
4,297 Commits 31 Branches 59 Tags 24 MiB
398c3c0ba6
Commit Graph

4297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Booth
398c3c0ba6 Merge branch 'master' into plugins 
Conflicts:
	src/event/server_events.c
 2015-06-23 23:43:14 +01:00
James Booth
815ca16f48 Merge remote-tracking branch 'pasis/stabber-linker' 2015-06-23 23:39:16 +01:00
James Booth
8eb921e34a Merge remote-tracking branch 'pasis/ui-log-fix' 2015-06-23 23:37:52 +01:00
Dmitry Podgorny
c47688f37c autotools: Don't link profanity with libstabber 2015-06-23 22:33:51 +00:00
James Booth
d89a9862b1 Merge remote-tracking branch 'pasis/pgp-without-otr-fix' 2015-06-23 23:32:41 +01:00
James Booth
358e9d6af0 Added /pgp setkey command 2015-06-23 23:29:10 +01:00
Dmitry Podgorny
6a73ca1b52 pgp: Fixed compilation error when libotr is not supported 2015-06-23 22:13:50 +00:00
Dmitry Podgorny
02cd8d2330 ui: decreased log level of the message on resizing 
Resizing of terminal window can produce many logs "Resizing UI". Also
they are not so informative to be shown without -l DEBUG.
 2015-06-23 22:03:09 +00:00
James Booth
2d3537515d Added AC_SYS_LARGEFILE to configure.ac 2015-06-23 20:37:42 +01:00
James Booth
c7bfca8394 Merge branch 'master' into plugins 2015-06-22 21:10:02 +01:00
James Booth
86acd4649b Added PGP prefs 2015-06-22 21:09:14 +01:00
James Booth
52fd5c2a61 Merge branch 'master' into plugins 2015-06-22 20:36:29 +01:00
James Booth
24ebb51254 Use AM_CPPFLAGS for gpgme-config --cflags 2015-06-22 20:35:46 +01:00
James Booth
48e3f0a479 Merge branch 'master' into plugins 2015-06-22 20:08:49 +01:00
James Booth
f81873824b Use gpgme-config 2015-06-22 20:08:22 +01:00
James Booth
54df2101be Tidied gpgme check 2015-06-22 18:48:00 +01:00
James Booth
d30977aaa5 Merge branch 'master' into plugins 2015-06-22 16:03:24 +01:00
James Booth
fdb50f77e7 Merge remote-tracking branch 'pasis/configure-debug-args' 2015-06-22 16:01:12 +01:00
James Booth
73e6841e3d Merge branch 'master' into plugins 
Conflicts:
	src/profanity.c
 2015-06-22 15:59:54 +01:00
James Booth
8ac8df6286 Merge remote-tracking branch 'pasis/shutdown-fix' 2015-06-22 15:56:04 +01:00
Dmitry Podgorny
6ba4456c0a Don't ignore arguments passed to ./configure-debug 2015-06-22 12:36:46 +00:00
Dmitry Podgorny
c851a48af2 shutdown: Call prefs_close() after log_close() 
log_msg() uses prefs, so prefs_close() should be called after
log_close(). It makes possible to use logs in other finalisation
functions.
 2015-06-22 11:43:12 +00:00
James Booth
9146c4ad6f Merge branch 'master' into plugins 2015-06-22 00:06:23 +01:00
James Booth
9b797f3cef Updated CHANGELOG 2015-06-22 00:06:07 +01:00
James Booth
00142f61e9 Merge branch 'master' into plugins 2015-06-21 23:32:23 +01:00
James Booth
2c8b598d3f Merge remote-tracking branch 'pasis/configure-cleanup' 2015-06-21 23:32:03 +01:00
James Booth
1087041dcf Merge branch 'master' into plugins 
Conflicts:
	.travis.yml
	src/command/commands.c
	src/event/client_events.c
	src/event/server_events.c
	src/ui/core.c
	src/ui/titlebar.c
 2015-06-21 23:22:09 +01:00
Dmitry Podgorny
1dba341da8 autotools: Avoid copy-paste in configure.ac 2015-06-21 21:29:20 +00:00
James Booth
918e55becf Fixed pgp help 2015-06-21 22:29:15 +01:00
James Booth
9526f2b7eb Fixed /pgp help formatting 2015-06-21 22:06:27 +01:00
James Booth
3d2f999efb Added PGP logging preferences 2015-06-21 21:42:58 +01:00
James Booth
446027b950 Moved setting otr.warn -> enc.warn 2015-06-21 21:07:57 +01:00
James Booth
e72ddf5488 Show message when contact ends PGP 2015-06-21 20:27:56 +01:00
James Booth
217fcff420 Added /pgp end command 2015-06-21 20:20:28 +01:00
James Booth
f81652e84e Added enc_mode check when starting OTR 2015-06-21 20:13:28 +01:00
James Booth
5669799690 Encryption modes for sv_ev_incoming_message 2015-06-21 20:08:46 +01:00
James Booth
03a4aa4408 Tidied OTR and PGP combinations in client_events.c 2015-06-21 19:29:23 +01:00
James Booth
13a612cbc2 Moved window creation to sv_ev_incoming_message 2015-06-21 18:29:20 +01:00
James Booth
8d2d923603 Moved message display logic to sv_ev_incoming_message 2015-06-21 18:00:57 +01:00
James Booth
9b991ae058 Extracted chat session code from message senders 2015-06-21 17:11:23 +01:00
James Booth
e45afd5c09 Added pgp checks for message sending 2015-06-21 01:48:25 +01:00
James Booth
6617bb5a2b Added window encyption mode for PGP 2015-06-20 23:49:24 +01:00
James Booth
16999a3964 Merge branch 'master' into openpgp 2015-06-20 00:39:08 +01:00
James Booth
a0cfcb56a2 Merge branch 'master' into plugins 2015-06-20 00:38:51 +01:00
James Booth
d7ec339e3e Added /roster empty command 2015-06-20 00:38:28 +01:00
James Booth
edbb3d938e Merge branch 'master' into openpgp 2015-06-19 00:15:40 +01:00
James Booth
69b9434b00 Merge branch 'master' into plugins 2015-06-19 00:15:22 +01:00
James Booth
e117c0368f Added missing include client_events.c 2015-06-19 00:14:48 +01:00
James Booth
ea99012d9b Added initial /pgp start checks 2015-06-18 01:34:27 +01:00
James Booth
85cc5ab50d Added cmd_pgp tests 2015-06-18 00:12:01 +01:00