1524 Commits

Author	SHA1	Message	Date
dubslow	e10e0087a4	added auto accept settings	2014-10-17 22:02:13 -05:00
dubslow	2d3cb18f58	fix #351 (again)	2014-10-17 21:15:54 -05:00
dubslow	ee0f94a890	fix #461, cleanup	2014-10-17 20:15:26 -05:00
dubslow	4e7a183360	add choose translations (restart required, dynamic changing is lots of work)	2014-10-17 18:06:30 -05:00
Tux3 / Mlkj / !Lev.uXFMLA	26eb08aa00	Merge branch 'pr452'	2014-10-17 21:00:24 +02:00
agilob	2cbae5265b	max value in autoAway time, tooltip for spinbox	2014-10-17 17:57:02 +01:00
apprb	72aa313605	switch to tox_pass_encrypt/tox_pass_decrypt functions	2014-10-18 00:53:06 +09:00
Zetok Zalbavar	c42b31fb45	Remove redundancy from settings tabs	2014-10-17 16:27:28 +01:00
krepa098	8ccadaad26	avsettings.ui layout changes	2014-10-17 16:18:34 +02:00
apprb	177b27882b	Merge branch 'history_fx' into history ... Conflicts: src/misc/db/encrypteddb.cpp src/misc/db/encrypteddb.h	2014-10-17 22:14:27 +09:00
dubslow	35f95ea501	fix #438	2014-10-17 07:36:10 -05:00
apprb	1ce4820aa4	clenup	2014-10-17 21:33:00 +09:00
dubslow	9207dfc888	ui tweaks	2014-10-17 07:11:26 -05:00
dubslow	81003b8523	encrypted db uses core encryption	2014-10-17 04:26:31 -05:00
dubslow	041ed3b998	Merge branch 'corencryption' into history, remove file encryption, store key instead of hash ... (I forgot to commit the merge before starting work...) Conflicts: qtox.pro	2014-10-17 04:13:42 -05:00
dubslow	41365ce057	Merge branch 'master' into history ... Conflicts: src/widget/form/genericchatform.h src/widget/widget.cpp	2014-10-17 03:56:59 -05:00
dubslow	18d1ee9f1f	Merge branch 'master' into corencryption ... Conflicts: src/misc/settings.cpp src/misc/settings.h src/widget/widget.h	2014-10-17 03:46:52 -05:00
dubslow	3e8557466c	fix #445	2014-10-17 03:02:19 -05:00
krepa098	4582706243	EmoticonsWidget: Do not close on misclick (#393)	2014-10-17 09:11:39 +02:00
krepa098	6b39184915	allow drag&drop on GroupWidget	2014-10-17 09:11:39 +02:00
krepa098	5ae2afb5c6	moved src/widget/camera.* to src/camera.*	2014-10-17 09:11:39 +02:00
krepa098	bd07666275	fixes, cleanup	2014-10-17 09:11:39 +02:00
krepa098	6e61da68e4	Settings: use QTabWidget, IdentityForm: cleanup	2014-10-17 09:11:38 +02:00
krepa098	87132389aa	fixed infinite recursion under certain conditions	2014-10-17 09:09:59 +02:00
krepa098	c4529d4062	fixed css, comments, cleanup	2014-10-17 09:09:59 +02:00
krepa098	e8416a98a2	fixed compilation error + warning	2014-10-17 09:09:59 +02:00
krepa098	2913326fb2	fix #416, cleanup	2014-10-17 09:09:59 +02:00
krepa098	118b67a970	cleanup	2014-10-17 09:09:59 +02:00
krepa098	f2b730cdb9	NetVideoSource, YUV shader, fixes	2014-10-17 09:09:59 +02:00
krepa098	8b8a541826	simplified VideoSource, interface, BRG->YUV conversion changes + more	2014-10-17 09:09:59 +02:00
krepa098	b43d7197ed	CameraWorker: cleanup, poll at 60Hz	2014-10-17 09:09:59 +02:00
krepa098	122e13ff98	partial fix for #426	2014-10-17 09:09:59 +02:00
krepa098	1d4055858f	VideoSurface: aspect ratio	2014-10-17 09:09:59 +02:00
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	db6b488515	UI for autoaway	2014-10-16 18:49:50 +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
apprb	1b9eb3d239	Encryption: it works! Code cleanup is still required	2014-10-17 00:38:15 +09: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
Tux3 / Mlkj / !Lev.uXFMLA	d96ef1a970	Merge branch 'pr419'	2014-10-16 14:05:05 +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
apprb	3cf224a34e	Encrypted Logs: part 2: all encryption to be implemented in EncryptedDb class	2014-10-16 00:39:43 +09:00
apprb	172f1181c5	Encrypted Logs: part 1	2014-10-15 22:48:08 +09:00
dubslow	63671ae3ff	I learned some things: improve thread safety	2014-10-14 21:06:44 -05:00
dubslow	a0ca379c1b	fix #436	2014-10-14 20:04:53 -05:00
apprb	e3d5853ca3	no reason to keep action flag in the logfile	2014-10-14 23:36:32 +09:00
apprb	c07a0cd7f8	Fetch history only from asked profile ID	2014-10-14 22:55:25 +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	48faffaa3e	fix compile warning, they are fatal to Qt Creator	2014-10-13 19:27:24 -05:00
krepa098	cbf8d610c8	fixed #425	2014-10-13 16:35:57 -05:00
dubslow	68de366738	fix #431, fix export cancels, and more debug prints	2014-10-13 16:17:42 -05:00
dubslow	33e0c95ab6	Merge branch 'master' into corencryption ... Conflicts: src/core.cpp	2014-10-13 16:07:03 -05:00
agilob	db5c115a91	removed duplicated emoticons	2014-10-13 19:50:54 +01:00
Tux3 / Mlkj / !Lev.uXFMLA	a8ca4aeadb	Merge pull request #430 from apprb/ftrans ... FileTransferWidget improvements	2014-10-13 20:07:49 +02:00
apprb	339afafa05	magic number removed in FileTransferInstance	2014-10-13 16:43:20 +09:00
apprb	57943e2435	FileTransferWidget improvements	2014-10-13 00:02:55 +09:00
dubslow	71e42cf6c8	add decryption	2014-10-12 05:24:57 -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	45c60a17c0	Merge remote-tracking branch 'upsteam/master' into emoticon-preview	2014-10-12 11:12:10 +01: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