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
873 Commits 3 Branches 42 Tags 60 MiB
beed30b156
Commit Graph

873 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tux3 / Mlkj / !Lev.uXFMLA
be46f82623 Merge pull request #348 from dubslow/master 
tweak #340 dht connecting, remove dropped avatars from cache
 2014-09-30 15:42:10 +02:00
dubslow
e3580fc416 one frickin stinkin merge error 2014-09-30 05:02:49 -05:00
dubslow
6649ae568e Merge branch 'master' into newsettings 
Conflicts:
	core.h
	qtox.pro
	widget/form/genericchatform.cpp
	widget/settingsdialog.cpp
	widget/tool/chataction.cpp
	widget/widget.cpp
	widget/widget.h
 2014-09-30 04:57:05 -05:00
dubslow
8212a3dad0 Added all current settings except cam test, which segfaults on init... 2014-09-30 04:44:27 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
da8f83943d Compat with toxcore 2014-09-30 01:18:23 -05:00
dubslow
4719ea28a8 oops, don't reset tolerance upon bootstrap 2014-09-29 21:29:39 -05:00
dubslow
d1919658e1 tweak #340 dht connecting, remove dropped avatars from cache 2014-09-29 21:24:31 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
06e3ce61bc Merge pull request #346 from dubslow/dhtconnect 
Mostly fix #340
 2014-09-29 23:37:58 +02:00
dubslow
39abf83b2e remove avatar debug prints 2014-09-29 16:36:23 -05:00
dubslow
bf25d84e04 Merge branch 'master' into dhtconnect 2014-09-29 16:34:04 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
17e0b5a69d Merge pull request #345 from burunduk/translation 
Add Ukrainian translation
 2014-09-29 21:25:01 +02:00
Olexandr Nesterenko
12c265aa9b Add Ukrainian translation 2014-09-29 22:05:48 +03:00
Tux3 / Mlkj / !Lev.uXFMLA
c266c317dd Merge pull request #342 from dubslow/avatarhash 
implement avatar hash caching instead of getting full avatar each time
 2014-09-29 20:32:54 +02:00
dubslow
767f164a14 fix file mvs 2014-09-29 13:28:59 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
b96f10b1c1 Merge pull request #344 from apprb/ftrans 
File transfer improvements
 2014-09-29 20:28:40 +02:00
krepa098
67ffbfcb6e fix #334 2014-09-29 20:26:03 +02:00
dubslow
b35b787d2f Merge branch 'master' of https://github.com/krepa098/qTox into avatarhash 2014-09-29 13:18:17 -05:00
apprb
904de559e5 FileTransferInstance responce on broken filetransfer state 2014-09-30 00:22:19 +07:00
apprb
76f7df3135 cleanup 2014-09-29 23:36:42 +07:00
apprb
575cac1fc7 Core: emit TOX_FILECONTROL_RESUME_BROKEN request (base functionality) 2014-09-29 23:14:19 +07:00
apprb
4dfa5a45c4 Core::onFileControlCallback: handle TOX_FILECONTROL_RESUME_BROKEN request 2014-09-29 20:59:07 +07:00
apprb
dbeccd36f9 FileTransferInstance: unification of preview images function 2014-09-29 19:43:14 +07:00
krepa098
25a0a90cf7 fix #334 2014-09-29 10:38:31 +02:00
dubslow
8a1c912da3 mv some files, clean up top level folder 2014-09-28 23:16:11 -05:00
dubslow
a4d42a7136 change file eta to be overall average 
handles jitter much better
 2014-09-28 23:10:04 -05:00
dubslow
940cdfebba implement avatar hash caching instead of getting full avatar each time 2014-09-28 20:54:28 -05:00
dubslow
d9a315c589 fix #340 2014-09-28 18:21:08 -05:00
dubslow
c037edd033 work torwards #340, CAUTION 
spams bootstrapDht() until connection is confirmed, so it's not quite right...
 2014-09-28 18:08:07 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
fd36b6cfaa Merge pull request #339 from dubslow/master 
Fix #331, remove duplicate code
 2014-09-28 20:14:43 +02:00
dubslow
84f56b81a7 fixes #331, remove special chars 2014-09-28 13:09:10 -05:00
dubslow
7735973d94 remove duplicate code 2014-09-28 12:57:27 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
c05497b420 Merge pull request #336 from krepa098/master 
fixes #332, #334 and other visual glitches
 2014-09-28 19:21:21 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
fd9d7d64bf Merge pull request #338 from apprb/long 
Long names v2
 2014-09-28 19:20:36 +02:00
apprb
a18070d7c5 Wrap name and date fix 2014-09-28 23:39:26 +07:00
apprb
4ccfd83505 long name in file transfer widget fix 2014-09-28 22:57:17 +07:00
krepa098
87c9bbf1e6 fixes #332, #334 and other visual glitches 2014-09-28 17:30:00 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
aa6fbc9e28
MaskablePixmapWidget should update() on setPixmap 
Fixes our own avatar apparently not changing until qTox restarted
 2014-09-28 11:19:58 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
12380bc397
Allow non-png avatars, convert them on the fly 2014-09-28 10:59:49 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
21d084e258
Compat with toxcore 2014-09-28 10:56:02 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
35f548c3a1
Update build scripts 2014-09-28 00:43:01 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
c4cbc3a1e9
Merge branch 'pr330' 2014-09-28 00:39:45 +02:00
dubslow
8abcc3b77d blasted scoping issue 2014-09-27 17:36:19 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
2c224b6f3a
Update build scripts 2014-09-28 00:19:40 +02:00
dubslow
eb67f9b3dd revert special self avatar 2014-09-27 17:19:30 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
2047f8dc8d
Update build scripts 2014-09-28 00:14:49 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
766bd6e929
Update build scripts 2014-09-28 00:09:40 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
78b9553f4f
Update build scripts 2014-09-27 23:51:02 +02:00
dubslow
b1b89ac1f4 minor 2014-09-27 16:44:08 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
f4c2bf9f34
Update build scripts 2014-09-27 23:43:21 +02:00
dubslow
28d2680fec conform to standard, fix bug related to nospam in ID 2014-09-27 16:37:39 -05:00