4291 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Booth	479eaa5280	Merge branch 'master' into osx-functional	2015-11-24 00:07:37 +00:00
James Booth	a2f5e921f2	Added conf_string_list_add	2015-11-24 00:02:21 +00:00
James Booth	97d1b964c3	Created config/conflists.c for shared config list handling	2015-11-23 23:54:14 +00:00
James Booth	b79d77409f	Added notify triggers WIP	2015-11-23 23:43:53 +00:00
James Booth	6a30ea863d	Merge branch 'master' into osx-functional	2015-11-23 21:33:48 +00:00
James Booth	e8c0eeda8b	Show error message when OTR key cannot be loaded	2015-11-23 21:24:31 +00:00
James Booth	ea7a3746e2	Merge branch 'master' into osx-functional	2015-11-22 19:54:44 +00:00
James Booth	bf1e7efe23	Show summary of trusted certificates, add /tls cert <fingerprint> ... fixes #676	2015-11-22 19:53:41 +00:00
James Booth	a0d40bf0e9	Merge branch 'master' into osx-functional	2015-11-22 17:49:44 +00:00
James Booth	216493ef07	Tidied roster commands	2015-11-22 17:45:38 +00:00
James Booth	0f22179eef	Added /roster resource join	2015-11-22 16:37:05 +00:00
James Booth	913f3a3c4a	Merge branch 'master' into osx-functional	2015-11-22 02:27:45 +00:00
James Booth	0a0226186a	Removed whitespace from boothj5 theme	2015-11-22 02:26:24 +00:00
James Booth	ce4aa34990	Merge branch 'master' into osx-functional	2015-11-22 02:06:26 +00:00
James Booth	c4e8af0b6d	Added /roster char resource	2015-11-22 02:04:59 +00:00
James Booth	6a92853b43	Merge branch 'master' into osx-functional	2015-11-22 01:52:05 +00:00
James Booth	fade5469df	Updated help	2015-11-22 01:51:32 +00:00
James Booth	5f89d867e1	Merge branch 'master' into osx-functional	2015-11-22 01:42:34 +00:00
James Booth	8413020ab4	Updated themes	2015-11-22 01:42:01 +00:00
James Booth	86728bf987	Merge branch 'master' into osx-functional	2015-11-22 01:40:38 +00:00
James Booth	3bc9275079	Added word wrap to roster panel	2015-11-22 01:39:20 +00:00
James Booth	7e0ebc1de4	Merge branch 'master' into osx-functional	2015-11-22 01:03:54 +00:00
James Booth	0763bfc9f4	Pass wrap boolean to win_sub_print()	2015-11-22 01:00:14 +00:00
James Booth	3d1299eb1e	Renamed subwin functions	2015-11-22 00:54:40 +00:00
James Booth	b4482b9fe1	Updated themes	2015-11-22 00:48:18 +00:00
James Booth	7a324abcd6	Option to show presence information on single line in roster	2015-11-22 00:30:42 +00:00
James Booth	5c08bea8d0	Added /roster indent presence	2015-11-21 22:03:43 +00:00
James Booth	ef0f093efd	Added /roster indent resource	2015-11-21 21:49:12 +00:00
James Booth	f54c2e8eca	Tidy rosterwin	2015-11-21 21:20:12 +00:00
James Booth	b73ff08a72	Free pref strings	2015-11-21 21:19:28 +00:00
James Booth	4b022687fa	Added /roster indent contact	2015-11-21 21:03:53 +00:00
James Booth	86bb201914	Merge branch 'master' into osx-functional	2015-11-20 01:32:00 +00:00
James Booth	6935862195	Don't print empty line when no presence or status displayed in roster	2015-11-20 01:30:49 +00:00
James Booth	99b4fff949	Merge remote-tracking branch 'kiethandi/patch-2'	2015-11-20 00:38:08 +00:00
kiethandi	f948337103	Update privwin.c	2015-11-20 00:34:03 +00:00
James Booth	99facc1e77	Merge branch 'master' into osx-functional	2015-11-20 00:21:42 +00:00
James Booth	548f9394be	Removed unused priority settings	2015-11-20 00:18:13 +00:00
kiethandi	2c8c394595	Update privwin.c ... Take 2 added include.	2015-11-20 00:16:51 +00:00
James Booth	6315707c18	Merge branch 'master' into osx-functional	2015-11-20 00:07:44 +00:00
James Booth	16fbdedceb	Added /roster char contact	2015-11-20 00:06:46 +00:00
James Booth	3f18c8c35d	Added missing include	2015-11-19 23:32:11 +00:00
James Booth	316b6a7b8b	Added /roster char header	2015-11-19 23:21:51 +00:00
James Booth	d96d263061	Merge branch 'master' into osx-functional	2015-11-19 01:02:42 +00:00
James Booth	78a8487892	Fixed /roster help	2015-11-19 01:02:13 +00:00
James Booth	12417828fa	Merge branch 'master' into osx-functional	2015-11-19 00:45:57 +00:00
James Booth	4eb0f14a3d	Changed roster defaults, updated themes	2015-11-19 00:45:03 +00:00
James Booth	522b9ab6be	Show status when show presence disabled	2015-11-18 23:00:06 +00:00
James Booth	8e84d160e6	Added option to show resource priority in roster	2015-11-18 02:14:11 +00:00
James Booth	4505102fa8	Added roster count option	2015-11-18 02:02:49 +00:00
James Booth	edbd2d5843	Don't show offline below contact	2015-11-18 01:10:03 +00:00