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
5,977 Commits 31 Branches 59 Tags 24 MiB
plugins
Commit Graph

238 Commits

Author SHA1 Message Date
James Booth
d046877b5f Merge branch 'master' into plugins 2015-11-01 19:45:52 +00:00
James Booth
aa59cf98b8 xmlwin_show takes window as argument 2015-11-01 19:45:35 +00:00
James Booth
db4bcd3e6d Added xmlwin module 2015-11-01 19:39:36 +00:00
James Booth
c994a7a5ec Merge branch 'master' into plugins 
Conflicts:
	src/command/command.c
	src/event/client_events.c
	src/event/server_events.c
	src/main.c
	src/ui/chatwin.c
 2015-10-31 23:51:34 +00:00
James Booth
17488ca346 Added missing config.h includes 2015-10-31 23:38:08 +00:00
James Booth
d2a30b1263 Merge branch 'master' into plugins 
Conflicts:
	src/event/client_events.c
	src/ui/core.c
 2015-10-28 00:06:13 +00:00
James Booth
31016a2150 Tidied chatwin_outgoing_carbon 2015-10-27 23:25:18 +00:00
James Booth
af1124f28f Renamed ui_incoming_msg -> chatwin_incoming_msg 2015-10-27 23:18:42 +00:00
James Booth
ae89028772 Renamed ui_recipient_gone -> chatwin_recipeint_gone 2015-10-27 23:06:27 +00:00
James Booth
62c2febc11 Tidied ui_recipient_gone 2015-10-27 23:05:20 +00:00
James Booth
40dcd59727 Renamed chatwin OTR functions 2015-10-27 21:23:56 +00:00
James Booth
2efaa464bf ui_message_receipt takes ProfChatWin 2015-10-26 22:54:06 +00:00
James Booth
8f45f332ad Removed ui_chat_win_exists 2015-10-26 22:43:32 +00:00
James Booth
f081aa7aa2 Merge branch 'master' into plugins 
Conflicts:
	src/command/commands.c
	src/command/commands.h
	src/main.c
	src/ui/console.c
	src/ui/core.c
	src/ui/notifier.c
	src/ui/ui.h
	src/ui/window.c
	src/window_list.c
	src/window_list.h
	src/xmpp/connection.c
 2015-10-26 01:05:13 +00:00
James Booth
afbd2693cd Applied coding style to src/event/ 2015-10-25 22:32:46 +00:00
James Booth
df7e0cca00 Merge branch 'master' into plugins 
Conflicts:
	Makefile.am
	src/profanity.c
 2015-10-15 01:23:03 +01:00
James Booth
904a5a81cf Add ability to script commands after connect 2015-10-15 01:19:24 +01:00
James Booth
0051ef4ead Merge branch 'master' into plugins 2015-10-14 00:30:58 +01:00
James Booth
c9165ef9d2 Title bar TLS indicator 
Issue #616
 2015-10-14 00:29:22 +01:00
James Booth
5385fe8098 Merge branch 'master' into plugins 2015-09-30 00:07:54 +01:00
James Booth
075c108e2d Fixed spelling 2015-09-30 00:07:35 +01:00
James Booth
83a938c3bd Merge branch 'master' into plugins 2015-09-29 23:30:42 +01:00
James Booth
99fc70bd92 Added last activity time format option 2015-09-29 23:30:23 +01:00
James Booth
ac1164a3fa Use more specific messages for last activity responses 2015-09-29 21:51:04 +01:00
James Booth
4a590e5ac9 Merge branch 'master' into plugins 2015-09-29 00:55:50 +01:00
James Booth
bfdda17b7f Fix last active query 2015-09-29 00:53:58 +01:00
James Booth
f968a9afeb Merge branch 'master' into plugins 2015-09-29 00:02:03 +01:00
James Booth
26d160cae8 WIP: Added last activity request and response 2015-09-29 00:01:38 +01:00
James Booth
79d3aae50e Merge branch 'master' into plugins 
Conflicts:
	.travis.yml
	configure.ac
	src/profanity.c
	src/xmpp/connection.c
 2015-09-24 22:37:18 +01:00
James Booth
d96e68ea53 Save trusted certificates to tlscerts file with more information 2015-09-24 00:18:18 +01:00
James Booth
40ce5cb0e0 Parse TLS cert subject 2015-09-23 23:01:59 +01:00
James Booth
0321adde3e Fixed spelling 2015-09-23 20:38:52 +01:00
James Booth
bd9c28c100 Tidied output for cert callback 2015-09-23 00:17:10 +01:00
James Booth
a964050b87 Use subject name in cert callback 2015-09-22 23:56:22 +01:00
James Booth
b88885aaae Store trusted TLS cert fingerprints 2015-09-22 22:44:18 +01:00
James Booth
9414ad268d Prompt user to allow or deny untrusted TLS certificates 2015-09-22 21:42:05 +01:00
James Booth
74151e6419 Added TLS cert fail callback 2015-09-22 20:55:41 +01:00
James Booth
7d59286429 Merge branch 'master' into plugins 
Conflicts:
	src/event/server_events.c
 2015-09-08 20:21:35 +01:00
James Booth
b266e4d035 Pass delay timestamp to all incoming chat events 2015-09-08 20:18:31 +01:00
James Booth
f76154cc69 Fixed merge 2015-08-30 01:47:04 +01:00
James Booth
5499580b6d Merge branch 'master' into plugins 
Conflicts:
	src/event/client_events.c
	src/ui/core.c
 2015-08-30 01:37:22 +01:00
James Booth
b4722632b6 Split PGP incoming and outgoing message handling 2015-08-30 01:32:13 +01:00
James Booth
c57b7b8276 Merge branch 'master' into plugins 
Conflicts:
	src/event/server_events.c
 2015-08-27 00:42:03 +01:00
James Booth
1484e94b35 Fixed OTR decryption check 2015-08-27 00:37:48 +01:00
James Booth
55158767cc Renamed enc_message parameter for incoming messages 2015-08-26 23:23:12 +01:00
James Booth
4b90a53566 Tidied sv_ev_incoming_message 2015-08-26 23:15:10 +01:00
James Booth
b15d24397b Merge branch 'master' into plugins 2015-08-26 21:42:43 +01:00
James Booth
fc60c9fbf1 Fixed OTR char display 2015-08-26 21:42:16 +01:00
James Booth
ade1070c8e Merge branch 'master' into plugins 
Conflicts:
	src/config/preferences.h
	src/event/client_events.c
	src/event/server_events.c
	src/ui/core.c
 2015-08-26 01:45:19 +01:00
James Booth
f998ab8f3b Display special char for encrypted messages 2015-08-26 00:42:56 +01:00
James Booth
0df8d12965 Merge branch 'master' into plugins 2015-08-24 00:17:53 +01:00
James Booth
525876770a Removed unused barejid argument from PGP decryption 2015-08-24 00:13:57 +01:00
James Booth
51a4378b76 Merge remote-tracking branch 'origin/master' into plugins 2015-08-11 01:00:55 +01:00
James Booth
2af5c151a0 Tidied pgp memory allocations 2015-08-11 01:00:23 +01:00
James Booth
e5dec6abe8 Merge branch 'master' into plugins 
Conflicts:
	src/command/commands.c
	src/command/commands.h
	src/ui/console.c
	tests/unittests/test_cmd_otr.c
	tests/unittests/test_cmd_pgp.c
 2015-08-02 00:19:52 +01:00
James Booth
8ec931eb84 Added cons_show_padded 2015-07-29 23:48:28 +01:00
James Booth
8888e12871 Merge branch 'master' into plugins 
Conflicts:
	src/event/server_events.c
	src/ui/core.c
 2015-07-01 20:34:44 +01:00
James Booth
dd206ef637 WIP fix for #516, needs memory cleanup 2015-06-29 23:48:41 +01:00
James Booth
398c3c0ba6 Merge branch 'master' into plugins 
Conflicts:
	src/event/server_events.c
 2015-06-23 23:43:14 +01: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
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
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
5669799690 Encryption modes for sv_ev_incoming_message 2015-06-21 20:08:46 +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
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
8ebc1d4ac1 Moved pgp signature verification to sv_ev_contact_online 2015-05-07 22:22:28 +01:00
James Booth
c951139f85 Merge branch 'master' into plugins 2015-05-07 22:05:55 +01:00
James Booth
a2c6211732 Added ui_contact_online 2015-05-07 22:05:36 +01:00
James Booth
f542bce53e Merge branch 'master' into plugins 2015-05-04 23:31:29 +01:00
James Booth
4dc9033472 Use null check convention in server_events.c 2015-05-04 22:51:15 +01:00
James Booth
488dc30ffb Merge branch 'master' into plugins 2015-05-03 01:25:47 +01:00
James Booth
530c060d2a Extract private message hanlding in message.c 2015-05-03 01:25:33 +01:00
James Booth
26a79fdf57 Merge branch 'master' into plugins 2015-05-01 00:55:53 +01:00
James Booth
0118178080 Removed server event delegation functions 2015-05-01 00:55:40 +01:00
James Booth
ddf71d88a1 Merge branch 'master' into plugins 
Conflicts:
	src/event/client_events.c
	src/xmpp/connection.c
 2015-04-28 23:56:08 +01:00
James Booth
8aba52f4fe Renamed event functions 2015-04-28 23:38:56 +01:00
James Booth
38d305dc79 Merge branch 'master' into plugins 
Conflicts:
	src/event/client_events.c
	src/event/server_events.c
 2015-04-27 23:45:46 +01:00
James Booth
eb177ccbef Removed server_events dependency on libotr headers 2015-04-27 23:17:38 +01:00
James Booth
f219302f06 Renamed incoming otr message 2015-04-27 22:34:06 +01:00
James Booth
91c17f914c Merge branch 'master' into plugins 
Conflicts:
	src/xmpp/connection.c
 2015-04-19 17:32:04 +01:00
James Booth
e688dd7d28 Renamed server event functions 2015-04-19 17:29:54 +01:00
James Booth
aa6dea83a5 Merge branch 'master' into plugins 
Conflicts:
	Makefile.am
 2015-04-19 16:56:03 +01:00
James Booth
424f52c3fa Moved server_events to event/ 2015-04-19 16:54:16 +01:00