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

4777 Commits

Author SHA1 Message Date
James Booth
3dd5c3b2c3 Updated copyright 2016-02-14 23:12:01 +00:00
James Booth
f79da2dbcc Merge branch 'master' into plugins-c 2016-02-14 23:09:28 +00:00
James Booth
ae46e647bf Updated LICENSE.txt 2016-02-14 23:03:22 +00:00
James Booth
1f90aca503 Merge branch 'master' into plugins-c
Conflicts:
	src/main.c
	src/ui/console.c
2016-02-14 23:00:52 +00:00
James Booth
d086154022 Merge remote-tracking branch 'origin/osx-functional' into osx-functional 2016-02-14 22:59:05 +00:00
James Booth
2006f8d6b3 Merge branch 'master' into osx-functional 2016-02-14 22:59:00 +00:00
James Booth
e53e94f1e2 Updated copyright 2016-02-14 22:54:46 +00:00
James Booth
41fe8c22b1 Added C plugin code from plugins branch 2016-02-14 22:28:55 +00:00
James Booth
cca929f586 Merge branch 'master' into osx-functional 2016-02-14 02:03:26 +00:00
James Booth
f887a35c0c Fixed memory deallocations 2016-02-14 01:59:53 +00:00
James Booth
d7b331874a Fix memory leaks 2016-02-14 01:49:57 +00:00
James Booth
7a19ee822b Fixed theme defaults memory release 2016-02-14 01:37:13 +00:00
James Booth
87e3530e22 Added missing prefs_free_string() 2016-02-14 01:34:34 +00:00
James Booth
e1546f4c9f Merge branch 'master' into osx-functional 2016-02-13 23:26:36 +00:00
James Booth
c3dfd6d35a Highlight longer triggers first 2016-02-13 22:55:57 +00:00
James Booth
1a3dc91e11 Highlight room trigger terms 2016-02-13 22:46:25 +00:00
James Booth
b23f2f55ce Merge branch 'master' into osx-functional 2016-02-11 00:47:16 +00:00
James Booth
2f82f50a35 Added roommention.term theme option 2016-02-10 23:03:23 +00:00
James Booth
71679a3159 Added mention and trigger themes for console 2016-02-10 21:38:28 +00:00
James Booth
7bdc46c012 Updated boothj5 theme 2016-02-10 21:14:18 +00:00
James Booth
6d518327a3 Fixed /role and /affiliation help 2016-02-07 19:32:23 +00:00
James Booth
2d1553f720 Merge branch 'master' into osx-functional 2016-02-07 01:17:23 +00:00
James Booth
62b0cdd8fd Fix room notification reminders 2016-02-07 01:15:40 +00:00
James Booth
abc2f0de39 Added /roster show|hide unsubscribed 2016-02-07 00:49:48 +00:00
James Booth
b0b318f80f Merge branch 'master' into osx-functional 2016-02-04 21:11: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
c14ef33906 Tidy notify_message() 2016-02-04 00:41:53 +00:00
James Booth
f8f9ad5197 Tidy prefs_do_chat_notify() 2016-02-04 00:35:10 +00:00
James Booth
8342265607 Removed unused arg: prefs_do_chat_notify() 2016-02-04 00:21:38 +00:00
James Booth
2a386ffcbc Merge branch 'master' into osx-functional 2016-02-03 23:41:28 +00:00
James Booth
bab75cae15 Implemented /console private setting 2016-02-03 23:39:20 +00:00
James Booth
19a3066e28 Implemented /console chat setting 2016-02-03 23:16:42 +00:00
James Booth
72c1c49695 Added console.chat preference 2016-02-03 23:02:52 +00:00
James Booth
003cdcf3fb Added /console chat autocompletion 2016-02-03 22:47:22 +00:00
James Booth
629d949692 Merge branch 'master' into osx-functional 2016-02-03 22:22:29 +00:00
James Booth
30116dd922 Update autocompleters on roster nick change/clear
fixes #720
2016-02-03 22:19:29 +00:00
James Booth
4e0884d242 Merge branch 'master' into osx-functional 2016-02-03 00:37:51 +00:00
James Booth
46b27bcbd8 Fixed help formatting 2016-02-03 00:37:05 +00:00
James Booth
d968f03c4e Merge branch 'master' into osx-functional 2016-02-03 00:16:22 +00:00
James Booth
72574bb944 Fixed tests 2016-02-03 00:13:49 +00:00
James Booth
77e819e81a Handle self leaving room in private wins 2016-02-03 00:11:38 +00:00
James Booth
62783766a8 Merge branch 'master' into osx-functional 2016-02-02 23:34:03 +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
1d3620da3f Merge branch 'master' into osx-functional 2016-02-01 01:42:52 +00:00
James Booth
f0837abf0a Updated themes 2016-02-01 01:42:09 +00:00
James Booth
301bf6de7c Merge branch 'master' into osx-functional 2016-02-01 01:12:15 +00:00
James Booth
f91b21a1d6 Allow splitting roster rooms by conference server 2016-02-01 01:11:01 +00:00