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
8,168 Commits 3 Branches 42 Tags 60 MiB
47a05c7592
Commit Graph

8168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
apprb
3cf224a34e
Encrypted Logs: part 2: all encryption to be implemented in EncryptedDb class 2014-10-16 00:39:43 +09:00
apprb
172f1181c5
Encrypted Logs: part 1 2014-10-15 22:48:08 +09: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
apprb
e3d5853ca3
no reason to keep action flag in the logfile 2014-10-14 23:36:32 +09:00
apprb
c07a0cd7f8
Fetch history only from asked profile ID 2014-10-14 22:55:25 +09:00
apprb
ec3d8146c6
correct action saving into the logfile 2014-10-14 22:43:03 +09: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
apprb
14a71a0f3f
precise timestamps keeping 2014-10-14 14:49:27 +09: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
dubslow
33e0c95ab6 Merge branch 'master' into corencryption 
Conflicts:
	src/core.cpp
 2014-10-13 16:07:03 -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
dubslow
71e42cf6c8 add decryption 2014-10-12 05:24:57 -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
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
dubslow
63bb51a089 Merge branch 'master' into corencryption 2014-10-12 04:55:02 -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
apprb
9ace74087a
typos 2014-10-12 18:44:03 +09:00
dubslow
04699c376c finished core functionality, still needs UI from #423 
this also depends on irungentoo/toxcore#1114 being merged
 2014-10-12 03:27:48 -05:00
dubslow
c33d387465 add save encryption 2014-10-12 02:31:48 -05:00
dubslow
9df2b49d07 more 2014-10-11 19:07:29 -05:00
agilob
27e4debb72
yup, too many brackets 2014-10-11 23:25:22 +01:00
dubslow
bee852a28c partial work towards core encryption functionality 2014-10-11 16:54:25 -05: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
apprb
02092c9a90
cleanup 2014-10-11 20:52:29 +09:00
apprb
b0ef7e8152
Merge remote-tracking branch 'upstream/master' into history 
Conflicts:
	qtox.pro
 2014-10-11 18:26:47 +09:00
apprb
625cb32b32
History: retrieve history from save 2014-10-11 16:26:52 +09: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
apprb
6860790205
clear chat area 2014-10-11 01:54:21 +09:00