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
|
68317c8d51
|
Merge pull request #307 from CharmlessCoin/toxic
fix for issue #306
|
2013-08-03 14:52:25 -07:00 |
|
charmlesscoin
|
a65715e811
|
fix for issue #306
|
2013-08-03 17:29:18 -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 |
|
Michael Kress
|
2e476a06b6
|
Merge branch 'master' of github.com:m-kress/ProjectTox-Core
|
2013-08-03 16:18:01 +02:00 |
|
Astonex
|
8fac63f6df
|
Changing status to offline when quitting wont overwrite last saved status
|
2013-08-03 15:12:22 +01:00 |
|
Michael Kress
|
28944151c7
|
fixed printing time stamp in toxic
|
2013-08-03 16:00:48 +02:00 |
|
Astonex
|
da8996dbdd
|
Merge branch 'master' of git://github.com/irungentoo/ProjectTox-Core
|
2013-08-03 14:57:42 +01:00 |
|
Astonex
|
fcad4d0a5a
|
nTox_win32 - Updated friends list display
|
2013-08-03 14:14:33 +01:00 |
|
irungentoo
|
8cb960e785
|
Merge pull request #281 from JFreegman/master
cursor done better, fixed for chat windows
|
2013-08-03 05:14:44 -07:00 |
|
irungentoo
|
c01b87ef2b
|
Merge pull request #282 from bakwc/master
Curses dependence added to CMake
|
2013-08-03 05:03:45 -07:00 |
|
irungentoo
|
dc8e188f30
|
Merge pull request #287 from greato/master
Added break; Statement
|
2013-08-03 05:03:05 -07:00 |
|
irungentoo
|
2e4a143754
|
Merge pull request #290 from pb82/master
Fedora specific installation instructions
|
2013-08-03 05:02:45 -07:00 |
|
irungentoo
|
d2f2fd35b1
|
Merge pull request #291 from m-kress/master
added backspace to nTox; removed trailing spaces
|
2013-08-03 05:02:28 -07:00 |
|
pb82
|
b838c867d8
|
typo
|
2013-08-03 13:37:15 +02:00 |
|
pb82
|
7b112116db
|
rearranged fedora specific instructions
|
2013-08-03 13:36:01 +02:00 |
|
pb82
|
0ba09a798d
|
added some more details (libsodium without checkinstall)
|
2013-08-03 13:32:56 +02:00 |
|
Michael Kress
|
d5493bb24f
|
added backspace to nTox; removed trailing spaces
|
2013-08-03 13:27:52 +02:00 |
|
pb82
|
e874c5b0f6
|
should be 'make check'
|
2013-08-03 13:19:39 +02:00 |
|
pb82
|
4175f73ea8
|
installation instructions for Fedora (17)
|
2013-08-03 13:16:52 +02:00 |
|
Sean Qureshi
|
bc2d8579cd
|
Merge pull request #3 from stqism/master
Removed some useless code
|
2013-08-03 04:12:50 -07:00 |
|
Sean Qureshi
|
86d7734efe
|
Removed some useless code
|
2013-08-03 04:10:47 -07:00 |
|
Sean Qureshi
|
0e4baac0f1
|
Merge pull request #2 from stqism/master
Adds fixes from master in testing
|
2013-08-03 04:07:59 -07:00 |
|
Sean Qureshi
|
6cfdf68940
|
Merge branch 'master' of github.com:stqism/ProjectTox-Core
|
2013-08-03 04:00:13 -07:00 |
|
Sean Qureshi
|
52f1dcd9ff
|
Fixed a segfault when recieving text
|
2013-08-03 03:59:27 -07:00 |
|
Astonex
|
892249eabb
|
Merge remote-tracking branch 'ProjectTox/master'
|
2013-08-03 11:33:46 +01:00 |
|
Astonex
|
c1a8bc52f6
|
Can only accept friend request when one is pending now
|
2013-08-03 11:32:58 +01:00 |
|