64 Commits

Author	SHA1	Message	Date
apprb	1a37c1c421	History: almost correct handling encrypted history load/save ... Things are left to do: 1. load/save encrypted tox datafile 2. incorrect passwords processing (ask to retype, wipe everything, etc.) 3. reencryp history log with new password	2014-10-19 02:38:47 +09:00
dubslow	ee0f94a890	fix #461, cleanup	2014-10-17 20:15:26 -05:00
apprb	72aa313605	switch to tox_pass_encrypt/tox_pass_decrypt functions	2014-10-18 00:53:06 +09: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
krepa098	f2b730cdb9	NetVideoSource, YUV shader, fixes	2014-10-17 09:09:59 +02: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
dubslow	a0ca379c1b	fix #436	2014-10-14 20:04:53 -05:00
dubslow	33e0c95ab6	Merge branch 'master' into corencryption ... Conflicts: src/core.cpp	2014-10-13 16:07:03 -05:00
dubslow	71e42cf6c8	add decryption	2014-10-12 05:24:57 -05: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	3ba95d82ae	Move code into src/	2014-10-07 23:26:25 -05:00