Commit Graph

727 Commits

Author SHA1 Message Date
irungentoo
85324e07a0 Merge pull request #269 from ragesalmon/master
Fixed a build error due to the removal of getnumfriends()
2013-08-02 10:01:01 -07:00
ragesalmon
563c2b3157 Fixed a build error due to the removal of getnumfriends() 2013-08-02 12:40:39 -04:00
charmlesscoin
b114575df8 updated return value comments 2013-08-02 12:35:34 -04:00
charmlesscoin
4b49df896f added #defines for friend.status as well as for erroring on m_addfriend* 2013-08-02 12:33:11 -04:00
irungentoo
2a074d1160 Merge branch 'master' into Jeffail-master 2013-08-02 12:17:24 -04:00
irungentoo
eba7fdb9ba Merge pull request #265 from theshadowfog/patch-4
Update README.md
2013-08-02 08:53:21 -07:00
irungentoo
c7d383dd25 Merge pull request #266 from CharmlessCoin/core
Removed getnumfriends()
2013-08-02 08:53:12 -07:00
irungentoo
df8a8ff67e Merge branch 'master' into Jeffail-master 2013-08-02 11:46:12 -04:00
charmlesscoin
6ed5b89e5b removed getnumfriends() 2013-08-02 11:36:39 -04:00
irungentoo
d428091b46 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-08-02 11:13:35 -04:00
Andreas Schneider
247c420957 cmake: Rewrite FindSODIUM.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Signed-off-by: irungentoo <irungentoo@gmail.com>
2013-08-02 11:12:27 -04:00
Greg
388076a8e8 Update README.md
Added link to commands.rst
2013-08-02 10:55:57 -04:00
irungentoo
b9176974a8 Merge branch 'master' into Jeffail-master
Conflicts:
	core/DHT.c
2013-08-02 10:41:03 -04:00
irungentoo
a2b4b3fa8d Merge pull request #263 from theshadowfog/patch-7
Update commands.rst
2013-08-02 06:47:08 -07:00
Andreas Schneider
20951dda7d DHT: Fix return value of time().
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Signed-off-by: irungentoo <irungentoo@gmail.com>
2013-08-02 09:41:22 -04:00
Greg
751ecba283 Update commands.rst 2013-08-02 09:17:29 -04:00
irungentoo
7379392d80 Merge pull request #253 from nickodell/master
Remove some magic numbers; use macros to clarify intent
2013-08-02 04:54:57 -07:00
irungentoo
eba742896f Merge pull request #262 from stqism/master
Fixed the WIKI link, made the first INSTALL.md a link
2013-08-02 04:36:54 -07:00
irungentoo
f2c713fd8f Merge pull request #259 from JFreegman/master
fixed cursor in toxic.c
2013-08-02 04:33:50 -07:00
Sean Qureshi
35d24ab02e The bold INSTALL.md did not look correct 2013-08-02 04:30:46 -07:00
Sean Qureshi
637096be33 Updated the readme to the new wiki page, linked the Mac OSX INSTALL.md 2013-08-02 04:27:41 -07:00
Jeffail
67efb67f96 Refactored DHT.c from end of NAT punching to EOF 2013-08-02 10:59:09 +01:00
Jeffail
bcf36e8115 Refactored DHT.c, all of NAT punching functions (line 1217 2013-08-02 10:56:10 +01:00
Jeffail
1708dc1a88 Refactored DHT.c down to line 1048 (beginning of NAT) 2013-08-02 10:53:28 +01:00
Jeffail
f9816b43f3 Refactored DHT.c down to line 881 2013-08-02 10:49:54 +01:00
Jeffail
cef8a3e4e5 Refactored DHT.c down to line 779 2013-08-02 10:47:32 +01:00
Jeffail
a5a1f917ab Refactored DHT.c down to line 567 2013-08-02 10:43:00 +01:00
Jeffail
e7f74555ea Refactored DHT.c down to line 367 2013-08-02 10:39:04 +01:00
Jeffail
fda296e41d Refactored client/friend helper functions (down to line 274) 2013-08-02 10:32:25 +01:00
Jfreegman
fd9ca04c9b Merge branch 'master' of https://github.com/JFreegman/ProjectTox-Core 2013-08-02 05:12:15 -04:00
Jfreegman
7189f4c7b2 fixed cursor 2013-08-02 05:10:41 -04:00
Jfreegman
1205b902e4 rm unused arg 2013-08-02 05:08:04 -04:00
Jfreegman
fbf92e4f5e remove cursor from friend and chat windows 2013-08-02 04:58:15 -04:00
Jfreegman
5541008b3b fixed cursor 2013-08-02 03:36:31 -04:00
Nick ODell
fd95ab5ed7 Remove some magic numbers; use macros to clarify intent 2013-08-01 19:21:50 -06:00
irungentoo
91216719a5 Updated comments. 2013-08-01 20:40:58 -04:00
irungentoo
af8e843451 Merge pull request #229 from JFreegman/master
fixed friend add bugs and gave no message its own error
2013-08-01 17:38:29 -07:00
irungentoo
276e3f9271 Editor specific files don't belong in the repo. 2013-08-01 20:35:58 -04:00
irungentoo
368ba8ed01 Merge pull request #247 from Jeffail/master
Refactored most of DHT.c, added local vim config
2013-08-01 17:35:31 -07:00
irungentoo
e3c47d90b9 Merge pull request #249 from rlt3/master
Re-styling Lossless_UDP.c and .h
2013-08-01 17:24:46 -07:00
irungentoo
2e892cc981 Merge pull request #251 from CharmlessCoin/network
Rewrote get_broadcast() so it works now.
2013-08-01 16:54:30 -07:00
irungentoo
4c949c5b13 Merge pull request #252 from nickodell/master
Fix a bug and remove useless code.
2013-08-01 16:52:25 -07:00
Nick ODell
67b7523b18 Remove code that did nothing. 2013-08-01 16:19:01 -06:00
Nick ODell
ff2e04b107 Fix bug where messages from yourself were preceeded by [-1] 2013-08-01 16:15:56 -06:00
Jeffail
4f2146c085 Back to old methods, reordered the structs, defines, and global variables to the top, should be no changes to binary 2013-08-01 22:53:50 +01:00
rlt3
7097349552 removed potential segfault 2013-08-01 17:52:17 -04:00
irungentoo
c6799c5fbe Merge pull request #220 from fhahn/sphinx-docs
Documentation using sphinx
2013-08-01 14:44:41 -07:00
irungentoo
1e01637516 Merge pull request #248 from bigfack/patch-1
Update INSTALL.md
2013-08-01 14:12:43 -07:00
bigfack
ca4d8de765 Update INSTALL.md 2013-08-01 16:07:43 -05:00
rlt3
a164c15c00 removing unnecessary binary files 2013-08-01 17:03:06 -04:00