1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Commit Graph

11 Commits

Author SHA1 Message Date
dubslow
4eb3036414 Ah, much cleaner 2014-12-03 18:14:28 -06:00
apprb
a9fb75b5ed proper encrypted history loading 2014-12-03 18:01:31 -06:00
apprb
c541291aac
Nospam id part edit 2014-11-16 01:11:00 +09:00
X-NicON
f6896819b8 Removed untranslatable strings 2014-10-31 21:24:28 +03:00
apprb
36d4998eb8
Setting forms: similar outlook and inner structure 2014-10-29 23:23:48 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
87f1ae2ccb
Disable history encryption again
For some reason it didn't work the first time, thanks @agilob for reporting that
2014-10-23 23:01:50 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
fa44956010
Disable encryption options for the moment 2014-10-23 22:11:37 +02:00
apprb
dfd5b6411a
Tox datafile encryption: check 2014-10-19 23:59:58 +09:00
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
apprb
1ce4820aa4
clenup 2014-10-17 21:33:00 +09: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