Commit Graph

994 Commits

Author SHA1 Message Date
irungentoo
10024f5073 Merge pull request #325 from stqism/master
Fixed a calloc getting freed before being used
2013-08-04 13:25:57 -07:00
Sean Qureshi
0fad8e3638 Fixed a calloc getting freed before being used 2013-08-04 13:16:08 -07:00
irungentoo
b9f387b3b7 Merge pull request #311 from CharmlessCoin/nTox
nTox Cleaning
2013-08-04 08:27:15 -07:00
irungentoo
b4ae32c1c3 Merge pull request #313 from CharmlessCoin/bug_fixes
Removed memory leak, thanks to diath for spotting it.
2013-08-04 07:24:00 -07:00
irungentoo
b2622726b1 Merge pull request #319 from stqism/master
Manually merged #314 and #317, resolving errors if both merged
2013-08-04 07:18:20 -07:00
irungentoo
b0f3b27fc8 Merge pull request #321 from plutooo/master
toxic: Fixed doMessenger() interval.. Toxic is much faster and responsiv...
2013-08-04 07:15:49 -07:00
Tim Malte Gräfje
0259cb0194 added fix in nTox_win32.c 2013-08-04 13:01:20 +02:00
Sean Qureshi
b471236c50 Manally merged #314 and #317 2013-08-04 03:52:24 -07:00
plutooo
5300e98288 toxic: Fixed doMessenger() interval.. Toxic is much faster and responsive now. 2013-08-04 03:27:36 -07:00
Jfreegman
91d883c4a4 already a pull request with this addition 2013-08-04 05:32:53 -04:00
charmlesscoin
ae8367dc3e whoops, returning a free'd variable is really not what I meant... 2013-08-04 05:09:12 -04:00
Jfreegman
7b380ed6d2 didn't mean to delete that 2013-08-04 05:00:16 -04:00
Jfreegman
b513c3d352 added command functionality to chat windows and a few minor improvements 2013-08-04 04:42:17 -04:00
charmlesscoin
0b6806d7f7 Removed memory leak, thanks to diath for spotting it. 2013-08-04 04:29:32 -04:00
Jfreegman
357c02ac22 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-08-04 02:40:57 -04:00
charmlesscoin
b36bca295c fixed bug that would cause this to always exit 2013-08-03 21:59:17 -04:00
Tim Malte Gräfje
170af10204 Merge remote-tracking branch 'upstream/master' 2013-08-04 02:17:14 +02:00
Tim Malte Gräfje
5817c2c888 fix for #288
nTox will now display a message if you try to accept a not yet received
or already accepted friend request
2013-08-04 01:46:54 +02:00
irungentoo
6f0ae0dbb4 Merge pull request #308 from jaekwon/bleh
various fixes for first time user
2013-08-03 16:10:17 -07:00
charmlesscoin
175a434de3 removed some magic numbers from line_eval() 2013-08-03 18:06:28 -04:00
charmlesscoin
6222e32848 added some better error checking for print_nickname() anr print_statuschange() 2013-08-03 18:02:09 -04:00
charmlesscoin
43f6608530 cleaned up load_key() and added more error checking 2013-08-03 17:57:44 -04:00
irungentoo
68317c8d51 Merge pull request #307 from CharmlessCoin/toxic
fix for issue #306
2013-08-03 14:52:25 -07:00
Jae Kwon
158751cb2d various fixes for first time user
* added linking to libsodium
* fixed links to docs to point to wiki
2013-08-03 14:46:52 -07:00
charmlesscoin
a65715e811 fix for issue #306 2013-08-03 17:29:18 -04:00
Jfreegman
c13de2d285 added command to clear prompt screen 2013-08-03 17:13:44 -04:00
irungentoo
09a6d2d351 Merge branch 'nTox' of https://github.com/CharmlessCoin/ProjectTox-Core into CharmlessCoin-nTox
Conflicts:
	testing/nTox.c
2013-08-03 16:46:58 -04:00
irungentoo
1ddd28f52b Merge pull request #276 from stqism/master
Adds timestamp to toxic, fixes issue #217
2013-08-03 13:33:27 -07:00
irungentoo
0c3cd5d7fb Merge pull request #305 from CharmlessCoin/toxic
Toxic -f Flag
2013-08-03 13:31:46 -07:00
charmlesscoin
9b56e21f81 added a proper error message for messing up the -f flag 2013-08-03 16:12:02 -04:00
irungentoo
5e1434813f Merge pull request #304 from yati-sagade/master
Fixed a link in the README.
2013-08-03 12:59:50 -07:00
charmlesscoin
d34e4a3408 added the -f flag for toxic 2013-08-03 15:12:02 -04:00
Yati Sagade
7503bfe0aa Fixed a link 2013-08-04 00:37:14 +05:30
Yati Sagade
e77424c40a Fixed a link 2013-08-04 00:35:39 +05:30
Sean Qureshi
54aebfd807 Removed an early break 2013-08-03 11:51:40 -07:00
Sean Qureshi
6209d103f4 Merge branch 'master' of https://github.com/stqism/ProjectTox-Core 2013-08-03 11:45:07 -07:00
Sean Qureshi
5c136b116d Merge pull request #5 from stqism/toxic-testing
Toxic testing
2013-08-03 11:44:36 -07:00
Sean Qureshi
e4d63c63c7 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-08-03 11:41:47 -07:00
Sean Qureshi
391e1ae05d Merge pull request #4 from m-kress/master
fixed time stamps in toxic
2013-08-03 11:32:22 -07:00
irungentoo
7b84aaaac8 Merge pull request #302 from ChlorideCull/master
Changed CMake options to compile the core as a shared library instead of static
2013-08-03 10:14:07 -07:00
irungentoo
fb14b3eccd Fixed compatibility with original NaCl. 2013-08-03 12:45:44 -04:00
Chloride Cull
add9c0b6dc Changed CMake options to compile the core shared
It is now compiled under 'toxcore' instead of just 'core' to be able to be installed without conflicts.
2013-08-03 18:25:12 +02:00
irungentoo
646fe213a8 Merge pull request #299 from plutooo/master
DHT: added id_equal(), ipport_equal(), is_timeout()
2013-08-03 09:09:22 -07:00
irungentoo
27b824420f Merge pull request #300 from Proplex/master
People aren't that excited to send messages
2013-08-03 08:55:31 -07:00
NemDiggers
a1c31557f2 People aren't that excited to send messages 2013-08-03 11:53:51 -04:00
plutooo
e5d2c219af DHT: added id_equal(), ipport_equal(), is_timeout() 2013-08-03 08:32:09 -07:00
irungentoo
aa78644aed Merge pull request #298 from Proplex/master
Update readme to refer to new developer blog.
2013-08-03 08:22:06 -07:00
NemDiggers
72c17699dc Update readme to refer to new developer blog.
If you need an account on the CMS; contact me on IRC.
2013-08-03 11:14:00 -04:00
irungentoo
08fbaf0c53 Merge pull request #296 from Astonex/master
nTox_win32 - Small changes to friends list
2013-08-03 07:37:53 -07:00
Michael Kress
1ae2bfbb75 added seconds to time stamp in toxic 2013-08-03 16:26:23 +02:00