4690 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Booth	5e47377dfd	Merge branch 'master' into osx-functional	2016-04-27 01:39:57 +01:00
James Booth	5687c3e419	Free inputrc string ... fixes #797	2016-04-27 01:36:14 +01:00
James Booth	282872c746	Merge branch 'master' into osx-functional	2016-04-27 00:43:16 +01:00
James Booth	a7524bc3a7	Fixed typo	2016-04-27 00:42:58 +01:00
James Booth	d24c05b301	Merge remote-tracking branch 'origin/osx-functional' into osx-functional	2016-04-27 00:41:28 +01:00
James Booth	aa9104644a	Merge branch 'master' into osx-functional	2016-04-27 00:41:15 +01:00
James Booth	2614b7adc3	Updated CHANGELOG	2016-04-27 00:40:53 +01:00
James Booth	38652efb19	Fixed tests	2016-04-27 00:30:33 +01:00
James Booth	ce32814679	Updated Command structure comments	2016-04-27 00:03:24 +01:00
James Booth	d4aa73159e	Merge branch 'master' into subcmds	2016-04-26 23:56:12 +01:00
James Booth	35623df641	Merge branch 'master' into osx-functional	2016-04-26 23:37:16 +01:00
James Booth	043a673fe1	Merge remote-tracking branch 'asdil12/xep_0363_http_file_upload'	2016-04-26 23:30:26 +01:00
James Booth	4ca6296fb7	Fix OSX compile	2016-04-26 23:50:56 +02:00
James Booth	65960dfbb2	Fixed cygwin compile (again)	2016-04-26 23:50:56 +02:00
James Booth	9d263d7c83	Fixed cygwin compile	2016-04-26 23:50:55 +02:00
James Booth	261bbd3fc0	Removed only add -lgio-2.0 manually on OSX	2016-04-26 23:50:55 +02: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	0ff29b3d2e	Added sub commands to command structure	2016-04-26 20:29:45 +01:00
Dominik Heidler	28e260c7da	Cache all disco items and features on connect	2016-04-20 00:19:40 +02:00
James Booth	ae14d46739	Merge branch 'master' into osx-functional	2016-04-18 00:37:49 +01:00
James Booth	20a0313d17	Show correct tray icon immediately on enable	2016-04-18 00:35:03 +01:00
James Booth	12727744ab	Load/destroy tray icons on init/shutdown	2016-04-18 00:26:17 +01:00
James Booth	de65f505a8	Moved gtk specific code to tray.c	2016-04-18 00:07:15 +01:00
James Booth	507ea5746c	Grouped tray icon initialisation code	2016-04-17 23:57:05 +01:00
James Booth	43d1509c52	Merge branch 'master' into osx-functional	2016-04-17 23:47:43 +01:00
James Booth	153552ed07	Remove redundant return value from _cmd_set_boolean_preference	2016-04-17 23:46:29 +01:00
James Booth	35a471baa7	Merge branch 'master' into osx-functional	2016-04-17 23:36:43 +01:00
James Booth	2daa02cb60	Merge remote-tracking branch 'asdil12/tray_config'	2016-04-17 23:17:43 +01:00
Dominik Heidler	4cb1d73a83	Make tray icon configurable using /tray cmd	2016-04-16 16:29:32 +02:00
James Booth	4004e032fc	Merge branch 'master' into osx-functional	2016-04-15 23:03:22 +01:00
James Booth	6cc04bc3ba	Merge branch 'muc-hooks'	2016-04-15 22:58:32 +01:00
James Booth	feeac48cf3	Merge remote-tracking branch 'asdil12/help'	2016-04-15 22:50:00 +01:00
James Booth	ec4bcb9b9d	Merge branch 'master' into muc-hooks	2016-04-15 22:40:32 +01:00
James Booth	974e325aed	Merge branch 'master' into osx-functional	2016-04-15 22:40:17 +01:00
James Booth	8f009c3c8d	Plugins fixed return values for python stanza hooks	2016-04-15 22:37:44 +01:00
James Booth	d90c47f287	Plugins: Added more muc hooks	2016-04-15 22:24:50 +01:00
Dominik Heidler	02bad7af28	Add /command? shortcut to view /help command	2016-04-13 10:47:53 +02:00
James Booth	c33e2abc81	Merge branch 'master' into osx-functional	2016-04-13 00:19:59 +01:00
James Booth	b3a3351a35	Plugins: Added account_name and fulljid to prof_init hook	2016-04-13 00:10:37 +01:00
James Booth	4849e097d3	Merge branch 'master' into osx-functional	2016-04-12 23:26:31 +01:00
James Booth	46687aeced	Only complete unloaded plugins on /plugins load	2016-04-12 23:25:31 +01:00
James Booth	df11b1a211	Merge branch 'master' into osx-functional	2016-04-12 23:01:55 +01:00
James Booth	1a73aa39cb	Merge remote-tracking branch 'origin/python-path'	2016-04-12 22:53:17 +01:00
James Booth	8ff9fd7091	Execute python string to append plugin path	2016-04-12 02:31:28 +01:00
James Booth	c70833c813	Merge branch 'master' into osx-functional	2016-04-11 01:07:55 +01:00
James Booth	eeb0f71cbf	Updated CHANGELOG	2016-04-11 01:03:37 +01:00
James Booth	88a1655bb1	Merge branch 'master' into osx-functional	2016-04-11 00:30:26 +01:00
James Booth	697db019d5	Merge remote-tracking branch 'Dav1d23/master' ... Conflicts: Makefile.am install-all.sh	2016-04-11 00:23:36 +01:00