475 Commits

Author	SHA1	Message	Date
Tux3 / Mlkj / !Lev.uXFMLA	2a401a7e3b	Merge branch 'pr447'	2014-10-16 20:57:36 +02:00
agilob	ca08015528	s/min/minutes/	2014-10-16 19:52:13 +01:00
agilob	f854d0e90f	set idle timer in widget.cpp	2014-10-16 19:48:45 +01:00
agilob	6bda375a7e	fixes regression sent by apprb	2014-10-16 18:24:16 +01:00
agilob	815314330e	Merge branch 'master' of https://github.com/tux3/qTox into style	2014-10-16 17:17:41 +01:00
agilob	5538167a46	fix for #442	2014-10-16 17:17:25 +01:00
dubslow	8be4725acd	cleanup "sign in change", since it's unnecessary	2014-10-16 17:52:45 +02:00
agilob	8788931f36	number of messages is more reliable then activities	2014-10-16 17:47:19 +02:00
agilob	fea3fa3ac7	renamed function	2014-10-16 17:47:18 +02:00
agilob	698902a8dc	status changes messages and sign in notifications ... sign in notifications available only in settings and as a message in chat	2014-10-16 17:47:18 +02:00
agilob	14ea88c070	style selector ... Unfortunately Qt developers removed some old native skins from support, only 3 skins are supported on Linux. Number of native skins depends on OS and Qt built system.	2014-10-16 15:18:19 +02:00
dubslow	e3cf2cac20	auto away; needs UI	2014-10-16 04:47:58 -05:00
dubslow	c1572abedf	more details	2014-10-15 11:38:16 -05:00
dubslow	34bb83aca7	Merge branch 'thread' into corencryption	2014-10-15 10:51:24 -05:00
dubslow	63671ae3ff	I learned some things: improve thread safety	2014-10-14 21:06:44 -05:00
apprb	e3d5853ca3	no reason to keep action flag in the logfile	2014-10-14 23:36:32 +09:00
apprb	ec3d8146c6	correct action saving into the logfile	2014-10-14 22:43:03 +09:00
apprb	14a71a0f3f	precise timestamps keeping	2014-10-14 14:49:27 +09:00
dubslow	33e0c95ab6	Merge branch 'master' into corencryption ... Conflicts: src/core.cpp	2014-10-13 16:07:03 -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
agilob	5abf693611	Merge remote-tracking branch 'upsteam/master' into style	2014-10-12 11:08:10 +01:00
dubslow	235d6609b9	Merge branch 'master' into profiles ... Conflicts: src/widget/form/settings/identityform.cpp	2014-10-12 04:58:56 -05:00
dubslow	63bb51a089	Merge branch 'master' into corencryption	2014-10-12 04:55:02 -05:00
dubslow	bf75750166	Merge branch 'master' into src ... Conflicts: qtox.pro src/widget/form/settings/avform.h src/widget/selfcamview.cpp src/widget/selfcamview.h src/widget/widget.cpp widget/selfcamview.h widget/videosurface.h	2014-10-10 17:21:54 -05:00
dubslow	3ba95d82ae	Move code into src/	2014-10-07 23:26:25 -05:00