1108 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
irungentoo	eacd12385f	Merge branch 'master' of https://github.com/JFreegman/ProjectTox-Core into JFreegman-master ... Conflicts: testing/toxic/prompt.c	2013-08-06 10:16:26 -04:00
irungentoo	611c0af3d6	Merge pull request #354 from Nominate/patch-4 ... Stops line-spamming and clears before printing help	2013-08-06 07:13:32 -07:00
Nominate	532f16a377	Fixed formatting	2013-08-06 11:50:10 +01:00
Nominate	fb9791bc69	Update prompt.c	2013-08-06 11:20:11 +01:00
Nominate	45c84e55e6	Corrected wrap-around ... This should allow wrap-around and allow proper execution.	2013-08-06 11:16:17 +01:00
Nominate	1f001b2f91	Stops line-spamming and clears before printing help ... This addresses one issue in #340 perfectly and slightly improves the other.	2013-08-06 08:10:05 +01:00
irungentoo	9613646af2	Merge pull request #353 from cjsthompson/master ... On UNIX, if pkg-config is available, use it to find the location of libconfig's headers.	2013-08-05 21:47:22 -07:00
Christoph J. Thompson	3cd6aeb541	On UNIX, if pkg-config is available, use it to find the location of ... libconfig's headers. modified: cmake/FindLIBCONFIG.cmake	2013-08-06 06:33:32 +02:00
charmlesscoin	95a3f69580	Merge branch 'master' of git://github.com/irungentoo/ProjectTox-Core	2013-08-05 23:51:32 -04:00
irungentoo	b4664f3f29	Merge pull request #352 from stqism/master ... In odd cases a terminal may not support beep, added flash as well.	2013-08-05 18:22:34 -07:00
Sean Qureshi	56ac2af45b	Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core	2013-08-05 17:50:08 -07:00
Sean Qureshi	caee2c3fe5	Added flash, apparently in weird cases it works when beep fails	2013-08-05 17:47:49 -07:00
irungentoo	7aa45107be	Merge pull request #351 from joshuaj/toxic_flicker_fix ... Fixed toxic friends list flicker	2013-08-05 17:37:10 -07:00
irungentoo	1daf064621	Merge branch 'plutooo-master'	2013-08-05 20:36:20 -04:00
irungentoo	524cf18954	Fixed style and is_pinging().	2013-08-05 20:35:47 -04:00
irungentoo	5d1657432a	Merge pull request #350 from stqism/master ... Removed a useless ! from toxics status	2013-08-05 17:25:33 -07:00
irungentoo	109fe7bd0a	Merge pull request #341 from stal888/userstatus-ext ... An extension to user statuses.	2013-08-05 17:24:04 -07:00
Sebastian Stal	37afc3c583	Windoze	2013-08-05 17:20:41 -07:00
Sean Qureshi	256a4fe63f	Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core	2013-08-05 17:09:31 -07:00
Sean Qureshi	798504905b	Removed a useless ! from toxics status	2013-08-05 17:08:05 -07:00
irungentoo	f4c40c3672	Merge pull request #349 from volgafan/patch-1 ... Update install.rst	2013-08-05 15:58:43 -07:00
irungentoo	853c70688d	Merge pull request #348 from stqism/master ... Throws in a bell when a message is recieved, to warn to user	2013-08-05 15:58:30 -07:00
volgafan	437554b999	Update install.rst ... sudo should be used instead bash	2013-08-05 15:53:50 -07:00
irungentoo	c9a597b794	Merge branch 'master' of https://github.com/plutooo/ProjectTox-Core into plutooo-master	2013-08-05 18:48:34 -04:00
Sean Qureshi	cb39cdbe5e	Throws in a bell when a message is recieved, to warn to user	2013-08-05 15:39:32 -07:00
Jfreegman	663764e046	spacing didn't match outgoing msgs	2013-08-05 18:38:55 -04:00
Jfreegman	3f712d2650	bug fix and added wrapping on friends list	2013-08-05 18:07:08 -04:00
irungentoo	8618662e29	Merge pull request #347 from nickodell/master ... Fix bug where handle_NATping wouldn't perform bounds checking	2013-08-05 14:56:28 -07:00
Nick ODell	84607c8937	Fix bug where friendreq_handlepacket did not do bounds checking	2013-08-05 14:54:53 -06:00
Nick ODell	9364db9eff	Fix bug where handle_NATping wouldn't perform bounds checking	2013-08-05 14:46:45 -06:00
Jfreegman	16a74ffaf9	list commands on chat window popup	2013-08-05 16:34:55 -04:00
charmlesscoin	d925505066	Merge branch 'master' of git://github.com/irungentoo/ProjectTox-Core	2013-08-05 16:11:37 -04:00
Jfreegman	4b76983a69	chat window deleting and re-adding - it just werks	2013-08-05 16:04:06 -04:00
plutooo	071ac46308	core: Rewrote ping-module, better performance and cleaner code.	2013-08-05 12:51:58 -07:00
Sebastian Stal	5ec3b2330e	Make test clients compatible with userstatus kinds ... No features were added, just fixed callbacks.	2013-08-05 12:30:40 -07:00
Sebastian Stal	b7f989266d	Add functions for dealing with userstatus kinds.	2013-08-05 12:30:07 -07:00
irungentoo	f0397ebb2b	Merge pull request #339 from Nominate/patch-3 ... Grammar/aesthetic amendment	2013-08-05 10:55:28 -07:00
Nominate	42c79dfcbb	Grammar/aesthetic amendment	2013-08-05 18:52:28 +01:00
irungentoo	dcb10c0264	Merge pull request #338 from Nominate/patch-1 ... Added a 'clear' function to the prompt	2013-08-05 10:46:59 -07:00
Jfreegman	a91aee0a9f	Merge remote-tracking branch 'upstream/master' into testing	2013-08-05 13:42:15 -04:00
Nominate	39545a92da	Added a 'clear' function to the prompt	2013-08-05 18:33:16 +01:00
joshuaj	bafd996e72	Fixed toxic friends list flicker	2013-08-05 10:14:44 -07:00
irungentoo	dc3fe775fc	Merge pull request #334 from lukechampine/master ... temporary fix to prevent m_addfriend from segfaulting	2013-08-05 08:32:44 -07:00
Luke Champine	d1f84efdd7	temporary fix to prevent m_addfriend from segfaulting	2013-08-05 11:22:47 -04:00
irungentoo	519e22677a	Merge pull request #312 from Niautanor/master ... fix for Issue #288	2013-08-05 07:19:50 -07:00
irungentoo	dc70dafb0d	Merge pull request #333 from fhahn/void-parameters ... Use void for functions with no parameters	2013-08-05 07:09:47 -07:00
Florian Hahn	5617bf0bf1	Use void for functions with no parameters	2013-08-05 15:57:17 +02:00
Jfreegman	29880b4299	init array	2013-08-05 02:48:59 -04:00
Jfreegman	17f121c58e	Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core into testing	2013-08-05 02:33:15 -04:00
Jfreegman	e479f338c1	test	2013-08-05 02:32:50 -04:00