dubslow
7260fdd38d
fixed encryption, major testing required
2014-10-24 06:35:30 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
5fae61c4e8
Don't show msgboxes outside of the GUI thread
...
Fixes #511
2014-10-23 20:39:28 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
f1601f389f
Merge branch 'pr423'
2014-10-23 18:47:35 +02:00
agilob
28d1287b18
implemented krepas suggestions about style
2014-10-22 16:27:15 +01:00
apprb
6caa9f1e9f
Merge remote-tracking branch 'upstream/master' into history
...
Conflicts:
qtox.pro
src/widget/form/chatform.cpp
src/widget/form/genericchatform.cpp
src/widget/form/genericchatform.h
src/widget/form/settings/identityform.cpp
src/widget/tool/chatactions/messageaction.cpp
src/widget/tool/chatactions/messageaction.h
src/widget/widget.cpp
2014-10-22 23:05:04 +09:00
apprb
5c0370eaed
Tox datafile/encrypted history: different passwords
2014-10-22 22:36:36 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
590ca8dc5a
Merge branch 'pr492' into HEAD
2014-10-20 20:21:41 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
50e1ecf46b
Merge branch 'pr482' into HEAD
2014-10-20 20:21:36 +02:00
agilob
7ad723a656
tryicon is made in widget.cpp now
2014-10-20 19:09:35 +01:00
agilob
6e5068840d
minimize to tray
2014-10-20 14:11:03 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
b6d581a462
Merge branch 'pr488'
2014-10-20 14:13:27 +02:00
dubslow
aa55dcae1e
fix bug, fix actions to be like irc, and a disabled feature for future
2014-10-20 06:34:17 -05:00
dubslow
30e2afcc92
add alerts on user mention (could use some tweaking, but is plenty fine for now)
2014-10-20 06:05:45 -05:00
dubslow
eaf01aadc3
added new profiles, default name/status ( fixes #465 and fixes #460 )
2014-10-19 22:07:51 -05:00
agilob
d268360c51
closing to tray, gui and settings
2014-10-19 20:47:06 +01:00
apprb
6febde3167
Load encrypted history log/tox datafile
2014-10-19 16:35:11 +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
agilob
f8f5a3ca29
all form are translatable now
...
changed type of main tabs to pointers to fix that
2014-10-18 15:54:52 +01:00
dubslow
4e7a183360
add choose translations (restart required, dynamic changing is lots of work)
2014-10-17 18:06:30 -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
krepa098
5ae2afb5c6
moved src/widget/camera.* to src/camera.*
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
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
