 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 |
|
|
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 |
|
|
Sean Qureshi
|
97fbdea304
|
Merge https://github.com/JFreegman/ProjectTox-Core
|
2013-08-02 22:31:21 -07:00 |
|
|
Sean Qureshi
|
62bf320b6e
|
Removed the seconds patch, it breaks things
|
2013-08-02 19:58:00 -07:00 |
|
|
Sean Qureshi
|
7dd63b45ca
|
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core
|
2013-08-02 19:55:44 -07:00 |
|
|
Jfreegman
|
8fa074db5e
|
cursor done better, fixed for chat windows
|
2013-08-02 21:36:01 -04:00 |
|
|
Sean Qureshi
|
d19b4b9db1
|
Moved PATCH.md to the toxic folder
|
2013-08-02 17:50:35 -07:00 |
|
|
Sean Qureshi
|
adffc77b75
|
Forgot a bit of documentation on using the patch
|
2013-08-02 17:46:31 -07:00 |
|
|
Sean Qureshi
|
8bc8016291
|
By popular demand, I made a patch to add seconds to the timestamp
|
2013-08-02 17:44:30 -07:00 |
|
|
irungentoo
|
e029b65ece
|
Merge pull request #277 from CharmlessCoin/nTox_fixes
nTox cleanups
|
2013-08-02 17:32:25 -07:00 |
|
|
irungentoo
|
7d7c5faa09
|
Merge pull request #275 from nickodell/master
Fix bug where memcpy could overrun buffer; Replace ZEROBYTES - BOXZEROBYTES with MACBYTES
|
2013-08-02 17:30:44 -07:00 |
|
|
irungentoo
|
9e5800ab10
|
Fixed regression.
|
2013-08-02 20:21:49 -04:00 |
|
|
Sean Qureshi
|
9267ab2fca
|
Fixed a bug with the minutes only being 1 character long when less than 10
|
2013-08-02 17:14:47 -07:00 |
|
|
charmlesscoin
|
f906fd628f
|
cleaned up my changes
|
2013-08-02 19:54:57 -04:00 |
|
|
charmlesscoin
|
809ee9af75
|
new_lines should use strncpy, and wrote get_id() to declutter code
|
2013-08-02 19:51:08 -04:00 |
|
|
Sean Qureshi
|
10feea4474
|
Adds timestamp to toxic, fixes issue #217
|
2013-08-02 16:44:32 -07:00 |
|
|
Nick ODell
|
9c039cfd2a
|
Replace ZEROBYTES - BOXZEROBYTES with MACBYTES
|
2013-08-02 16:35:41 -06:00 |
|
|
irungentoo
|
f8f24ba48a
|
Fixed crashes.
|
2013-08-02 16:56:53 -04:00 |
|
|
irungentoo
|
0ec775c50e
|
Removed deprecated function.
|
2013-08-02 16:50:22 -04:00 |
|
|
irungentoo
|
f9d28d3792
|
Merge branch 'master' of https://github.com/Astonex/ProjectTox-Core into Astonex-master
Conflicts:
testing/nTox_win32.c
|
2013-08-02 16:36:52 -04:00 |
|
|
irungentoo
|
61f41474e3
|
Fixed warnings.
|
2013-08-02 16:29:21 -04:00 |
|
|
irungentoo
|
802236272f
|
Merge branch 'Jeffail-master'
|
2013-08-02 16:20:26 -04:00 |
|
|
irungentoo
|
7b46b04ce7
|
Time is better as an unsigned variable.
|
2013-08-02 15:57:53 -04:00 |
|
|
Nick ODell
|
8d1f7753f6
|
Fix bug where memcpy could overrun buffer
|
2013-08-02 13:40:56 -06:00 |
|
|
irungentoo
|
346e4b28ca
|
Fixed problems.
|
2013-08-02 15:28:48 -04:00 |
|
|
Astonex
|
58ef293ca4
|
Update nTox_win32.c
Changed maxnumfriends to uint32_t
|
2013-08-02 19:50:32 +01:00 |
|
|
Astonex
|
b1be9eebd0
|
Re-arranged the code, and added a maxnumfriends counter
|
2013-08-02 19:46:43 +01:00 |
|
|
irungentoo
|
948c82a0cb
|
Merge pull request #273 from rlt3/master
Changing INSTALL.md in response to Issue #239
|
2013-08-02 11:30:43 -07:00 |
|
|
rlt3
|
960078db40
|
INSTALL.md should reflect how you build on OSX now.
|
2013-08-02 14:05:23 -04:00 |
|
|
rlt3
|
e739de92aa
|
reverting unneeded changes
|
2013-08-02 14:01:34 -04:00 |
|
|
rlt3
|
e13e714099
|
Forgot the include to packages to grab for the non-homebrew steps
|
2013-08-02 13:50:02 -04:00 |
|
|
rlt3
|
1c99d5c52e
|
removing useless files
|
2013-08-02 13:43:54 -04:00 |
|
|
rlt3
|
14c8f7f6f8
|
changing OSX instructions in INSTALL.md to reflect how everything works
|
2013-08-02 13:42:30 -04:00 |
|
|
irungentoo
|
a464752060
|
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core
|
2013-08-02 13:03:54 -04:00 |
|
|
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 |
|