saneki
|
55bb6ac367
|
Additional error info for failedToAddFriend, checks if friend is added already
|
2014-11-09 13:23:43 -06:00 |
|
Tux3 / Mlkj / !Lev.uXFMLA
|
77edbb668e
|
Fix #599
|
2014-11-02 12:24:14 +01:00 |
|
apprb
|
99507465be
|
proper sending/receiving group actions
|
2014-11-01 22:00:43 +09:00 |
|
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 |
|
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 |
|
dubslow
|
eaf01aadc3
|
added new profiles, default name/status (fixes #465 and fixes #460)
|
2014-10-19 22:07:51 -05:00 |
|
apprb
|
6febde3167
|
Load encrypted history log/tox datafile
|
2014-10-19 16:35:11 +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
|
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
|
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 |
|
agilob
|
f854d0e90f
|
set idle timer in widget.cpp
|
2014-10-16 19:48:45 +01:00 |
|
dubslow
|
8be4725acd
|
cleanup "sign in change", since it's unnecessary
|
2014-10-16 17:52:45 +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 |
|
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
|
63671ae3ff
|
I learned some things: improve thread safety
|
2014-10-14 21:06:44 -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
|
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 |
|