3333 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Booth	fe6a54f253	Merge branch 'master' into readline	2015-03-04 23:43:48 +00:00
James Booth	7638f379ca	Fixed tests for --disable-otr	2015-03-04 23:32:47 +00:00
James Booth	303f415306	Merge branch 'master' into readline	2015-03-04 22:38:32 +00:00
James Booth	5e1ad0b0d2	Added profanity.sh (OSX helper script for codelite) to .gitignore	2015-03-04 22:37:42 +00:00
James Booth	b01b5d7077	Merge remote-tracking branch 'origin/master' into readline	2015-03-04 18:46:11 +00:00
James Booth	0dee898c01	Set version to 0.4.7 development	2015-03-04 00:45:42 +00:00
James Booth	f80689dd35	Set version to 0.4.6	2015-03-03 22:22:28 +00:00
James Booth	1a493823d4	Merge branch 'master' into readline	2015-03-03 22:12:32 +00:00
James Booth	6be4b400b8	Fixed swapping windows when in source win	2015-03-03 22:10:01 +00:00
James Booth	d0a8ff5521	Merge branch 'master' into readline	2015-02-26 23:27:37 +00:00
James Booth	30b5f112fd	Updated themes for release	2015-02-26 23:23:15 +00:00
James Booth	2112ddea65	Merge branch 'master' into readline	2015-02-26 00:50:49 +00:00
James Booth	cbdfc09a84	Renamed /theme set -> /theme load	2015-02-26 00:49:21 +00:00
Olivier LE MOAL	d89112e138	Upgrade CMocka to 1.0.0	2015-02-25 10:10:30 +01:00
James Booth	a809dc9131	Merge branch 'master' into readline	2015-02-25 00:04:35 +00:00
James Booth	22daac5fe9	Upgrade otr warn preference, added UI theme settings	2015-02-25 00:01:41 +00:00
James Booth	7ae71391de	Merge branch 'master' into readline	2015-02-24 22:58:19 +00:00
James Booth	68a8ab3401	Updated default preferences	2015-02-24 22:53:57 +00:00
James Booth	84c02ffb72	Added /roster by preference to UI preferences summary	2015-02-24 22:24:20 +00:00
James Booth	9a408024d3	Merge branch 'master' into readline	2015-02-24 21:47:49 +00:00
James Booth	434fb1878b	Fixed /resource preference display	2015-02-24 21:42:43 +00:00
James Booth	2cba6798de	Merge branch 'master' into readline	2015-02-23 23:54:01 +00:00
James Booth	f5686cab1e	Fixed create_fulljid	2015-02-23 23:52:53 +00:00
James Booth	93b5ca7a1f	Merge branch 'master' into readline	2015-02-23 23:46:40 +00:00
James Booth	70b923a7fc	Lowercase barejid in Jid	2015-02-23 23:44:34 +00:00
James Booth	b0176d050f	Lowercase barejid before searching roster	2015-02-23 23:30:13 +00:00
James Booth	e22547fb19	Merge branch 'master' into readline	2015-02-23 23:14:55 +00:00
James Booth	a2a187892b	Lowercase barejid before adding to roster	2015-02-23 23:12:44 +00:00
Olivier LE MOAL	ced5a8c2e0	merge	2015-02-23 10:47:54 +01:00
James Booth	7454bede8b	Merge branch 'master' into readline	2015-02-23 00:50:58 +00:00
James Booth	2f4d66ea6e	Merge remote-tracking branch 'stormc/master-spellfixes' ... Conflicts: src/command/command.c	2015-02-23 00:49:56 +00:00
James Booth	95e7bd5a84	Merge branch 'master' into readline	2015-02-23 00:39:56 +00:00
James Booth	cd084c7e46	Updated CHANGELOG	2015-02-23 00:37:46 +00:00
James Booth	4652a70744	Merge branch 'master' into readline	2015-02-23 00:27:47 +00:00
James Booth	ba22baba90	Updated .travis.yml to use cmocka-1.0.0	2015-02-23 00:24:24 +00:00
James Booth	6979786ace	Merge branch 'master' into readline	2015-02-23 00:17:24 +00:00
James Booth	c249a60cba	Finished help tidy	2015-02-23 00:15:33 +00:00
Olivier Le Moal	3eeafa2277	fix segfault on self sent message carbon	2015-02-21 22:22:21 +01:00
Christian Storm	a1d14c4526	Fixed spelling.	2015-02-17 10:52:37 +01:00
James Booth	475ec97f99	Merge branch 'master' into readline	2015-02-16 22:53:15 +00:00
James Booth	0997bafeb9	Removed comment	2015-02-16 22:52:18 +00:00
James Booth	1a59c6e745	Merge branch 'master' into readline	2015-02-16 22:38:45 +00:00
James Booth	2605b84a70	Tidy help	2015-02-16 22:37:17 +00:00
James Booth	32b8ead198	Merge branch 'master' into readline	2015-02-14 20:46:11 +00:00
James Booth	965187edef	Merge remote-tracking branch 'origin/master'	2015-02-14 16:22:45 +00:00
James Booth	c9a6e10c26	Use single quotes for terminal notifier notifications to avoid variable expansion	2015-02-14 16:20:15 +00:00
James Booth	d02b364b3c	Tidy help	2015-02-11 23:58:11 +00:00
James Booth	0ce2edf5d8	Merge branch 'master' into readline	2015-02-11 00:18:32 +00:00
James Booth	9951da0c8f	Free jid on caps response handler	2015-02-11 00:17:07 +00:00
James Booth	b24510c776	Merge branch 'master' into readline ... Conflicts: src/tools/history.c src/tools/history.h	2015-02-11 00:09:58 +00:00