summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-08Merge pull request #397 from leeroy2098/mergeirungentoo
Implement proper configuration directories for toxic
2013-08-08Fixed dynamic memory allocation.irungentoo
2013-08-08Merge branch 'upstream'Simon Levermann
2013-08-08Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core into ↵Simon Levermann
upstream
2013-08-08Merge pull request #396 from lukechampine/dynamicfriendsirungentoo
make friendlist resize dynamically
2013-08-08Merge pull request #395 from fhahn/ctestirungentoo
Use ctest to integrate unit tests into cmake build system
2013-08-08Merge pull request #394 from Nominate/patch-2irungentoo
Updated chat.c to bring /status inline with prompt.c status command
2013-08-08Merge pull request #393 from Nominate/patch-1irungentoo
Removed superfluous statusmsg
2013-08-08Moved a define and fixed another.irungentoo
2013-08-08make friendlist resize dynamicallyLuke Champine
2013-08-08Cleanup and Error fixesSimon Levermann
Add several frees that were missing to prevent memory leaks Replace strcpy with strdup where appropriate Replace _stat with __stat64 for building on Windows
2013-08-08Implement proper config directories.Simon Levermann
2013-08-08Merge pull request #388 from stal888/patch-1irungentoo
Re-export m_callback_userstatus
2013-08-08Merge pull request #384 from stqism/masterirungentoo
Adds full -D support to toxics versioning, includes the commit number
2013-08-08Merge pull request #391 from JFreegman/masterirungentoo
fix magic numbers in toxic
2013-08-08Merge pull request #392 from panosalbanis/masterirungentoo
Added Vim swap files and ctags file
2013-08-08Run unit tests with travisFlorian Hahn
2013-08-08Disable failing test assertionFlorian Hahn
2013-08-08Use ctest to run unit testsFlorian Hahn
2013-08-08Updated chat.c to bring /status inline with prompt.c status commandNominate
2013-08-08Removed superfluous statusmsgNominate
Users can just respecify their status with a message. This will also encourage users to think about which status is actually appropriate instead of just leaving the status alone.
2013-08-08Merge https://github.com/irungentoo/ProjectTox-CoreSean Qureshi
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-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