summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-08Merged upstream main.c changesSean Qureshi
2013-08-08Added Vim swap files and ctags filepanosalbanis
2013-08-08oopsJfreegman
2013-08-08fix magic numbersJfreegman
2013-08-08Attempt to get and create a proper directory for config storage.Simon Levermann
2013-08-08Made a callback for Friend.status changeMaxim Biro
2013-08-07Reinstate semicolonstal
2013-08-07Re-export m_callback_userstatusstal
2013-08-07Merge pull request #382 from nurupo/masterirungentoo
Separated userstatus_kind from userstatus
2013-08-07Adds full -D support to toxics versioning, includes the commit numberSean Qureshi
2013-08-07Fixed auto testsMaxim Biro
2013-08-07Merge branch 'master' of https://github.com/irungentoo/ProjectTox-CoreMaxim Biro
2013-08-07Merge pull request #383 from stqism/masterirungentoo
Added check to INSTALL.md, the addition of autotests requires it to cmake
2013-08-07Refactored an expressionMaxim Biro
2013-08-07Added length checksMaxim Biro
2013-08-07Added check to INSTALL.md, the addition of autotests requires itSean Qureshi
2013-08-07Merge pull request #381 from CharmlessCoin/auto_testsirungentoo
Much Needed Tests
2013-08-07Merge branch 'master' of http://github.com/irungentoo/ProjectTox-CoreMaxim Biro
Conflicts: core/Messenger.c core/Messenger.h
2013-08-07jesus, I'm going to sleep after this commitcharmlesscoin
2013-08-07removed script changes so _this_ build will passcharmlesscoin
2013-08-07Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Coreirungentoo
2013-08-07Merge branch 'master' of https://github.com/stqism/ProjectTox-Core into ↵irungentoo
pull-requests Conflicts: testing/toxic/prompt.c
2013-08-07Some cosmetic improvements.irungentoo
2013-08-07Modified clients to properly work with the changesMaxim Biro
2013-08-07Separated StatusMessage from UserStatusMaxim Biro
2013-08-07Fixed the -lCheck issuecharmlesscoin
2013-08-07Travis failed on wget, dummy commit...charmlesscoin
2013-08-07I suppose adding the FindCheck script would be nicecharmlesscoin
2013-08-07Merge branch 'master' of git://github.com/irungentoo/ProjectTox-Core into ↵charmlesscoin
auto_tests
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