Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-06-29 16:17:46 +02:00
Code Issues Projects Releases Wiki Activity
1,145 Commits 20 Branches 34 Tags 18 MiB
f4fb6ea4fc
Commit Graph

1145 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jfreegman
a0758643c2
fix blurry screenshot? 2014-07-27 03:36:06 -04:00
Jfreegman
77e152ad36
fix security flaw where untrusted input wasn't being sanitized 2014-07-26 21:22:55 -04:00
mannol
4834642b80 Merge remote-tracking branch 'upstream/master' 2014-07-27 01:50:06 +02:00
mannol
18a6f621f0 Started adding support for popup notifications and adjustments to new core 2014-07-27 01:49:59 +02:00
Jfreegman
3cae1d92cd
change online/offline symbols 2014-07-26 19:16:07 -04:00
Jfreegman
02b192d6ee fix bug and typo 2014-07-25 20:17:22 -04:00
Jfreegman
f630a3e604
fix possible buffer overflows and undefined behaviour 2014-07-25 17:55:21 -04:00
Jfreegman
fb5a9bc043 fix backspace bug, simplify a bit 2014-07-25 15:51:29 -04:00
irungentoo
26ad5a00a3 Fixed out of bounds read. 2014-07-25 15:17:46 -04:00
Jfreegman
18e1f08e31 Merge branch 'master' of https://github.com/Tox/toxic 2014-07-24 23:04:07 -04:00
Jfreegman
b68deef6db allow line_info_add to take formatted strings with variable # of args 2014-07-24 23:03:55 -04:00
mannol1
30ec7debba Merge pull request #199 from mannol1/master 
Fixed sounds not playing
 2014-07-25 02:13:24 +02:00
mannol
3a1e23a3ff Fixed sounds not playing 2014-07-25 02:12:32 +02:00
mannol1
0887bb7662 Merge pull request #198 from Ansa89/master 
README.md: add precompiled binaries
 2014-07-24 13:24:51 +02:00
Ansa89
5a55f738a9 README.md: add precompiled binaries 2014-07-24 13:05:56 +02:00
Jfreegman
8d8df585ad
sort directories and skip special symbols for path autocomplete 2014-07-23 18:34:32 -04:00
Jfreegman
8660047ec1
fix small bug, update readme, bump version 2014-07-23 15:15:14 -04:00
Jfreegman
9476db02a9
allow disabling of individual sounds 2014-07-23 14:59:36 -04:00
mannol1
04fbf5f724 Merge pull request #195 from Ansa89/notify-fix 
Add hardcoded path for sound notifications
 2014-07-23 11:56:20 +02:00
Ansa89
3cc629cbc1 Add hardcoded path for sound notifications 2014-07-23 11:25:38 +02:00
mannol1
50fca4cddf Merge pull request #193 from Ansa89/makefile-fix 
Makefile: little refactoring
 2014-07-23 03:51:52 +02:00
Jfreegman
a047cead05
fix a few notification issues 2014-07-22 14:38:32 -04:00
Ansa89
1131b73299 Update toxic.conf.5 manpage 2014-07-22 16:38:20 +02:00
Ansa89
196af10d01 Move init and exit in right place 2014-07-22 12:30:35 +02:00
Ansa89
1e0e93e5c6 Makefile: little refactoring 2014-07-22 09:59:44 +02:00
Jfreegman
ac01d6d316 fix config file loading, fix makefile compile errors 2014-07-21 18:57:16 -04:00
mannol1
654e404e0e Merge pull request #190 from mannol1/master 
Fixed some build errors
 2014-07-21 23:49:08 +02:00
mannol
f0f1138c54 Fixed some build errors 2014-07-21 23:48:39 +02:00