summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-09Merge pull request #407 from JFreegman/masterirungentoo
fixed chat window text wrapping in toxic
2013-08-09Merge pull request #408 from cbrueffer/receivedfixirungentoo
Fix a recurring typo in code and comments.
2013-08-09Fix a recurring typo in code and comments.Christian Brueffer
2013-08-09fixed chat window text wrappingJfreegman
2013-08-08Merge pull request #404 from KostyaKow/small_fixesirungentoo
Fixed a printf argument.
2013-08-09Fixed a printf argument.Konstantin Kowalski
2013-08-08added -n argument to toxic to disable loading keys from file (for testing)irungentoo
2013-08-08Merge pull request #403 from jin-eld/fix-friend-status-callbackirungentoo
Fix typo in function name which results in missing symbol
2013-08-08Merge pull request #402 from Astonex/patch-5irungentoo
Update CMakeLists.txt
2013-08-09Fix typo in function name which results in missing symboljin-eld
2013-08-08Update CMakeLists.txtAstonex
2013-08-08Merge pull request #400 from JFreegman/masterirungentoo
Added actions/alternative type of messages
2013-08-08Merge pull request #399 from ReAzem/patch-1irungentoo
Update .gitignore
2013-08-08added /me actions to toxicJfreegman
2013-08-08added actions/alternate messagesJfreegman
2013-08-08Update .gitignoreAlexandre Viau
Netbeans can't put his nbproject dir outside of source.
2013-08-08Merge pull request #398 from Astonex/patch-4irungentoo
Update nTox_win32.c
2013-08-08Update nTox_win32.cAstonex
Mispelled function name
2013-08-08Merge branch 'master' of https://github.com/nurupo/InsertProjectNameHere ↵irungentoo
into nurupo-master Conflicts: core/Messenger.c
2013-08-08Merge pull request #397 from leeroy2098/mergeirungentoo
Implement proper configuration directories for toxic
2013-08-08Made name consistent with other 'on change' callbacksMaxim Biro
2013-08-08Fixed a silly code ordering mistakeMaxim Biro
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-08Made a callback for Friend.status changeMaxim Biro
2013-08-07Reinstate semicolonstal