2558 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Booth	efda72d60c	Merge branch 'master' into plugins ... Conflicts: src/command/command.c	2014-05-20 00:12:00 +01:00
James Booth	1f88ca5032	Set version to 0.5.0 development	2014-05-19 21:48:18 +01:00
James Booth	6e23004196	Set status to release	2014-05-19 21:46:42 +01:00
James Booth	0166454794	Added config.h to files checking for OTR support	2014-05-19 21:25:21 +01:00
James Booth	7b4eaa1c23	Added config.h to mock_otr.c	2014-05-19 21:15:17 +01:00
James Booth	e10ea1be4e	Fixed OTR dependency when library not present, changed version to 0.4.2	2014-05-19 20:41:19 +01:00
James Booth	5419a50cfe	Merge branch 'master' into plugins	2014-05-18 16:50:23 +01:00
James Booth	3fb5649ccc	Set version to 0.5.0 development	2014-05-18 16:29:58 +01:00
James Booth	f5a1cb717d	Set status to 0.4.1 release	2014-05-18 16:28:37 +01:00
James Booth	aa7eeabe12	Merge pull request #350 from cara-bones/master ... spelling corrections	2014-05-18 16:25:12 +01:00
James Booth	8551ce87ea	Merge branch 'master' into plugins ... Conflicts: configure.ac	2014-05-18 02:40:09 +01:00
cara marie	058ce13aec	spelling corrections	2014-05-17 18:19:30 -07:00
James Booth	7adf345358	Set status to 0.5.0 dev	2014-05-18 02:11:39 +01:00
James Booth	e467e91302	Set status to release	2014-05-18 02:09:02 +01:00
James Booth	47d0014107	Updated spec file	2014-05-18 02:08:28 +01:00
James Booth	ccb96257b4	Merge branch 'master' into plugins	2014-05-18 00:43:55 +01:00
James Booth	10a8798973	Corrected bookmark help	2014-05-17 23:20:23 +01:00
James Booth	ccd68b6403	Merge branch 'master' into plugins	2014-05-17 23:04:20 +01:00
James Booth	cb614ec36f	Free autocomplete hash table	2014-05-17 22:49:24 +01:00
James Booth	9cb9952bd3	Merge branch 'master' into plugins	2014-05-14 21:57:23 +01:00
James Booth	e762d80b68	Use hash table for autocomplete functions	2014-05-14 21:54:38 +01:00
James Booth	75898a777a	More tidy of bookmark autocomplete	2014-05-14 21:01:54 +01:00
James Booth	bd55e7a978	Tidied bookmark autocompleter	2014-05-14 20:53:31 +01:00
James Booth	506ce9cb13	Added autocomplete for bookmark autojoin	2014-05-14 20:49:25 +01:00
James Booth	ea118e4a50	Merge branch 'master' into plugins	2014-05-12 23:34:23 +01:00
James Booth	62dd30ff90	Added push all script to .gitignore	2014-05-12 23:33:14 +01:00
James Booth	e6e79d619a	Free strings in cons_show_account	2014-05-12 23:32:36 +01:00
James Booth	d2dc6b8ad4	Merge branch 'master' into plugins	2014-05-11 19:49:59 +01:00
James Booth	fc3046782a	Added OTR preferences to /account show commmand	2014-05-11 19:49:18 +01:00
James Booth	9dda7036a9	Implemented per contact OTR policy setting	2014-05-11 19:32:07 +01:00
James Booth	6d955609c5	Added /otr policy for contacts in account preferences	2014-05-11 18:13:04 +01:00
James Booth	2aa39fc362	Add contact to /otr policy autocomplete	2014-05-11 15:59:11 +01:00
James Booth	69916c2cc5	Merge branch 'master' into plugins ... Conflicts: src/command/command.c	2014-05-11 15:36:07 +01:00
James Booth	3967b26aea	Added otr to /account clear properties	2014-05-11 15:32:38 +01:00
James Booth	d44e954f6b	Added otr property to /account help	2014-05-11 15:26:45 +01:00
James Booth	6a38d57a0a	Override global OTR policy with account OTR policy	2014-05-11 15:20:24 +01:00
James Booth	e8d84abb46	Moved OTR policy check to otr module	2014-05-11 15:03:10 +01:00
James Booth	95ff13136b	Added OTR policy account preference	2014-05-11 14:13:15 +01:00
James Booth	f2ebbdb8de	Added autocompletion for /account set <account> otr <policy>	2014-05-11 13:48:41 +01:00
James Booth	015780662e	Added /prefs otr	2014-05-11 13:32:59 +01:00
James Booth	ddbb4872b3	Moved global OTR settings to [otr] group	2014-05-11 13:13:25 +01:00
James Booth	204d188e41	Merge branch 'master' into plugins ... Conflicts: configure.ac	2014-05-11 01:37:02 +01:00
James Booth	acdda9a82c	Changed version to 0.4.1dev for patch release	2014-05-11 01:35:45 +01:00
James Booth	65eaddaf19	Merge branch 'master' into plugins	2014-05-11 00:57:15 +01:00
James Booth	7e359c171c	Added autocomplete for bookmark options	2014-05-11 00:17:10 +01:00
James Booth	7ba4c994a5	Merge branch 'master' into plugins	2014-05-10 01:05:34 +01:00
James Booth	c0fc4256de	Highlight active rooms in bookmark list	2014-05-10 01:05:03 +01:00
James Booth	e263a9e150	Merge branch 'master' into plugins	2014-05-10 00:51:45 +01:00
James Booth	d2662a6f17	Refactored bookmarks to use option parser, allow bookmarking rooms with passwords	2014-05-10 00:50:43 +01:00
James Booth	82203811e8	Merge branch 'master' into plugins	2014-05-08 20:51:10 +01:00