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,266 Commits 3 Branches 42 Tags 60 MiB
94ba54bc7d
Commit Graph

1266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dubslow
35f95ea501 fix #438 2014-10-17 07:36:10 -05:00
apprb
753edf3c6f Merge pull request #1 from dubslow/history 
updated history encryption
 2014-10-17 21:34:41 +09:00
apprb
1ce4820aa4
clenup 2014-10-17 21:33:00 +09:00
dubslow
9207dfc888 ui tweaks 2014-10-17 07:11:26 -05:00
dubslow
81003b8523 encrypted db uses core encryption 2014-10-17 04:26:31 -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
Ansa89
c87a44b710 Italian translation: update 2014-10-17 10:49:16 +02: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
dubslow
3e8557466c fix #445 2014-10-17 03:02:19 -05:00
krepa098
ad609d9bc6 css tweaks 2014-10-17 09:12:17 +02:00
krepa098
4679b6b7bf fixup! NetVideoSource, YUV shader, fixes 2014-10-17 09:11:39 +02:00
krepa098
4582706243 EmoticonsWidget: Do not close on misclick (#393) 2014-10-17 09:11:39 +02:00
krepa098
6b39184915 allow drag&drop on GroupWidget 2014-10-17 09:11:39 +02:00
krepa098
5ae2afb5c6 moved src/widget/camera.* to src/camera.* 2014-10-17 09:11:39 +02:00
krepa098
bd07666275 fixes, cleanup 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
krepa098
c4529d4062 fixed css, comments, cleanup 2014-10-17 09:09:59 +02:00
krepa098
e8416a98a2 fixed compilation error + warning 2014-10-17 09:09:59 +02:00
krepa098
2913326fb2 fix #416, cleanup 2014-10-17 09:09:59 +02:00
krepa098
118b67a970 cleanup 2014-10-17 09:09:59 +02:00
krepa098
f2b730cdb9 NetVideoSource, YUV shader, fixes 2014-10-17 09:09:59 +02:00
krepa098
8b8a541826 simplified VideoSource, interface, BRG->YUV conversion changes + more 2014-10-17 09:09:59 +02:00
krepa098
b43d7197ed CameraWorker: cleanup, poll at 60Hz 2014-10-17 09:09:59 +02:00
krepa098
122e13ff98 partial fix for #426 2014-10-17 09:09:59 +02:00
krepa098
1d4055858f VideoSurface: aspect ratio 2014-10-17 09:09:59 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
9df5ab02ec
Debian: Update package dependencies 2014-10-16 23:51:34 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
be707b032d
buildPackages.sh : Don't use --local bootstrap 2014-10-16 23:24:45 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
951dc74258
buildPackages.sh : Don't rebuild libsodium everytime 2014-10-16 23:14:22 +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
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
apprb
1b9eb3d239
Encryption: it works! Code cleanup is still required 2014-10-17 00:38:15 +09: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