731 Commits

Author	SHA1	Message	Date
James Booth	aa9104644a	Merge branch 'master' into osx-functional	2016-04-27 00:41:15 +01:00
James Booth	38652efb19	Fixed tests	2016-04-27 00:30:33 +01:00
James Booth	fcf486d6b2	Added include to fix tests	2016-04-26 23:50:55 +02:00
James Booth	167553ae8f	Fixed functional test ID based stubs	2016-04-26 23:50:55 +02:00
Dominik Heidler	1b0ce852bb	Implement XEP-0363: HTTP File Upload	2016-04-26 23:50:55 +02:00
James Booth	2daa02cb60	Merge remote-tracking branch 'asdil12/tray_config'	2016-04-17 23:17:43 +01:00
James Booth	101eb2252c	Merge branch 'master' into osx-functional	2016-04-07 01:06:01 +01:00
James Booth	f243e333fc	Added whole word matches for room mention	2016-04-07 01:01:27 +01:00
James Booth	d9344b00fe	Added prof_strstr function	2016-04-03 22:30:24 +01:00
James Booth	c5e26526c8	Merge branch 'master' into osx-functional	2016-03-31 21:05:20 +01:00
James Booth	9b177a9e01	Removed #AX_PREFIX_CONFIG_H	2016-03-31 21:05:02 +01:00
James Booth	d613a36bfe	Merge branch 'master' into osx-functional	2016-03-23 22:59:39 +00:00
James Booth	4c913aa08b	Added prof_send_stanza to plugins API	2016-03-23 22:57:03 +00:00
James Booth	1db956ae7c	Merge branch 'master' into osx-functional	2016-03-22 00:31:34 +00:00
James Booth	6f537c3818	Add PGP decryption for incoming/outgoing carbons	2016-03-22 00:20:29 +00:00
James Booth	8e15527079	Merge branch 'master' into osx-functional ... Conflicts: .travis.yml	2016-02-24 00:10:37 +00:00
James Booth	639623d625	Tidied cons_show_help	2016-02-18 20:52:52 +00:00
James Booth	a14b7815ae	Added new help format to c plugins WIP	2016-02-18 01:20:37 +00:00
James Booth	2006f8d6b3	Merge branch 'master' into osx-functional	2016-02-14 22:59:00 +00:00
James Booth	41fe8c22b1	Added C plugin code from plugins branch	2016-02-14 22:28:55 +00:00
James Booth	1a3dc91e11	Highlight room trigger terms	2016-02-13 22:46:25 +00:00
James Booth	62b0cdd8fd	Fix room notification reminders	2016-02-07 01:15:40 +00:00
James Booth	2a386ffcbc	Merge branch 'master' into osx-functional	2016-02-03 23:41:28 +00:00
James Booth	19a3066e28	Implemented /console chat setting	2016-02-03 23:16:42 +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	62783766a8	Merge branch 'master' into osx-functional	2016-02-02 23:34:03 +00:00
James Booth	3ddef99dfe	Handle occupant kicked/banned in private chat wins	2016-02-02 22:25:55 +00:00
James Booth	24ee027da2	Merge branch 'master' into osx-functional	2016-01-31 02:48:45 +00:00
James Booth	e816b124ee	Removed unused arg from roster_get_ functions	2016-01-31 02:33:44 +00:00
James Booth	42b1918ea0	Merge branch 'master' into osx-functional	2016-01-31 00:44:10 +00:00
James Booth	7c1db22fac	Fixed assertion errors in tests	2016-01-30 22:49:44 +00:00
James Booth	40297da067	Merge branch 'master' into osx-functional	2016-01-25 00:35:42 +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	6281196809	Fixed tests	2016-01-24 23:08:29 +00:00
James Booth	aa111bc07b	Merge branch 'master' into osx-functional	2016-01-23 23:04:41 +00:00
James Booth	53fc89f711	Added account theme property	2016-01-22 01:06:28 +00:00
James Booth	adb470c454	WIP: Add /theme properties command	2016-01-21 00:50:55 +00:00
James Booth	700ff23188	Merge branch 'master' into osx-functional	2016-01-05 01:46:53 +00:00
James Booth	393e690165	Merge branch 'master' into roster-struct	2016-01-05 01:38:31 +00:00
James Booth	79674fd16c	Merge branch 'master' into osx-functional	2016-01-05 01:35:07 +00:00
James Booth	e1e0fda8b3	Call UI disconnect functions before disconnecting with /disconnect ... fixes #703	2016-01-05 01:30:32 +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	05fdbb342c	Merge branch 'master' into osx-functional	2016-01-01 19:57:56 +00:00
James Booth	94b0d2c6da	Added hardcoded autoping timeout	2015-12-31 01:48:04 +00:00
James Booth	43b1329b48	Merge branch 'master' into osx-functional	2015-12-30 00:37:55 +00:00
James Booth	69ac809776	Added functional tests for /console command	2015-12-30 00:32:52 +00:00
James Booth	7f98e013e1	Use single quotes in functional test stanzas	2015-12-30 00:12:24 +00:00
James Booth	6a8656a06b	Added /console command	2015-12-29 23:32:32 +00:00
James Booth	c963ac3bb2	Merge branch 'master' into osx-functional	2015-12-22 00:46:09 +00:00