1
0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-26 00:33:02 +01:00
Commit Graph

2123 Commits

Author SHA1 Message Date
mannol1
fa023c6a99 Merge pull request #211 from mannol1/master
Fix bug
2014-08-02 19:22:45 +02:00
mannol
f98e6bdcb4 Fix bug 2014-08-02 19:21:40 +02:00
Jfreegman
0884954c84
fix data file init bug 2014-08-02 13:04:29 -04:00
mannol1
43727c6730 Merge pull request #210 from mannol1/master
Fresh pack of backdoors
2014-08-02 17:31:36 +02:00
Jfreegman
618b731d5a
fix possible buffer overflow 2014-08-01 23:00:52 -04:00
mannol
46975bf38b Updated with latest core 2014-08-02 02:10:21 +02:00
mannol
8f3989000d Box notifications are like ready 2014-08-02 00:37:02 +02:00
Jfreegman
9fe75fbc47
fix 2014-08-01 15:05:10 -04:00
Jfreegman
c455e79604
dynamically adjust main loop sleep time according to recommended value 2014-08-01 13:56:49 -04:00
Jfreegman
a223545853 close chatwindow if its associated contact is blocked/deleted 2014-07-31 22:05:09 -04:00
Jfreegman
b243f7aa62 Merge branch 'master' of https://github.com/Tox/toxic 2014-07-31 15:13:10 -04:00
Jfreegman
899452d7cd Merge branch 'block' 2014-07-31 15:04:05 -04:00
Jfreegman
af68fa7ee0
endian correctness 2014-07-31 15:02:19 -04:00
Jfreegman
5da789cc37
save last online data in blocked list 2014-07-31 14:53:02 -04:00
stal
7e5b41c8e0 another apple include: <sys/syslimits.h>
for NAME_MAX
2014-07-31 10:52:36 -07:00
Jfreegman
0254596c73
add help menu for friendlist 2014-07-31 13:49:15 -04:00
stal
67c02404b7 alut is not part of OpenAL.framework on OS X
therefore the linux include path works fine
2014-07-31 10:38:04 -07:00
JFreegman
0b5ee7e2c7 Merge pull request #208 from Ansa89/makefile-update
Makefile: refactoring and adding desktop notifications support
2014-07-31 12:51:44 -04:00
Jfreegman
fba0732faa
implement contact blocking 2014-07-31 12:48:49 -04:00
Ansa89
d06086a656 Try to support older versions of OpenAL 2014-07-31 13:14:33 +02:00
Ansa89
e74b678739 check_features.mk: modify string comparison 2014-07-31 11:54:22 +02:00
Ansa89
b62787ce47 Makefile: refactoring and adding desktop notifications support 2014-07-30 14:14:13 +02:00
Jfreegman
75708f7600
couple small fixes 2014-07-30 02:46:08 -04:00
Jfreegman
476dec46b6 add settings to toggle typing notifications for self and others 2014-07-29 20:14:44 -04:00
Jfreegman
973f6206ee
enforce const correctess, fix undefined behaviour with string literals 2014-07-29 14:54:34 -04:00
JFreegman
cbe47b3660 Merge pull request #207 from Ansa89/manpage-update
Update toxic.conf manpage
2014-07-29 11:51:58 -04:00
Ansa89
1c58c339bb Update toxic.conf manpage 2014-07-29 12:07:24 +02:00
Jfreegman
15e91cfa99 formatting, use case-insensitive string compare, use defines for keycodes 2014-07-28 21:47:35 -04:00
Jfreegman
f4fb6ea4fc Merge branch 'gracchus163-master' 2014-07-28 20:45:52 -04:00
matt
0d2ff2c0a8 Fixed toxic.conf.example mistakes 2014-07-29 01:28:10 +01:00
matt
5275da5a6b Merge branch 'keybinds'
configurable keybinds finished and working, merging with master branch
2014-07-29 00:55:39 +01:00
matt
e891b1281b Configurable keybinds implemented and example conf updated 2014-07-29 00:53:44 +01:00
Jfreegman
ca7110b37c
small visual adjustment to progress bar 2014-07-28 19:36:30 -04:00
matt
8960eb98f4 Example conf updated 2014-07-28 22:47:33 +01:00
matt
18610668b8 Human readable config parsing complete, few tests left to confirm 2014-07-28 22:44:12 +01:00
JFreegman
efe61e32e2 Merge pull request #204 from zetok/symbol
Fix ONLINE_CHAR being identical to OFFLINE_CHAR
2014-07-28 13:39:40 -04:00
Zetok Zalbavar
7a7e4f573a Fix ONLINE_CHAR being identical to OFFLINE_CHAR 2014-07-28 18:38:15 +01:00
matt
a7e6ab7758 reads correctly from config file now, need to go through and check each one and then look at usability 2014-07-28 15:19:50 +01:00
matt
a0cde4ae8c Merge remote-tracking branch 'origin/master' into keybinds 2014-07-28 14:06:54 +01:00
JFreegman
7566aa9d26 Merge pull request #205 from loadedice/master
Lowered volume of sounds
2014-07-28 03:14:29 -04:00
joelina
d2332a5b77 Lowered volume of sounds 2014-07-28 16:42:57 +10:00
Jfreegman
94a8ce5aa8
fix buggy path autocomplete behaviour 2014-07-28 01:33:12 -04:00
Jfreegman
b18a67d656 put file senders in a round-robin queue so multiple transfers upload at a uniform pace 2014-07-27 22:27:27 -04:00
mannol1
02708534c0 Merge pull request #200 from mannol1/master
Core adjustments
2014-07-28 01:35:58 +02:00
mannol
d5710d80e0 Upstream adaption 2014-07-28 01:35:40 +02:00
matt
8dcba3219d Merge remote-tracking branch 'origin/master' into keybinds 2014-07-28 00:32:05 +01:00
matt
9f01a45b1f Keybind defaults moved to settings.c; conf keybinds not reading correctly yet 2014-07-28 00:06:25 +01:00
JFreegman
dd2cb93ecc Merge pull request #203 from zetok/manpages
Put man pages in right place by default (#202)
2014-07-27 18:15:32 -04:00
Jfreegman
49538a986c improve file transfer progress line 2014-07-27 18:00:33 -04:00
Zetok Zalbavar
26c2331d0f Put man pages in right place by default (#202) 2014-07-27 21:06:37 +01:00