Commit Graph

1055 Commits

Author SHA1 Message Date
Jfreegman
0ae9ec1815 partially fixed friend add bug (key length test still broken) 2013-07-31 17:36:04 -04:00
Jfreegman
a448d39fd7 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-07-31 17:30:51 -04:00
Jfreegman
8f6e1d8fbf partially fixed friend add bug (key length test still broken) 2013-07-31 17:30:16 -04:00
Dave Eddy
a784c852f4 touch up docs to link to eachother 2013-07-31 17:15:32 -04:00
irungentoo
c558cb63f6 Merge pull request #216 from JFreegman/master
remove debugging printf statement
2013-07-31 13:00:08 -07:00
Jfreegman
3eafbc900e remove debugging printf statement 2013-07-31 15:34:34 -04:00
irungentoo
0d5eef4b43 Backspace key should now work on more terminals in toxic. 2013-07-31 15:22:43 -04:00
irungentoo
639d1faa5d Merge pull request #215 from plutooo/master
toxic: Made everything 1000x more userfriendly.
2013-07-31 11:23:13 -07:00
plutooo
0815d1110d toxic: Made everything 1000x more userfriendly. 2013-07-31 11:20:16 -07:00
irungentoo
3c177d6a83 Merge pull request #213 from plutooo/master
Added chat windows, and some clean up.
2013-07-31 10:31:21 -07:00
plutooo
2247b7fad5 Added chat windows, and some clean up. 2013-07-31 10:20:03 -07:00
irungentoo
14bf0699e7 Merge pull request #210 from nickodell/master
Show error message instead of "added friendnumber -1"
2013-07-31 09:50:50 -07:00
irungentoo
d0888f750c Fixed something in readme. 2013-07-31 12:44:03 -04:00
irungentoo
5438da42c0 Merge pull request #209 from pyrobisqit/patch-1
more tweaks to README.md
2013-07-31 09:43:16 -07:00
Nick ODell
ccbe4c6799 Show error message instead of "added friendnumber -1" 2013-07-31 10:38:13 -06:00
pyrobisqit
d9f88fd89e more tweaks to README.md
Simplified a few blocks and made it easier to read, corrected punctuation and bits here and there.
2013-07-31 16:46:49 +02:00
irungentoo
bdd13d1954 Merge branch 'master' of https://github.com/JFreegman/ProjectTox-Core into JFreegman-master
Conflicts:
	testing/nTox.c
2013-07-31 10:25:29 -04:00
irungentoo
55a2e59a64 Fixed build. 2013-07-31 08:35:06 -04:00
irungentoo
f2f266e9a7 Merge branch 'master' of https://github.com/xzfc/ProjectTox-Core into xzfc-master
Conflicts:
	CMakeLists.txt
2013-07-31 07:56:10 -04:00
irungentoo
7252456c87 Merge pull request #171 from AMDmi3/freebsd-fixes
FreeBSD fixes
2013-07-31 04:46:12 -07:00
irungentoo
d28726cacb Merge pull request #189 from CharmlessCoin/master
Added a list of user commands under docs/, and a "start-up" guide.
2013-07-31 04:43:55 -07:00
irungentoo
943694a746 Merge pull request #190 from pyrobisqit/patch-1
Update readme.md
2013-07-31 04:43:12 -07:00
irungentoo
f2d310b91a Merge pull request #191 from theshadowfog/patch-6
Update nTox.c
2013-07-31 04:42:48 -07:00
irungentoo
0c27406389 Merge pull request #193 from Astonex/master
Fixed cpu usage
2013-07-31 04:42:08 -07:00
irungentoo
b4eb49eae2 Merge pull request #200 from jquadrin/master
stat file before attempting to open
2013-07-31 04:37:08 -07:00
irungentoo
b2dbefb4c9 Merge pull request #201 from blast-hardcheese/master
Adding homebrew commands to INSTALL
2013-07-31 04:34:45 -07:00
irungentoo
31d9af8e76 Merge pull request #205 from mhinz/fix-indent
Fix space/tab indentation
2013-07-31 04:33:51 -07:00
irungentoo
335fe2b860 Merge pull request #206 from pflo/master
Added the short documentations
2013-07-31 04:33:27 -07:00
Jfreegman
17e64b3ee5 initialize num_requests 2013-07-31 05:52:08 -04:00
charmlesscoin
e52db5b8b7 Wrote the commands down and a 'start up' guide. 2013-07-31 05:00:40 -04:00
xzfcpw
f77fe65d54 NaCl compiling option 2013-07-31 15:42:05 +07:00
Marco Hinz
439de6fa3a Fix space/tab indentation 2013-07-31 10:36:02 +02:00
pflo
c4a5dabe05 Create start_guide.md
Written by charmlesscoin.
2013-07-31 15:28:36 +07:00
pflo
11d4f18abd Create start_guide.de.md
Translated the original small documentation to german.
2013-07-31 15:27:19 +07:00
Joseph Quadrino
9f6be0ce4b stat file before attempting to open 2013-07-31 03:07:51 -04:00
Devon Stewart
fedb82e9d6 Adding homebrew commands to INSTALL 2013-07-31 16:05:29 +09:00
Stuart Banks
207c067cf2 Clean up/format code 2013-07-31 02:15:01 -04:00
Astonex
d848c15912 Fixed cpu usage 2013-07-31 04:32:18 +01:00
Dmitry Marakasov
89dd7ed011 Add detection of required libraries 2013-07-31 06:15:26 +04:00
Greg
2d7143e850 Update nTox.c
Made the help message a string type.
2013-07-30 21:36:22 -04:00
pyrobisqit
bd8ba0bd6e Update readme.md
Basically, a few words tweaked here and there, to make the file more gramatically correct.
2013-07-31 03:17:40 +02:00
irungentoo
52a77cc997 Merge pull request #187 from Teknocrat/master
libconfig dependency
2013-07-30 17:47:12 -07:00
teknocrat
b1ec17a357 Merge branch 'patch-1' of https://github.com/Teknocrat/ProjectTox-Core into patch-1 2013-07-30 19:29:33 -05:00
Teknocrat
7803acc375 Create FindLibConfig.cmake
Warning, this is a google snippet, but works fine, shouldn't be an issue
2013-07-30 19:12:29 -05:00
Teknocrat
4faa145789 Update CMakeLists.txt
This thing requires libconfig but doesn't test for it...
2013-07-30 19:09:36 -05:00
irungentoo
1b4eea2186 Small fixes. 2013-07-30 19:38:05 -04:00
irungentoo
f6d508735a Merge branch 'patch-3' of https://github.com/Astonex/ProjectTox-Core into Astonex-patch-3 2013-07-30 19:28:36 -04:00
irungentoo
f25bfb9341 Merge pull request #183 from Proplex/master
Update readme with tutorial videos
2013-07-30 16:14:38 -07:00
Astonex
cd0518a45c Update Messenger.c
Offer more meaningful returns so appropriate actions can be taken by the GUI.
2013-07-31 00:13:31 +01:00
NemDiggers
69980e3c0c Remind users that directory isn't actually legit 2013-07-30 19:09:29 -04:00