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,275 Commits 31 Branches 59 Tags 24 MiB
9146c4ad6f
Commit Graph

4275 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
James Booth
97ba9d2692 Merge branch 'master' into openpgp 2015-06-17 20:06:13 +01:00
James Booth
bf1078290f Merge branch 'master' into plugins 2015-06-17 20:05:56 +01:00
James Booth
f51a26e6a0 Merge remote-tracking branch 'quite/#513' 2015-06-17 20:05:27 +01:00
James Booth
1af3565cbd Merge branch 'master' into openpgp 2015-06-17 19:55:52 +01:00
James Booth
aa22b7cc46 Fixed merge 2015-06-17 19:55:25 +01:00
James Booth
a92c623867 Merge branch 'master' into plugins 2015-06-17 19:50:41 +01:00
James Booth
e00a03f916 Removed wins_get_current_* functions 2015-06-17 19:49:55 +01:00
James Booth
8fde14879a Merge branch 'master' into openpgp 
Conflicts:
	src/command/commands.c
	src/command/commands.h
 2015-06-17 00:40:06 +01:00
James Booth
5adf77d367 Merge branch 'master' into plugins 
Conflicts:
	src/command/command.h
	src/command/commands.c
	src/command/commands.h
	src/ui/ui.h
 2015-06-17 00:35:02 +01:00
James Booth
a798dc5618 Removed unused function prototype 2015-06-17 00:18:59 +01:00
James Booth
2215a3791f Added current window reference to command functions 2015-06-17 00:15:28 +01:00
James Booth
cfef64c767 Pass current window to autocompleters 2015-06-16 22:59:08 +01:00
Daniel
d00d71f245 Let's only strip trailing whitespace when parsing command 
Allows for "quoting" a command--doing nothing but sending the string: SPC/command
As we're used to from for example irc clients. 

Fixes boothj5/profanity#513
 2015-06-16 09:46:02 +02:00
James Booth
637b8bee9f Merge branch 'master' into openpgp 2015-06-15 23:17:11 +01:00
James Booth
768a0c4e23 Merge branch 'master' into plugins 2015-06-15 23:16:56 +01:00
James Booth
fb0e065902 Tidied cmd_otr, added check-unit target to Makefile 2015-06-15 23:16:22 +01:00
James Booth
de47450594 Merge branch 'master' into openpgp 2015-06-15 22:03:25 +01:00
James Booth
96715c1dda Merge branch 'master' into plugins 2015-06-15 22:03:13 +01:00
James Booth
6097a5bade Removed ui_get_current_chat() 2015-06-15 22:01:28 +01:00
James Booth
db9d44bc28 Merge branch 'master' into plugins 
Conflicts:
	Makefile.am
	src/config/preferences.c
	src/config/preferences.h
	src/config/theme.h
	src/ui/ui.h
	src/ui/window.h
	src/window_list.c
 2015-06-15 21:00:49 +01:00
James Booth
c76692516a Merge branch 'master' into openpgp 2015-06-15 20:39:17 +01:00
James Booth
5cdd69f478 Moved UI interfaces to ui.h 2015-06-15 20:11:34 +01:00