1
0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-14 05:03:03 +01:00
Commit Graph

747 Commits

Author SHA1 Message Date
Jfreegman
9d52b6ab5d forgot a lock 2014-03-13 06:43:53 -04:00
Jfreegman
aeb70262e0 Merge branch 'master' of https://github.com/Tox/toxic 2014-03-13 06:27:57 -04:00
Jfreegman
f6a85518bc implement multi-threading 2014-03-13 06:06:53 -04:00
Sean
27c5013697 ... 2014-03-12 23:18:46 -07:00
Sean Qureshi
aa53076e11 Add joke unixtime patch 2014-03-12 22:19:21 -07:00
Jfreegman
c37311ae36 an experiment gone horribly wrong 2014-03-12 18:48:25 -04:00
Jfreegman
ce76896eb3 easier way to format timestamps 2014-03-12 03:08:13 -04:00
JFreegman
5e377639c8 Merge pull request #94 from lehitoskin/spellcheck
SPELLING IS FOR FOOLS
2014-03-11 22:57:33 -04:00
Lehi Toskin
93fb9611f7 SPELLING IS FOR FOOLS 2014-03-11 19:54:09 -07:00
Sean
cc3513968e I don't even 2014-03-11 19:30:23 -07:00
Jfreegman
dd697d7af1 Merge branch 'master' of https://github.com/Tox/toxic 2014-03-11 20:00:12 -04:00
Jfreegman
a32d76ed16 fix 2014-03-11 20:00:03 -04:00
mannol1
e6d307f65a Merge pull request #92 from mannol1/master
Fixed segfault
2014-03-12 00:41:43 +01:00
mannol
b210068c1d Fixed segfault 2014-03-12 00:25:13 +01:00
Jfreegman
0151b9b49f rm 'connecting' message and a few small fixes 2014-03-11 18:57:32 -04:00
mannol1
ab0da36cb7 Merge pull request #91 from mannol1/master
This should fix segfault and remove one-line comments
2014-03-11 23:26:51 +01:00
mannol
ed3e9b476d This should fix segfault and remove one-line comments 2014-03-11 23:22:27 +01:00
Sean
7c63bd80d6 Merge pull request #90 from Jman012/master
Fixed another clang issue with bools that broek file sending.
2014-03-11 13:22:07 -07:00
Jman012
9f06331a0b Fixed another clang issue with bools that broek file sending. 2014-03-11 13:11:22 -07:00
Sean
a63cba645f Issue #89 workaround for a toxav_get_peer_id issue 2014-03-11 12:59:12 -07:00
Sean
9d50d52216 What a waste of a commit
Note to self, fixup rebase this before g finds it
2014-03-11 10:24:21 -07:00
Sean
6cb36e71fe I like using entire commits for tiny things 2014-03-11 10:21:35 -07:00
Sean
0b52de3773 Update groupchat.c 2014-03-11 10:19:14 -07:00
Sean
22ac65c4a9 Change John Doe to Anonymous 2014-03-11 10:09:20 -07:00
Sean
3b90c3495f Forgot al 2014-03-10 23:25:59 -07:00
Sean
f4e4fbbef1 Update configure.ac 2014-03-10 21:08:02 -07:00
Sean
6aee8c136b Merge pull request #88 from mannol1/master
Toxic audio support
2014-03-10 21:05:46 -07:00
Sean
2a0740821c Allow AV in Travis 2014-03-10 21:00:53 -07:00
mannol
e6f285adc7 Update with latest core 2014-03-11 01:04:53 +01:00
mannol
a80da2b58f Merge remote-tracking branch 'upstream/master' 2014-03-11 00:58:18 +01:00
mannol
da924f07a9 Updated to latest core 2014-03-11 00:34:18 +01:00
Jman012
e8cd1417b7 Fixed clang error, disabling the execute module. 2014-03-08 23:42:37 -08:00
Jfreegman
d08feb2cc5 simplify popup drawing 2014-03-09 01:02:54 -05:00
Jfreegman
fe0641e981 add popup alert on friend delete 2014-03-08 23:57:21 -05:00
mannol
1fd07837ea Fixed build problems 2014-03-08 16:36:42 +01:00
mannol
6c2ae4ad24 Don't allow changing device while transmission is active 2014-03-08 02:09:11 +01:00
mannol
c678d41709 Now supporting device selection 2014-03-08 01:12:51 +01:00
mannol
63745afe09 Toxic now supports audio calls 2014-03-07 03:27:48 +01:00
mannol
416419a6e7 Toxic now supports audio calls 2014-03-07 03:14:04 +01:00
Jfreegman
33e16fe870 small optimization 2014-03-06 19:39:57 -05:00
mannol1
d712d6c898 Merge pull request #85 from micrictor/master
Fixing fall-back from IPv6 to IPv4
2014-03-05 18:11:55 +01:00
Michael R. Torres
2ae478d546 Fix fall-back from IPv6 to IPv4
Professionalism edits
2014-03-05 07:17:57 -08:00
Jfreegman
4b8de0d16d speed up friendlist loading on startup 2014-03-05 08:01:12 -05:00
Jfreegman
2fcfa954ab move file sender stuff to its own files 2014-03-05 05:06:21 -05:00
Jfreegman
675c8fa89f fix 2014-03-05 03:37:07 -05:00
Jfreegman
d1153f96ca small refactor for incoming file transfers 2014-03-05 03:31:12 -05:00
Michael
2f473300cd Fixing fallback from IPv6 to IPv4 2014-03-05 06:01:10 +00:00
Jfreegman
92d5b2fefc Merge branch 'master' of https://github.com/Tox/toxic 2014-03-04 03:18:59 -05:00
Jfreegman
70f8b103de Merge branch 'master' of https://github.com/JFreegman/toxic 2014-03-04 03:18:01 -05:00
Jfreegman
41292c1ded old server list wasn't being installed; default to DHTnodes in /usr/local/share/toxic 2014-03-04 03:17:48 -05:00