James Booth
|
e547ae0bcc
|
mucwin_role_change takes ProfMucWin
|
2015-11-01 22:42:31 +00:00 |
|
James Booth
|
45b5b17803
|
Merge branch 'master' into plugins
Conflicts:
src/event/server_events.c
|
2015-11-01 22:05:35 +00:00 |
|
James Booth
|
b26e606061
|
Renamed ui_room_broadcast -> mucwin_broadcast
|
2015-11-01 21:35:15 +00:00 |
|
James Booth
|
25020df0f0
|
Renamed ui_room_subject -> mucwin_subject
|
2015-11-01 21:33:16 +00:00 |
|
James Booth
|
bd922a2651
|
Renamed ui_room_requires_config -> mucwin_requires_config
|
2015-11-01 21:32:35 +00:00 |
|
James Booth
|
f435d081b0
|
Renamed ui_room_message -> mucwin_message
|
2015-11-01 21:31:54 +00:00 |
|
James Booth
|
29af5d4a3b
|
Renamed ui_room_history -> mucwin_history
|
2015-11-01 21:30:39 +00:00 |
|
James Booth
|
d7c1c6f9bf
|
Renamed ui_room_nick_change -> mucwin_nick_change
|
2015-11-01 21:29:48 +00:00 |
|
James Booth
|
27632581eb
|
Renamed ui_room_member_nick_change -> mucwin_occupant_nick_change
|
2015-11-01 21:28:53 +00:00 |
|
James Booth
|
0ea7636db3
|
Renamed ui_room_member_presence -> mucwin_occupant_presence
|
2015-11-01 21:27:56 +00:00 |
|
James Booth
|
7821b2261d
|
Renamed ui_room_member_online -> mucwin_occupant_online
|
2015-11-01 21:27:00 +00:00 |
|
James Booth
|
1e47749f3a
|
Renamed ui_room_member_banned -> mucwin_occupant_banned
|
2015-11-01 21:25:55 +00:00 |
|
James Booth
|
b8e1e5a546
|
Renamed ui_room_member_kicked -> mucwin_occupant_kicked
|
2015-11-01 21:24:49 +00:00 |
|
James Booth
|
445452696e
|
Renamed ui_room_member_offline -> mucwin_occupant_offline
|
2015-11-01 21:23:37 +00:00 |
|
James Booth
|
51c9d4186e
|
Renamed ui_room_roster -> mucwin_roster
|
2015-11-01 21:20:11 +00:00 |
|
James Booth
|
94f05ff42f
|
Renamed ui_room_occupant_role_and_affiliation_change -> mucwin_occupant_role_and_affiliation_change
|
2015-11-01 21:17:13 +00:00 |
|
James Booth
|
88206dc39b
|
Renamed ui_room_occupant_affiliation_change -> mucwin_occupant_affiliation_change
|
2015-11-01 21:16:22 +00:00 |
|
James Booth
|
eae0b59310
|
Renamed ui_room_occupant_role_change -> mucwin_occupant_role_change
|
2015-11-01 21:15:14 +00:00 |
|
James Booth
|
1a87132dc7
|
Renamed ui_room_role_and_affiliation_change -> mucwin_role_and_affiliation_change
|
2015-11-01 21:14:01 +00:00 |
|
James Booth
|
d706dcd4bc
|
Renamed ui_room_affiliation_change -> mucwin_affiliation_change
|
2015-11-01 21:12:53 +00:00 |
|
James Booth
|
75b505cf6a
|
Renamed ui_room_role_change -> mucwin_role_change
|
2015-11-01 21:11:30 +00:00 |
|
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
|
e7148bf82d
|
Renamed ui_outgoing_chat_msg -> chatwin_outgoing_msg
|
2015-10-27 23:20:03 +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
|
0fd616167e
|
Removed ui_events module
|
2015-10-27 20:49:06 +00:00 |
|
James Booth
|
61bcb59ee9
|
Removed ui_ev_new_chat_win
|
2015-10-27 20:45:07 +00:00 |
|
James Booth
|
8087053f49
|
Removed ui_ev_focus_win
|
2015-10-27 20:40:42 +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
|
34b19c5738
|
Merge branch 'master' into plugins
Conflicts:
src/command/command.c
src/profanity.c
src/xmpp/connection.c
|
2015-10-18 03:11:02 +01:00 |
|
James Booth
|
6640a0891f
|
Force tls on all connections, add tls policy account property
|
2015-10-18 03:06:23 +01: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
|
17e435dfaf
|
Merge branch 'master' into plugins
Conflicts:
src/xmpp/roster.c
|
2015-09-27 23:58:11 +01:00 |
|
James Booth
|
9593e17c3c
|
Include last activity in initial presence
|
2015-09-27 23:53:06 +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
|
5e962fe0f5
|
Fixed compile when no OTR or PGP support
|
2015-08-26 01:48:21 +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
|
4d4a3cb1b9
|
Merge branch 'master' into plugins
|
2015-06-24 22:15:34 +01:00 |
|
James Booth
|
524c7a8671
|
Free account on pgp presence send
|
2015-06-24 22:02:29 +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
|
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
|
e45afd5c09
|
Added pgp checks for message sending
|
2015-06-21 01:48:25 +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
|
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
|
38ed9188d3
|
Moved ui/windows -> window_list
|
2015-06-15 19:26:28 +01:00 |
|
James Booth
|
9aff8abd2e
|
Merge branch 'master' into openpgp
Conflicts:
.travis.yml
|
2015-06-05 23:02:56 +01:00 |
|
James Booth
|
80665ea051
|
Added rooms iq test
|
2015-05-24 04:13:28 +01:00 |
|
James Booth
|
acd2d2309f
|
Moved pgp signature generation to cl_ev_presence_send
|
2015-05-08 00:07:21 +01:00 |
|
James Booth
|
0db7bcbdcd
|
Merge branch 'master' into openpgp
|
2015-05-07 23:23:45 +01:00 |
|
James Booth
|
ca729cbdf6
|
Merge branch 'master' into plugins
Conflicts:
src/xmpp/roster.c
|
2015-05-07 23:23:38 +01:00 |
|
James Booth
|
d853284f92
|
Added cl_ev_presence_send
|
2015-05-07 23:21:48 +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
|
05aa313bff
|
Merge branch 'master' into plugins
Conflicts:
src/event/client_events.c
|
2015-05-04 01:34:13 +01:00 |
|
James Booth
|
c8eaaa0ce9
|
Added ui_ev_new_private_win to ui events
|
2015-05-04 01:31:27 +01:00 |
|
James Booth
|
b64a5aca10
|
Merge branch 'master' into plugins
Conflicts:
src/event/client_events.c
|
2015-05-04 01:10:20 +01:00 |
|
James Booth
|
b1dd1e2726
|
cl_ev_send_muc_msg takes ProfMucWin as arg
|
2015-05-04 01:06:12 +01:00 |
|
James Booth
|
d0fb792d8b
|
Merge branch 'master' into plugins
Conflicts:
src/event/client_events.c
|
2015-05-04 00:57:13 +01:00 |
|
James Booth
|
ef54ff305e
|
ui_outgoing_chat_msg now takes ProfChatWin as argument
|
2015-05-04 00:55:43 +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
|
0698fda335
|
Merge branch 'master' into plugins
Conflicts:
src/event/client_events.c
|
2015-05-02 23:24:42 +01:00 |
|
James Booth
|
be4ee40ed4
|
Pass ProfChatWin to otr_on_message_send
|
2015-05-02 23:23:12 +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
|
18f25e18d8
|
Merge branch 'master' into plugins
Conflicts:
src/ui/core.c
|
2015-04-30 23:38:14 +01:00 |
|
James Booth
|
e11e55e31a
|
Move current win check to event, removed next and prev win functions
|
2015-04-30 22:43:08 +01:00 |
|
James Booth
|
f34bee8229
|
Merge branch 'master' into plugins
|
2015-04-29 23:16:39 +01:00 |
|
James Booth
|
2e75e54460
|
Added ui_win_error_line()
|
2015-04-29 23:16:28 +01:00 |
|
James Booth
|
43048908d4
|
Merge branch 'master' into plugins
Conflicts:
src/command/commands.c
src/event/client_events.c
src/ui/core.c
|
2015-04-29 23:08:18 +01:00 |
|
James Booth
|
665c34414d
|
Return result on OTR message sending
|
2015-04-29 22:59:44 +01:00 |
|
James Booth
|
0df8b8beff
|
Return new window on new chat win event
|
2015-04-29 22:10:32 +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
|
d3698e6bee
|
Added ui events module
|
2015-04-28 23:53:37 +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
|
70d1756a1c
|
Moved otr message send event to otr module
|
2015-04-27 23:30:33 +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
|
2ef0fdabbd
|
Merge branch 'master' into plugins
|
2015-04-23 23:47:52 +01:00 |
|
James Booth
|
bc9e6b79cd
|
Tidied account login
|
2015-04-23 21:56:48 +01:00 |
|
James Booth
|
837988b2eb
|
Merge branch 'master' into plugins
|
2015-04-22 00:29:53 +01:00 |
|
James Booth
|
ba286c54ef
|
Moved login events to client events module
|
2015-04-22 00:29:37 +01:00 |
|
James Booth
|
4503ee4be0
|
Merge branch 'master' into plugins
Conflicts:
src/command/commands.c
src/event/client_events.c
|
2015-04-21 23:35:33 +01:00 |
|
James Booth
|
88739d5c59
|
Moved new chat win events to client events module
|
2015-04-21 23:28:52 +01:00 |
|
James Booth
|
07908f17ac
|
Merge branch 'master' into plugins
Conflicts:
src/command/commands.c
|
2015-04-21 22:07:53 +01:00 |
|
James Booth
|
53f2a4a35c
|
Moved all message sending to client events module
|
2015-04-21 21:57:39 +01:00 |
|
James Booth
|
bcfbfec583
|
Merge branch 'master' into plugins
Conflicts:
Makefile.am
src/command/commands.c
|
2015-04-19 19:50:06 +01:00 |
|
James Booth
|
32da6548da
|
Added client_events module, reuse message sending code for all commands
|
2015-04-19 19:40:15 +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 |
|