64 Commits

Author	SHA1	Message	Date
agilob	23d14553ae	tox:id	2014-11-06 16:55:10 +00:00
agilob	a10f04eb27	highight tox:// in chat	2014-11-06 16:38:33 +00:00
agilob	3f7adb066c	disabling emoitcons	2014-11-06 13:55:12 +00:00
dubslow	f8fa37e4a9	fix #624	2014-11-04 14:32:38 -06:00
Olexandr Nesterenko	6047ffe9e7	add localized strings	2014-10-29 12:13:32 +02:00
apprb	77d65a3cad	QSharedPointer<ChatAction> instead ChatAction*	2014-10-27 00:04:39 +09:00
Tux3 / Mlkj / !Lev.uXFMLA	f1601f389f	Merge branch 'pr423'	2014-10-23 18:47:35 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	93ea674e07	Fix #503	2014-10-22 21:23:37 +02:00
apprb	6caa9f1e9f	Merge remote-tracking branch 'upstream/master' into history ... Conflicts: qtox.pro src/widget/form/chatform.cpp src/widget/form/genericchatform.cpp src/widget/form/genericchatform.h src/widget/form/settings/identityform.cpp src/widget/tool/chatactions/messageaction.cpp src/widget/tool/chatactions/messageaction.h src/widget/widget.cpp	2014-10-22 23:05:04 +09:00
dubslow	aa55dcae1e	fix bug, fix actions to be like irc, and a disabled feature for future	2014-10-20 06:34:17 -05:00
dubslow	30e2afcc92	add alerts on user mention (could use some tweaking, but is plenty fine for now)	2014-10-20 06:05:45 -05:00
dubslow	5b85f79055	tab completion for groupchats (fixes #486)	2014-10-20 05:01:22 -05:00
apprb	fc9f8a16f3	Merge branch 'master' into history ... Conflicts: qtox.pro src/widget/form/chatform.cpp src/widget/form/settings/privacyform.cpp	2014-10-12 19:24:05 +09:00
dubslow	3ba95d82ae	Move code into src/	2014-10-07 23:26:25 -05:00