StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity
1,056 Commits 3 Branches 42 Tags 60 MiB
3ed6f2afa9
Commit Graph

1056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
agilob
db6b488515
UI for autoaway 2014-10-16 18:49:50 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
85f7a71533
Merge branch 'pr446' 2014-10-16 19:38:12 +02:00
agilob
6bda375a7e
fixes regression sent by apprb 2014-10-16 18:24:16 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
a3beb991e1
Merge branch 'pr444' 2014-10-16 18:29:12 +02: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
Tux3 / Mlkj / !Lev.uXFMLA
a0600d1ce4
Merge branch 'pr422' 2014-10-16 18:04:00 +02: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
Tux3 / Mlkj / !Lev.uXFMLA
ff12166753
Merge branch 'pr421' 2014-10-16 15:29:12 +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
Tux3 / Mlkj / !Lev.uXFMLA
d96ef1a970
Merge branch 'pr419' 2014-10-16 14:05:05 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
f9c0dbd501
Merge branch 'pr441' 2014-10-16 13:56:03 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
15efa58ec2
Merge branch 'pr440' 2014-10-16 13:53:38 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
f81a4ad6b4
Merge branch 'pr439' 2014-10-16 13:52:15 +02:00
dubslow
e3cf2cac20 auto away; needs UI 2014-10-16 04:47:58 -05:00
Ansa89
8adbce3573 Italian translation: update 2014-10-15 10:12:29 +02: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
Tux3 / Mlkj / !Lev.uXFMLA
f2f572273c Merge pull request #433 from dubslow/master 
fix #431, fix export cancels, and more debug prints
 2014-10-14 13:36:57 +02:00
dubslow
48faffaa3e fix compile warning, they are fatal to Qt Creator 2014-10-13 19:27:24 -05:00
dubslow
3b32727d9e We handle .tox files (still need actual command line support) 2014-10-13 17:45:52 -05:00
krepa098
cbf8d610c8 fixed #425 2014-10-13 16:35:57 -05:00
dubslow
68de366738 fix #431, fix export cancels, and more debug prints 2014-10-13 16:17:42 -05:00
agilob
db5c115a91
removed duplicated emoticons 2014-10-13 19:50:54 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
a8ca4aeadb Merge pull request #430 from apprb/ftrans 
FileTransferWidget improvements
 2014-10-13 20:07:49 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
259a1d042b Merge pull request #414 from dubslow/profiles 
Profiles -- they actually work!!!!!!!
 2014-10-13 19:54:16 +02:00
apprb
339afafa05
magic number removed in FileTransferInstance 2014-10-13 16:43:20 +09:00
apprb
57943e2435
FileTransferWidget improvements 2014-10-13 00:02:55 +09:00
agilob
45c60a17c0 Merge remote-tracking branch 'upsteam/master' into emoticon-preview 2014-10-12 11:12:10 +01: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
Tux3 / Mlkj / !Lev.uXFMLA
e33a37c52c Merge pull request #405 from dubslow/src 
Move code into src/
 2014-10-12 11:45:42 +02:00
agilob
27e4debb72
yup, too many brackets 2014-10-11 23:25:22 +01:00
agilob
ca3182e281
error handling for missing graphical icons 
preview of emoticons based on dynamic list of emoticons, not hardcoded anymore
 2014-10-11 16:53:20 +01:00
dubslow
6eeec77cce Merge branch 'master' into profiles 
Conflicts:
	misc/settings.cpp
	misc/settings.h
	widget/widget.cpp
 2014-10-10 17:43:15 -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
6ab90d4516 read tox_save if no data; if no profiles, no popup 2014-10-10 17:07:18 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
4e9d802d1f Merge pull request #410 from krepa098/camera 
Improved (self) camera
 2014-10-10 21:03:01 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
f8057c8046 Merge pull request #409 from agilob/trayicon 
support for hiding in tray
 2014-10-10 21:01:01 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
66b8e57776 Merge pull request #413 from burunduk/master 
Update Ukrainian translation
 2014-10-10 21:00:32 +02:00
dubslow
a99e7d2b94 tweaks 2014-10-09 04:26:32 -05:00
dubslow
983879e799 IT WORKS, IT FINALLY WORKS 2014-10-09 03:59:35 -05:00
dubslow
0050589cde (Re)implement profiles UI, using some of the old code. 
Avatars aren't handled on switching, and also something about friends disappearing...
 2014-10-09 03:07:26 -05:00
dubslow
eb687b2bfe readd profiles ui 2014-10-09 01:23:33 -05:00
Olexandr Nesterenko
be9b9dd4c9 Update Ukrainian translation 2014-10-09 09:01:41 +03:00
dubslow
7ce7da0776 properly implement clearing contacts list 2014-10-09 00:58:35 -05:00
dubslow
2181313d37 add startup profile detection 2014-10-09 00:40:05 -05:00