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
892 Commits 3 Branches 42 Tags 60 MiB
1bacd2da7a
Commit Graph

147 Commits

Author SHA1 Message Date
dubslow
1bacd2da7a Merge branch 'master' into profiles... yikes 
Conflicts:
	core.cpp
	core.h
	misc/settings.cpp
	misc/settings.h
	widget/form/settings/generalform.h
	widget/form/settingsform.cpp
	widget/widget.cpp
	widget/widget.h
 2014-10-08 20:25:26 -05:00
apprb
ddf7a7edfd added "Use Proxy" checkbox 2014-10-07 09:24:29 +07:00
Tux3 / Mlkj / !Lev.uXFMLA
3de960b2aa Merge pull request #385 from dubslow/master 
Simplify groupchat names
 2014-10-06 20:28:53 +02:00
dubslow
d093679d03 Add proxy support 2014-10-06 10:04:17 -05:00
dubslow
9e2195c03c simplify groupchat names, fix #379, more simplification is possible 2014-10-06 01:46:30 -05:00
dubslow
5f106ab618 add receive actions (no one to test with currently) 2014-10-02 01:01:23 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
7a2558d41a Fix #359 2014-10-01 13:23:31 +02:00
dubslow
3aa1c7fded bootstrap tweaks 2014-09-30 18:50:12 -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
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
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
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
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
dubslow
7735973d94 remove duplicate code 2014-09-28 12:57:27 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
21d084e258
Compat with toxcore 2014-09-28 10:56:02 +02:00
dubslow
eb67f9b3dd revert special self avatar 2014-09-27 17:19:30 -05:00
dubslow
b1b89ac1f4 minor 2014-09-27 16:44:08 -05:00
dubslow
28d2680fec conform to standard, fix bug related to nospam in ID 2014-09-27 16:37:39 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
0f7cb13825 Typo when fixing #322 2014-09-26 21:58:49 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
d684fca868 Fix #322 2014-09-26 21:26:31 +02:00
dubslow
be7c39d69a api update 2014-09-25 09:55:36 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
86e483303f Broadcast new avatars when changed 2014-09-24 18:22:09 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
ff2994a0fd Cache avatars 2014-09-24 17:55:54 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
8de71c19ed Initial avatars support 2014-09-24 17:28:38 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
7ad6ad2731 Avatar support for ourselves 2014-09-24 16:51:16 +02:00
apprb
06178f00d9 File send error message 2014-09-23 23:52:06 +07:00
apprb
1551614070 Error messages in the case of message sending problems 2014-09-23 23:38:27 +07:00
apprb
68654179e9 Split message 2014-09-21 17:31:36 +07:00
dubslow
72a76dba03 implement sanitize, one tweak 2014-09-12 14:38:14 -05:00
Dubslow
d16b6cd283 Merge commit '5a005a1aafe96061301a4e113cb5450770009b88' into profiles 
Conflicts:
	core.cpp
	widget/form/settingsform.cpp
	widget/form/settingsform.h
 2014-09-12 13:53:29 -05:00
Marcel
28e8406be9 added settingsdialog 2014-09-12 15:41:46 +02:00
apprb
6c5cd7c010 filetransfer: corrected pause/resume behaviour 2014-09-12 01:32:31 +07:00
Tux3 / Mlkj / !Lev.uXFMLA
a7c75e63a5 Clean code, improve compilation speed 2014-09-11 15:44:34 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
e91846e821 Fix #205 2014-09-11 13:40:44 +02:00
Dubslow
e4c6216ba8 swapping profiles is now less buggy, but friends still don't come online 2014-09-10 15:47:48 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
f16ae3a223 Remove unnecessary header 2014-09-10 21:50:09 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
cb9d626155 Fix #237, don't use ports in big endian 2014-09-10 21:43:49 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
87eb5704ec Use homemade endianess conversion for DHT 
Should help with #237
 2014-09-10 21:34:55 +02:00
Dubslow
b684e56df0 simplification 2014-09-10 08:36:11 -05:00
Dubslow
05c654373f Fixed misusing tox_load; profiles are significantly less buggy 2014-09-10 08:12:43 -05:00
Dubslow
97f107e7f5 oops 2014-09-05 05:06:35 -05:00
Dubslow
f21d8d50b7 Merge branch 'master' into profiles 
get the last few commits from master

Conflicts:
	core.cpp
 2014-09-05 04:20:15 -05:00