summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-07Merge pull request #377 from sodwalt/featureirungentoo
Fixed warnings when compiling nTox_win32
2013-08-07Manually merged prompt.c to upstreamSean Qureshi
2013-08-07Merge branch 'read-receipt' of https://github.com/stal888/ProjectTox-Core ↵irungentoo
into pull-requests Conflicts: testing/toxic/chat.c testing/toxic/prompt.c
2013-08-07Moved main.c to maasterSean Qureshi
2013-08-07Fix incompatible pointer type warning by changing type of print_statuschange ↵Robert Sutton
to match parameter of userstatus callback.
2013-08-07Document functions, and fix bug.Sebastian Stal
2013-08-07Check for correct error value in toxic.Sebastian Stal
2013-08-07Add #undef before #define to fix redefinition warningRobert Sutton
2013-08-07Add read receipts using packet ID 65.Sebastian Stal
2013-08-07Fixed it not compilingSean Qureshi
2013-08-07Merge branch 'provide-status-type' of ↵irungentoo
https://github.com/jin-eld/ProjectTox-Core into pull-requests
2013-08-07Merge branch 'master' of https://github.com/ptrasd/ProjectTox-Core into ↵irungentoo
pull-requests
2013-08-07Merge pull request #360 from DarkSER/masterirungentoo
fixed print_statuschange & m_set_userstatus usage in nTox_win32.c
2013-08-07Merge pull request #370 from JFreegman/masterirungentoo
Fixed two bugs
2013-08-07Merge pull request #374 from leeroy2098/masterirungentoo
Don't ignore the result of fwrite. Since we're building with -Wall and -...
2013-08-07Actually use write_resultSimon Levermann
2013-08-07Don't ignore the result of fwrite. Since we're building with -Wall and ↵Simon Levermann
-Werror, this causes compile failures.
2013-08-07Cleanup test and work on .travis filecharmlesscoin
2013-08-07set USERSTATUS_KIND_RETAIN as defaultSergej
2013-08-07Allow to set a specific userstatus type in toxicjin-eld
Use: status <type> <message>, where type is one of online away busy offline The message parameter is optional. To set only the status message, as it was before, use: statusmsg <message>
2013-08-07Fixed flash killing beepSean Qureshi
2013-08-07Manually merged my earlier commits with upstreamSean Qureshi
2013-08-07forgot thisJfreegman
2013-08-07Fixed two bugsJfreegman
2013-08-07testing/toxic/prompt.c: changed execute() to ignore whitespace at end of ↵ptrasd
commands
2013-08-07testing/toxic/prompt.c: changed execute() to skip whitespace at start of commandptrasd
2013-08-07added files for unit testscharmlesscoin
2013-08-06Merge branch 'master' of git://github.com/irungentoo/ProjectTox-Corecharmlesscoin
2013-08-06Merge pull request #366 from nickodell/masterirungentoo
Misc bugfixes
2013-08-06Merge remote-tracking branch 'upstream/master'Nick ODell
2013-08-06Fix bug where file handle wasn't closed on successNick ODell
2013-08-06Fix segfault when no broadcast device is foundNick ODell
2013-08-06Fix bug where we could run past the end of the friends listNick ODell
2013-08-06Added ERROR() and WARNING() for debugging.Konstantin Kowalski
2013-08-06Added a linked list implementation.Konstantin Kowalski
2013-08-06Merge pull request #363 from JFreegman/masterirungentoo
code format/clean up
2013-08-06code format/clean upJfreegman
2013-08-06Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Coreirungentoo
2013-08-06Small bug fixed.irungentoo
2013-08-06Merge pull request #362 from KostyaKow/masterirungentoo
Added linked list and stuff for debugging.
2013-08-06Added ERROR() and WARNING() for debugging.Konstantin Kowalski
2013-08-06Merge pull request #361 from plutooo/masterirungentoo
core: Moved handle ping packets to ping.c
2013-08-06core: Moved handle ping packets to ping.cplutooo
2013-08-06fixed print_statuschange & m_set_userstatus usage in nTox_win32.cDarkSER
2013-08-06Merge branch 'master' of https://github.com/plutooo/ProjectTox-Core into ↵irungentoo
plutooo-master Conflicts: core/ping.c core/util.c
2013-08-06Added a linked list implementation.Konstantin Kowalski
2013-08-06core: Move ping request/response into ping.cplutooo
2013-08-06Merge branch 'dev'plutooo
Conflicts: core/packets.h core/ping.c
2013-08-06core: Move send ping packets functions to ping.cplutooo
2013-08-06core: Move send ping packets functions to ping.cplutooo