1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Commit Graph

55 Commits

Author SHA1 Message Date
Dubslow
139cd3f4a6
Merge branch 'encryption' into master
Conflicts:
	src/core.cpp
	src/misc/settings.cpp
	src/widget/widget.cpp
	src/widget/widget.h
2015-01-05 20:55:47 -06:00
apprb
f8bdaac121
messages splitting fix 2014-12-28 23:32:19 +06:00
Maximilian Wuttke
e0cb122abe Merge branch 'filter_audio' of https://github.com/mwuttke97/qTox into filter_audio
Added some `#ifdef QTOX_FILTER_AUDIO`s.
Conflicts:
	qtox.pro

Conflicts:
	src/coreav.cpp
2014-12-14 10:55:38 +01:00
Dubslow
db2d9321e4
fix change profiles button 2014-12-05 20:58:44 -06:00
dubslow
bafca96554 Incremental work, starting to take shape 2014-12-03 18:14:28 -06:00
dubslow
8985466ed3 core encryption file is basically complete, I need to verify privacy tab 2014-12-03 18:10:07 -06:00
apprb
a9fb75b5ed proper encrypted history loading 2014-12-03 18:01:31 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
3f47586f22
Merge branch 'pr798' 2014-11-26 21:36:40 +01:00
apprb
56ea1f1e66
using ToxID in groupchats 2014-11-24 00:58:53 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
599c246ec7
Move group audio playing to Audio singletong/thread
This is a bit of a quick fix for a new bug, as but part of cleaning up the audio code and moving it to the Audio singleton
2014-11-19 22:26:04 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
69189034e3
Put group chats audio playing in its own thread 2014-11-18 01:25:15 +01:00
mannol
36d4460fef Core update 2014-11-18 00:15:54 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
c1f2e9a71d
Refactor audio out of code, better resource management
Fixes #739 and fixes #777
2014-11-16 19:04:45 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
20ba8e6192
Allow to change i/o audio devices without restart
Still needs to restart the calls for now

Fixes #713
2014-11-16 16:41:30 +01:00
apprb
c541291aac
Nospam id part edit 2014-11-16 01:11:00 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
c7d6882479
Fix timers called from the wrong threads 2014-11-14 20:31:23 +01:00
dubslow
71c34b9d69 group title support 2014-11-14 18:23:54 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
0c393e717a
Add simple push to talk with P
Fixes #734
2014-11-13 19:20:06 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
eac712e68a
Add GUI for audio groupchats 2014-11-13 13:14:27 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
54462f0276
Prepare Core for av groupchats 2014-11-13 12:18:04 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
4bb91143d7
Fix use after free of groupchat invites
Fixes #728, fixes #706, fixes #394
2014-11-13 00:13:11 +01:00
dubslow
3dd15f0a5f fix minor switching bug introduced by 07ea2e 2014-11-11 17:00:24 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
57db8d65ee
Play av groupchat call audio
On the main source. Sue me.
2014-11-11 16:15:56 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
8fceb4b78b
Accept and default to AV groupchats
We don't send or play any audio yet, though
2014-11-11 16:05:01 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
722aeb776e
Compat with toxcore: New groupchats
Text only is supported for now
2014-11-11 15:03:08 +01:00
apprb
f7a855aa20
store delivering status in the DB 2014-11-10 20:49:41 +09:00
apprb
694cd90ee4
read receipt infrastructure 2014-11-10 20:49:38 +09:00
saneki
55bb6ac367 Additional error info for failedToAddFriend, checks if friend is added already 2014-11-09 13:23:43 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
a035cc5576
Implement IPC, Tox URI, refactor Tox DNS 2014-11-06 15:12:10 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
98f15af670
Use Tox IDs internally as message author ID
Instead of names. Fixes #603

Groupchats still use names internally, since there's currently no way to get a chat member's public key throught the toxcore API
2014-11-02 18:36:27 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
a908e036ce
Fix #600 2014-11-02 12:47:42 +01:00
apprb
99507465be
proper sending/receiving group actions 2014-11-01 22:00:43 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
91af4721c4
Handle received group actions 2014-10-30 09:40:47 +01:00
apprb
63992fc522
multiple file sending race condition fix 2014-10-30 00:40:09 +09:00
Wouters Dorian
50513e0fb4 Made Mute speakers button work 2014-10-28 13:50:30 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
7b3c2bd1e8
Add some core doc comments, remove dead code 2014-10-27 00:31:51 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
7b70fd0008
Fix crash if call failed to start 2014-10-25 11:29:25 +02:00
dubslow
7260fdd38d fixed encryption, major testing required 2014-10-24 06:35:30 -05:00
apprb
6caa9f1e9f
Merge remote-tracking branch 'upstream/master' into history
Conflicts:
	qtox.pro
	src/widget/form/chatform.cpp
	src/widget/form/genericchatform.cpp
	src/widget/form/genericchatform.h
	src/widget/form/settings/identityform.cpp
	src/widget/tool/chatactions/messageaction.cpp
	src/widget/tool/chatactions/messageaction.h
	src/widget/widget.cpp
2014-10-22 23:05:04 +09:00
apprb
5c0370eaed
Tox datafile/encrypted history: different passwords 2014-10-22 22:36:36 +09:00
apprb
6febde3167
Load encrypted history log/tox datafile 2014-10-19 16:35:11 +09:00
apprb
1a37c1c421
History: almost correct handling encrypted history load/save
Things are left to do:
 1. load/save encrypted tox datafile
 2. incorrect passwords processing (ask to retype, wipe everything, etc.)
 3. reencryp history log with new password
2014-10-19 02:38:47 +09:00
dubslow
ee0f94a890 fix #461, cleanup 2014-10-17 20:15:26 -05:00
apprb
72aa313605
switch to tox_pass_encrypt/tox_pass_decrypt functions 2014-10-18 00:53:06 +09: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
krepa098
f2b730cdb9 NetVideoSource, YUV shader, fixes 2014-10-17 09:09:59 +02: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
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