slvr
|
6052b1f119
|
network_registerhandler
|
2013-08-10 00:43:50 +01:00 |
|
irungentoo
|
1ec95162a0
|
Merge pull request #413 from nurupo/master
Cleanup of Messenger.c
|
2013-08-09 16:24:39 -07:00 |
|
Maxim Biro
|
f0786d1fcd
|
Returned the length check
|
2013-08-09 19:20:23 -04:00 |
|
irungentoo
|
ccc481fc79
|
Merge pull request #412 from cbrueffer/misc
Kill EOF whitespace.
|
2013-08-09 15:04:48 -07:00 |
|
Maxim Biro
|
0f8eea89fa
|
Introduced data pointer and data_length
|
2013-08-09 17:03:37 -04:00 |
|
Maxim Biro
|
9dd691d106
|
Changed the way statusmessage is allocated
|
2013-08-09 17:03:30 -04:00 |
|
Maxim Biro
|
c6d06ae6ee
|
Moved some checks around
|
2013-08-09 16:28:12 -04:00 |
|
Maxim Biro
|
19bbed475d
|
Extracted repeated code into a function
|
2013-08-09 16:17:56 -04:00 |
|
Christian Brueffer
|
0b9adb1f26
|
Kill EOF whitespace.
|
2013-08-09 20:46:17 +02:00 |
|
irungentoo
|
44902d15a7
|
Merge pull request #409 from lukechampine/betterprompt
make toxic handle input in a more sane manner
|
2013-08-09 09:29:56 -07:00 |
|
irungentoo
|
79cbfb535e
|
Merge pull request #411 from slvr/master
Macports support (OS X only). MAP_ANON -> MAP_ANONYMOUS (OS X only).
|
2013-08-09 09:07:30 -07:00 |
|
irungentoo
|
b9991e1d3c
|
Merge pull request #410 from KostyaKow/array
Array
|
2013-08-09 09:07:03 -07:00 |
|
slvr
|
e3ab9af0e3
|
Merge commit '4b217bca97' into HEAD
|
2013-08-09 16:55:53 +01:00 |
|
Konstantin Kowalski
|
fa6fd7566b
|
Added headers to fix build errors.
|
2013-08-09 15:54:14 +00:00 |
|
slvr
|
91d8344cca
|
Macports support (OS X only). MAP_ANON -> MAP_ANONYMOUS (OS X only).
|
2013-08-09 16:51:54 +01:00 |
|
slvr
|
4b217bca97
|
Macports support (OS X only). MAP_ANON -> MAP_ANONYMOUS (OS X only).
|
2013-08-09 16:47:16 +01:00 |
|
Konstantin Kowalski
|
4f2ecd20e9
|
Minor style changes.
|
2013-08-09 15:45:34 +00:00 |
|
Konstantin Kowalski
|
5f41c30d66
|
Moved long comments to wiki.
|
2013-08-09 15:44:22 +00:00 |
|
Konstantin Kowalski
|
1033d897ca
|
Added arrays.
|
2013-08-09 15:38:21 +00:00 |
|
Konstantin Kowalski
|
fdb3e194ba
|
Added INFO() debugging macro.
|
2013-08-09 15:35:19 +00:00 |
|
Luke Champine
|
b378a246a0
|
make toxic handle input in a more sane manner
|
2013-08-09 10:31:29 -04:00 |
|
irungentoo
|
8542b5bac8
|
Merge pull request #407 from JFreegman/master
fixed chat window text wrapping in toxic
|
2013-08-09 05:35:01 -07:00 |
|
irungentoo
|
9673900278
|
Merge pull request #408 from cbrueffer/receivedfix
Fix a recurring typo in code and comments.
|
2013-08-09 05:29:07 -07:00 |
|
Christian Brueffer
|
0b8fa72914
|
Fix a recurring typo in code and comments.
|
2013-08-09 14:01:35 +02:00 |
|
Jfreegman
|
9910115b4e
|
fixed chat window text wrapping
|
2013-08-09 00:25:45 -04:00 |
|
irungentoo
|
29264b58fc
|
Merge pull request #404 from KostyaKow/small_fixes
Fixed a printf argument.
|
2013-08-08 19:42:29 -07:00 |
|
Konstantin Kowalski
|
7bd9c8399c
|
Fixed a printf argument.
|
2013-08-09 01:49:13 +00:00 |
|
irungentoo
|
ff25b59fa6
|
added -n argument to toxic to disable loading keys from file (for testing)
|
2013-08-08 18:50:29 -04:00 |
|
irungentoo
|
cd730b532a
|
Merge pull request #403 from jin-eld/fix-friend-status-callback
Fix typo in function name which results in missing symbol
|
2013-08-08 14:15:00 -07:00 |
|
irungentoo
|
eb7ac134db
|
Merge pull request #402 from Astonex/patch-5
Update CMakeLists.txt
|
2013-08-08 14:06:12 -07:00 |
|
jin-eld
|
24bebf57d0
|
Fix typo in function name which results in missing symbol
|
2013-08-09 00:03:14 +03:00 |
|
Astonex
|
85092b6441
|
Update CMakeLists.txt
|
2013-08-08 21:58:54 +01:00 |
|
irungentoo
|
5024bab930
|
Merge pull request #400 from JFreegman/master
Added actions/alternative type of messages
|
2013-08-08 12:40:15 -07:00 |
|
irungentoo
|
4d09e907e0
|
Merge pull request #399 from ReAzem/patch-1
Update .gitignore
|
2013-08-08 12:39:38 -07:00 |
|
Jfreegman
|
982c86df1f
|
added /me actions to toxic
|
2013-08-08 15:01:33 -04:00 |
|
Jfreegman
|
8719f46645
|
added actions/alternate messages
|
2013-08-08 15:00:30 -04:00 |
|
Alexandre Viau
|
c2fbe6e80b
|
Update .gitignore
Netbeans can't put his nbproject dir outside of source.
|
2013-08-08 14:55:52 -04:00 |
|
irungentoo
|
d9d0980ec8
|
Merge pull request #398 from Astonex/patch-4
Update nTox_win32.c
|
2013-08-08 11:40:27 -07:00 |
|
Astonex
|
54bacf49c9
|
Update nTox_win32.c
Mispelled function name
|
2013-08-08 19:39:29 +01:00 |
|
irungentoo
|
9634a23437
|
Merge branch 'master' of https://github.com/nurupo/InsertProjectNameHere into nurupo-master
Conflicts:
core/Messenger.c
|
2013-08-08 14:39:27 -04:00 |
|
irungentoo
|
249f552e67
|
Merge pull request #397 from leeroy2098/merge
Implement proper configuration directories for toxic
|
2013-08-08 11:37:58 -07:00 |
|
Maxim Biro
|
04c974962c
|
Made name consistent with other 'on change' callbacks
|
2013-08-08 13:54:16 -04:00 |
|
Maxim Biro
|
23f55c101d
|
Fixed a silly code ordering mistake
|
2013-08-08 13:42:27 -04:00 |
|
irungentoo
|
1fb2085c67
|
Fixed dynamic memory allocation.
|
2013-08-08 12:13:29 -04:00 |
|
Simon Levermann
|
320c5a6708
|
Merge branch 'upstream'
|
2013-08-08 18:06:10 +02:00 |
|
Simon Levermann
|
caedd4489e
|
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core into upstream
|
2013-08-08 18:05:41 +02:00 |
|
irungentoo
|
cd22973d48
|
Merge pull request #396 from lukechampine/dynamicfriends
make friendlist resize dynamically
|
2013-08-08 08:50:06 -07:00 |
|
irungentoo
|
a02390836e
|
Merge pull request #395 from fhahn/ctest
Use ctest to integrate unit tests into cmake build system
|
2013-08-08 08:29:37 -07:00 |
|
irungentoo
|
4542a6b829
|
Merge pull request #394 from Nominate/patch-2
Updated chat.c to bring /status inline with prompt.c status command
|
2013-08-08 08:27:19 -07:00 |
|
irungentoo
|
997a15d294
|
Merge pull request #393 from Nominate/patch-1
Removed superfluous statusmsg
|
2013-08-08 08:26:19 -07:00 |
|