1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Commit Graph

4828 Commits

Author SHA1 Message Date
James Booth
17efa01468 Merge branch 'master' into clear 2017-01-16 00:22:56 +00:00
James Booth
70e831e08b Fix tests 2017-01-16 00:21:57 +00:00
James Booth
0d0578b625 Fix compile 2017-01-16 00:07:17 +00:00
James Booth
fb10c588e5 Merge remote-tracking branch 'origin/clear' into clear 2017-01-16 00:01:55 +00:00
James Booth
1da55c310b Merge remote-tracking branch 'origin/master' into clear 2017-01-16 00:01:51 +00:00
James Booth
2b7894ccff Remove status from cl_ev_presence_send
fixes #888
2017-01-15 23:59:31 +00:00
James Booth
7d524cb574 Merge branch 'master' into clear 2016-11-24 00:09:47 +00:00
James Booth
b64646979e Remove unused function 2016-11-24 00:09:14 +00:00
James Booth
52e12d7761 Merge branch 'master' into clear 2016-11-23 00:18:27 +00:00
James Booth
926d935e26 Fix help tags for /account 2016-11-23 00:17:50 +00:00
James Booth
03a1d9c2ac Merge branch 'master' into clear 2016-11-22 00:40:59 +00:00
James Booth
e043029a50 Allow clearing account resource
issue #880
2016-11-22 00:39:52 +00:00
James Booth
edf9ab14a2 Merge branch 'master' into clear 2016-11-20 02:22:32 +00:00
James Booth
c441dbfa42 Fix typo 2016-11-20 02:21:22 +00:00
James Booth
7f7919ee33 Merge remote-tracking branch 'origin/clear' into clear 2016-11-20 02:18:30 +00:00
James Booth
d3a2119f8b Merge remote-tracking branch 'origin/master' into clear 2016-11-20 02:18:03 +00:00
James Booth
609d05366c Use server features for account muc service
issue #878
2016-11-20 02:09:34 +00:00
James Booth
d6444ec55b Merge branch 'master' into clear 2016-11-07 00:19:48 +00:00
James Booth
44979ac754 Update CHANGELOG 2016-11-06 23:09:00 +00:00
James Booth
24f3ad143c Merge remote-tracking branch 'origin/master' 2016-11-06 23:02:02 +00:00
James Booth
8008d8c3c6 Add get_room_nick to plugins api 2016-11-06 23:01:16 +00:00
James Booth
d88878d32f Update CHANGELOG 2016-11-06 22:34:07 +00:00
James Booth
e514853f29 Merge branch 'master' into clear 2016-10-30 17:23:40 +00:00
James Booth
ffa01a1a4c Add main.help.header to themes 2016-10-30 17:06:06 +00:00
James Booth
9516049e28 Merge remote-tracking branch 'lactide/master' 2016-10-30 16:50:44 +00:00
Frank Zschockelt
c0f099cb84 Added main.help.header theme option 2016-10-29 18:19:12 +02:00
James Booth
eac6b52e05 Fix typo 2016-10-29 13:06:50 +01:00
James Booth
912c3345a7 Merge branch 'master' into clear 2016-10-18 00:18:52 +01:00
James Booth
a8ad394ee3 Update CHANGELOG 2016-10-18 00:18:11 +01:00
James Booth
308bc13f5b Merge branch 'master' into clear 2016-10-17 23:53:27 +01:00
James Booth
5b464f4cb0 Add /tls certpath default
issue #871
2016-10-17 23:48:03 +01:00
James Booth
0e1df8c542 Update theme boothj5_laptop 2016-10-16 22:56:52 +01:00
James Booth
3671dbb576 Update theme boothj5_laptop 2016-10-16 22:52:32 +01:00
James Booth
04e0a53381 Remove unused functions 2016-10-16 22:34:27 +01:00
James Booth
503e0ae38e Fix time.xmlconsole in themes 2016-10-16 22:20:36 +01:00
James Booth
333403d2e5 Remove ui_current_print_formatted_line 2016-10-16 22:13:49 +01:00
James Booth
769e71b17b Remove ui_current_print_line 2016-10-16 21:45:48 +01:00
James Booth
257d2d4f4f Remove unused function prototypes 2016-10-16 20:12:49 +01:00
James Booth
8fd9f9e201 Remove unused function prototype 2016-10-16 19:51:56 +01:00
James Booth
721dd050df Remove cons_show_word 2016-10-16 19:48:41 +01:00
James Booth
2032978ff6 Remove cons_show_time 2016-10-16 19:45:06 +01:00
James Booth
651541d7ec Rename buffer functions 2016-10-16 19:40:43 +01:00
James Booth
7e6e6296f1 Update boothj5_laptop theme 2016-10-16 19:37:23 +01:00
James Booth
5ede33a3b6 Add boothj5_laptop theme 2016-10-16 19:33:27 +01:00
James Booth
cb26bb4e1e Merge branch 'master' into clear
Conflicts:
	src/ui/window.c
2016-10-15 22:24:33 +01:00
James Booth
7ad722ae28 Fix win_append buffer push 2016-10-15 22:17:16 +01:00
James Booth
bb6540f7d8 Add win highlight fuctions 2016-10-15 22:12:07 +01:00
James Booth
f3aebd547c Use varargs in win_println_indent 2016-10-15 21:05:26 +01:00
James Booth
c814cb44b8 Add win_print_history 2016-10-15 20:55:45 +01:00
James Booth
f761d403b3 Use win_print_outgoing for carbons 2016-10-15 20:13:21 +01:00