9 Commits

Author	SHA1	Message	Date
krepa098	52f220c9e4	Merge branch 'master' into chatlog_v3_1 ... Conflicts: qtox.pro res.qrc src/widget/form/chatform.cpp src/widget/form/chatform.h src/widget/form/genericchatform.cpp src/widget/tool/chatactions/chataction.h src/widget/tool/chatactions/messageaction.cpp src/widget/widget.cpp ui/chatArea/innerStyle.css	2015-02-02 14:31:44 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	c32eb98e6c	CppCheck, some video perf improvements	2015-01-30 13:40:04 -06:00
krepa098	3a567d962e	more work on filetransferwidget	2014-11-17 20:08:55 +01:00
krepa098	27cb075dbb	hooked up filetransferwidget	2014-11-17 16:05:14 +01:00
krepa098	74bd802863	progress	2014-11-16 12:40:44 +01:00
apprb	dfd6420ddc	fix ToxID from QString convertation	2014-11-12 01:36:26 +09:00
Tux3 / Mlkj / !Lev.uXFMLA	a035cc5576	Implement IPC, Tox URI, refactor Tox DNS	2014-11-06 15:12:10 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	98f15af670	Use Tox IDs internally as message author ID ... Instead of names. Fixes #603 Groupchats still use names internally, since there's currently no way to get a chat member's public key throught the toxcore API	2014-11-02 18:36:27 +01:00
dubslow	3ba95d82ae	Move code into src/	2014-10-07 23:26:25 -05:00