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

23 Commits

Author SHA1 Message Date
Ilya Kowalewski
6c8b130a25 Redesign draft for settings pane and proper UX for Mac 2015-05-11 00:41:34 +03:00
Dubslow
4055cbe956
Minor translation things in the ui files 2015-02-11 14:52:42 -06:00
Dubslow
e2fd298d68
chat logs -> chat history, miscellaneous rewordings 2015-02-03 13:56:08 -06:00
Dubslow
a572ccff27
Merge branch 'encryption' into master
Conflicts:
	src/core.cpp
	src/historykeeper.h
2015-02-03 10:21:59 -06:00
Zetok Zalbavar
c2eaa3cdb4
Some tweaks for tooltips in settings 2015-02-01 10:56:28 +00:00
Zetok Zalbavar
13bd334d78
Add tooltips in settings
some tooltips changed to be more helpful/reflect reality
2015-01-31 09:53:12 +00:00
Dubslow
139cd3f4a6
Merge branch 'encryption' into master
Conflicts:
	src/core.cpp
	src/misc/settings.cpp
	src/widget/widget.cpp
	src/widget/widget.h
2015-01-05 20:55:47 -06:00
Zetok Zalbavar
d36c471f4f
Some wording improvements 2015-01-04 20:25:37 +00:00
novist
2a8cbd189d Added typing notification support and enabled by default 2015-01-04 13:21:56 +02:00
Dubslow
7c7c603045
word wrap the privacy tab string 2014-12-05 21:24:03 -06:00
Dubslow
9a92e6c980 Clarification 2014-12-03 18:14:28 -06:00
dubslow
fc30d342bc Added change pw buttons; encryption is very nearly done.
@apprb there is one question and one TODO that you should look over in privacyform.cpp, as well as a TODO in historykeeper.cpp
Also both the encryption settings box and the pw dialog lineedits should probably be in a QGridLayout... but I don't really want to do that by hand :P
2014-12-03 18:14:28 -06:00
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