aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-22 19:45:54 -04:00
Code
5,977 Commits 31 Branches 59 Tags 24 MiB
plugins
Commit Graph

238 Commits

Author SHA1 Message Date
James Booth
1a3dc91e11 Highlight room trigger terms 2016-02-13 22:46:25 +00:00
James Booth
c54c494dbf Fix merge 2016-02-04 21:12:20 +00:00
James Booth
43a1b7b45f Merge branch 'master' into plugins 
Conflicts:
	src/event/server_events.c
	src/ui/chatwin.c
	src/ui/notifier.c
 2016-02-04 21:08:19 +00:00
James Booth
6702bb9739 Don't show notification reminders for messages the user does not want notifications for 2016-02-04 01:24:37 +00:00
James Booth
e1962261a9 Tidy notify_room_message() 2016-02-04 00:45:37 +00:00
James Booth
4ddcd86f76 Merge branch 'master' into plugins 
Conflicts:
	src/event/client_events.c
 2016-02-02 23:32:42 +00:00
James Booth
292c9cf454 Handle occupant nick change in private wins 2016-02-02 23:25:26 +00:00
James Booth
3ddef99dfe Handle occupant kicked/banned in private chat wins 2016-02-02 22:25:55 +00:00
James Booth
150015fa3d Show message in private windows when user offline 2016-02-02 21:52:13 +00:00
James Booth
c2fdbe3076 Merge branch 'master' into plugins 2016-01-31 23:13:12 +00:00
James Booth
08c1e62e3c Colour private chats by presence in roster panel 2016-01-31 23:08:14 +00:00
James Booth
97b2b12f23 Merge branch 'master' into plugins 
Conflicts:
	src/event/server_events.c
 2016-01-25 00:34:03 +00:00
James Booth
0ae975c27f Added themes for roster room mention and triggers 
closes #718
 2016-01-25 00:19:26 +00:00
James Booth
b6e9a09c64 Show console messages for room mention and triggers 
closes #719
 2016-01-24 23:47:17 +00:00
James Booth
5ff9fbd810 Tidy handling room mention and room triggers 2016-01-24 23:06:22 +00:00
James Booth
eb5b5c326d Merge branch 'master' into plugins 
Conflicts:
	src/event/server_events.c
	src/window_list.c
 2016-01-24 03:00:12 +00:00
James Booth
67abfaa21e Added private chat to roster rooms 2016-01-24 00:33:24 +00:00
James Booth
1ec7bb4440 Merge branch 'master' into plugins 2016-01-14 22:55:05 +00:00
James Booth
fbc302317a Added roster contact themes 2016-01-14 22:54:50 +00:00
James Booth
6c35d68074 Merge branch 'master' into plugins 2016-01-08 00:23:04 +00:00
James Booth
51f033ae42 End OTR sessions on lost server connection 2016-01-08 00:22:17 +00:00
James Booth
f22b8d8a20 Merge branch 'master' into plugins 
Conflicts:
	src/event/server_events.c
 2016-01-08 00:14:24 +00:00
James Booth
a90e109f7e Destroy roster after updating UI in server disconnect 2016-01-08 00:13:12 +00:00
James Booth
c3d3737bc1 Merge branch 'master' into plugins 
Conflicts:
	src/event/server_events.c
	src/profanity.c
 2016-01-05 01:43:18 +00:00
James Booth
055a5f71ce Added roster struct, create and destroy roster on connect/disconnect 2016-01-05 00:06:50 +00:00
James Booth
4b70f9e43f Merge branch 'master' into plugins 
Conflicts:
	src/command/commands.c
	src/event/client_events.c
 2016-01-03 17:26:48 +00:00
James Booth
8e9bf08389 Add cl_ev_disconnect 2016-01-03 17:23:36 +00:00
James Booth
eb832aed10 Merge branch 'master' into plugins 
Conflicts:
	src/command/commands.c
 2016-01-03 02:23:06 +00:00
James Booth
a713654f93 Fixed compilation without libotr 2016-01-03 02:01:01 +00:00
James Booth
efd9681ae4 Merge branch 'master' into plugins 2016-01-03 01:34:29 +00:00
James Booth
4f35b11471 End OTR session when recipient goes offline 2016-01-03 01:32:37 +00:00
James Booth
06cdf09bd0 Merge branch 'master' into plugins 
Conflicts:
	src/event/server_events.c
 2016-01-02 02:42:47 +00:00
James Booth
8ca3fe4ea8 Sort roster rooms 2016-01-02 02:41:51 +00:00
James Booth
fc92489be1 Merge branch 'master' into plugins 
Conflicts:
	src/event/server_events.c
 2016-01-02 01:39:24 +00:00
James Booth
22a14e1240 Show rooms in roster panel 2016-01-02 01:22:19 +00:00
James Booth
6e42f22bf3 Merge branch 'master' into plugins 
Conflicts:
	src/command/commands.h
 2015-12-30 00:36:53 +00:00
James Booth
6a8656a06b Added /console command 2015-12-29 23:32:32 +00:00
James Booth
8ea228480c Added console MUC message preference 2015-12-29 23:00:49 +00:00
James Booth
443ff426d0 Merge branch 'master' into plugins 2015-12-22 00:04:57 +00:00
Dmitry Podgorny
bea246d81b Don't compile pgp code with --disable-pgp 2015-12-21 12:53:41 +02:00
James Booth
05ea0e6f5a Merge branch 'master' into plugins 
Conflicts:
	src/event/server_events.c
 2015-12-20 02:49:15 +00:00
James Booth
1f56c12377 Added cons_show_incoming_room_message() 2015-12-20 00:54:17 +00:00
James Booth
7f4db0389c Merge branch 'master' into plugins 2015-12-19 22:59:40 +00:00
James Booth
e1f674eca3 Fixed PGP error message 2015-12-19 22:55:33 +00:00
James Booth
57a8170a85 Merge branch 'master' into plugins 
Conflicts:
	src/command/commands.c
	src/xmpp/roster.c
 2015-12-15 00:42:35 +00:00
James Booth
88fd2a25ee Show PGP error strings 2015-12-15 00:38:16 +00:00
James Booth
482eea4fcf Moved sending of initial presence to sv_ev_roster_received 2015-12-14 23:57:06 +00:00
James Booth
be709c3d11 Merge branch 'master' into plugins 2015-11-10 23:28:19 +00:00
James Booth
fcfdc175b6 Allow /quit during TLS certificate verification prompt 2015-11-10 23:14:59 +00:00
James Booth
9c68fb1f75 Merge branch 'master' into plugins 2015-11-10 01:23:48 +00:00
James Booth
9302188a32 Show current TLS certificate 2015-11-10 01:20:40 +00:00
James Booth
dc8e885357 Merge branch 'master' into plugins 2015-11-09 23:31:51 +00:00
James Booth
bee27f4773 Added /tls cert to show current certificate fingerprint 2015-11-09 23:31:21 +00:00
James Booth
a6d4e88b98 Merge branch 'master' into plugins 2015-11-09 20:57:54 +00:00
James Booth
4cbfb88814 Store current TLS certificate fingerpint in memory for reconnect 2015-11-09 20:57:26 +00:00
James Booth
a575549fc6 Merge branch 'master' into plugins 
Conflicts:
	src/event/client_events.c
	src/event/server_events.c
 2015-11-08 22:15:44 +00:00
James Booth
60215cdf9d Renamed MUC private window functions 2015-11-08 22:08:29 +00:00
James Booth
8a397263dd ui_incoming_private_msg takes ProfPrivateWin, added asserts 2015-11-08 22:01:51 +00:00
James Booth
bf10705cb7 Merge branch 'master' into plugins 
Conflicts:
	src/event/server_events.c
 2015-11-02 01:11:54 +00:00
James Booth
2e81a4efa3 mucwin_broadcast takes ProfMucWin 2015-11-02 00:36:25 +00:00
James Booth
23ada0d38b mucwin_subject takes ProfMucWin 2015-11-02 00:29:35 +00:00
James Booth
0592c7f9e9 mucwin_requires_config takes ProfMucWin 2015-11-02 00:26:56 +00:00
James Booth
986741dea8 mucwin_message takes ProfMucWin 2015-11-02 00:24:19 +00:00
James Booth
e68784be43 mucwin_history takes ProfMucWin 2015-11-02 00:19:46 +00:00
James Booth
6ed72d8a35 mucwin_nick_change takes ProfMucWin 2015-11-02 00:17:46 +00:00
James Booth
42643391a4 mucwin_occupant_nick_change takes ProfMucWin 2015-11-02 00:16:01 +00:00
James Booth
b3150ef8e1 mucwin_occupant_presence takes ProfMucWin 2015-11-02 00:14:16 +00:00
James Booth
d505a92d1e mucwin_occupant_online takes ProfMucWin 2015-11-01 23:52:16 +00:00
James Booth
3a98bf315c mucwin_occupant_banned takes ProfMucWin 2015-11-01 23:49:45 +00:00
James Booth
cc498110e2 mucwin_occupant_kicked takes ProfMucWin 2015-11-01 23:47:59 +00:00
James Booth
24f283e960 mucwin_occupant_offline takes ProfMucWin 2015-11-01 23:45:54 +00:00
James Booth
8b4bb1c7f1 mucwin_roster takes ProfMucWin 2015-11-01 23:41:45 +00:00
James Booth
cb587b0772 Tidy sv_ev_muc_occupant_online 2015-11-01 23:26:47 +00:00
James Booth
ed9585376e mucwin_occupant_role_and_affiliation_change takes ProfMucWin 2015-11-01 23:23:49 +00:00
James Booth
799c064dff mucwin_occupant_affiliation_change takes ProfMucWin 2015-11-01 23:14:27 +00:00
James Booth
288c1a9d6e mucwin_occupant_role_change takes ProfMucWin 2015-11-01 23:12:35 +00:00
James Booth
22cd5b433f Tidy sv_ev_muc_self_online 2015-11-01 23:10:07 +00:00
James Booth
6ea9314f98 mucwin_role_and_affiliation_change takes ProfMucWin 2015-11-01 23:08:02 +00:00
James Booth
c0fc7b51e3 mucwin_affiliation_change takes ProfMucWin 2015-11-01 22:46:24 +00:00
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