Commit Graph

909 Commits

Author SHA1 Message Date
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
Sean Qureshi
9e2eed644e Merge pull request #1 from stqism/master
Toxic testing
2013-08-03 02:00:10 -07:00
Sean Qureshi
c444d7a5d4 Added a break from a pull request
Merged a change from https://github.com/greato/ProjectTox-Core
2013-08-03 01:55:07 -07:00
Sean Qureshi
e9c330dc60 Merged a change from a pull request, added a break
Merged from https://github.com/greato/ProjectTox-Core
2013-08-03 01:52:13 -07:00
Sean Qureshi
cef0c68bdc Merge https://github.com/greato/ProjectTox-Core 2013-08-03 01:46:01 -07:00
g
dd6f44a2c7 Added break Statement 2013-08-03 15:59:46 +08:00
Filipp Ozinov
5ea6b58ec4 Curses check is now only on *nix 2013-08-03 11:08:21 +04:00
Sean Qureshi
97fbdea304 Merge https://github.com/JFreegman/ProjectTox-Core 2013-08-02 22:31:21 -07:00
charmlesscoin
9b6283c084 whoops, removed part of a string by accident. 2013-08-03 01:27:20 -04:00
Filipp Ozinov
a85fce5c03 Curses dependence added to CMake 2013-08-03 09:17:44 +04:00
charmlesscoin
bb2ea0e5b4 Fixed the printing of a few strings, moved some code around. 2013-08-03 01:14:30 -04:00
charmlesscoin
6b8f12e33c added a getopt system, with -f and -h flags 2013-08-03 00:45:34 -04:00
Sean Qureshi
62bf320b6e Removed the seconds patch, it breaks things 2013-08-02 19:58:00 -07:00