Nominate
|
42c79dfcbb
|
Grammar/aesthetic amendment
|
2013-08-05 18:52:28 +01:00 |
|
Jfreegman
|
a91aee0a9f
|
Merge remote-tracking branch 'upstream/master' into testing
|
2013-08-05 13:42:15 -04:00 |
|
Nominate
|
39545a92da
|
Added a 'clear' function to the prompt
|
2013-08-05 18:33:16 +01:00 |
|
joshuaj
|
bafd996e72
|
Fixed toxic friends list flicker
|
2013-08-05 10:14:44 -07:00 |
|
irungentoo
|
519e22677a
|
Merge pull request #312 from Niautanor/master
fix for Issue #288
|
2013-08-05 07:19:50 -07:00 |
|
Jfreegman
|
29880b4299
|
init array
|
2013-08-05 02:48:59 -04:00 |
|
Jfreegman
|
17f121c58e
|
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core into testing
|
2013-08-05 02:33:15 -04:00 |
|
Jfreegman
|
e479f338c1
|
test
|
2013-08-05 02:32:50 -04:00 |
|
Jfreegman
|
3bc7f15fe5
|
added ability to close and reopen chat windows & other minor changes
|
2013-08-05 01:57:29 -04:00 |
|
Maxim Biro
|
f03dc44e97
|
Fixed Windows build
|
2013-08-04 21:20:48 -04:00 |
|
Sean Qureshi
|
a8f752130b
|
Fixed 2 Null pointer derefrences in both nTox and toxic
|
2013-08-04 14:36:09 -07:00 |
|
Sean Qureshi
|
0fad8e3638
|
Fixed a calloc getting freed before being used
|
2013-08-04 13:16:08 -07:00 |
|
irungentoo
|
b9f387b3b7
|
Merge pull request #311 from CharmlessCoin/nTox
nTox Cleaning
|
2013-08-04 08:27:15 -07:00 |
|
irungentoo
|
b4ae32c1c3
|
Merge pull request #313 from CharmlessCoin/bug_fixes
Removed memory leak, thanks to diath for spotting it.
|
2013-08-04 07:24:00 -07:00 |
|
irungentoo
|
b2622726b1
|
Merge pull request #319 from stqism/master
Manually merged #314 and #317, resolving errors if both merged
|
2013-08-04 07:18:20 -07:00 |
|
Tim Malte Gräfje
|
0259cb0194
|
added fix in nTox_win32.c
|
2013-08-04 13:01:20 +02:00 |
|
Sean Qureshi
|
b471236c50
|
Manally merged #314 and #317
|
2013-08-04 03:52:24 -07:00 |
|
plutooo
|
5300e98288
|
toxic: Fixed doMessenger() interval.. Toxic is much faster and responsive now.
|
2013-08-04 03:27:36 -07:00 |
|
Jfreegman
|
91d883c4a4
|
already a pull request with this addition
|
2013-08-04 05:32:53 -04:00 |
|
charmlesscoin
|
ae8367dc3e
|
whoops, returning a free'd variable is really not what I meant...
|
2013-08-04 05:09:12 -04:00 |
|
Jfreegman
|
7b380ed6d2
|
didn't mean to delete that
|
2013-08-04 05:00:16 -04:00 |
|
Jfreegman
|
b513c3d352
|
added command functionality to chat windows and a few minor improvements
|
2013-08-04 04:42:17 -04:00 |
|
charmlesscoin
|
0b6806d7f7
|
Removed memory leak, thanks to diath for spotting it.
|
2013-08-04 04:29:32 -04:00 |
|
Jfreegman
|
357c02ac22
|
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core
|
2013-08-04 02:40:57 -04:00 |
|
charmlesscoin
|
b36bca295c
|
fixed bug that would cause this to always exit
|
2013-08-03 21:59:17 -04:00 |
|
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 |
|
charmlesscoin
|
175a434de3
|
removed some magic numbers from line_eval()
|
2013-08-03 18:06:28 -04:00 |
|
charmlesscoin
|
6222e32848
|
added some better error checking for print_nickname() anr print_statuschange()
|
2013-08-03 18:02:09 -04:00 |
|
charmlesscoin
|
43f6608530
|
cleaned up load_key() and added more error checking
|
2013-08-03 17:57:44 -04:00 |
|
charmlesscoin
|
a65715e811
|
fix for issue #306
|
2013-08-03 17:29:18 -04:00 |
|
Jfreegman
|
c13de2d285
|
added command to clear prompt screen
|
2013-08-03 17:13:44 -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 |
|
charmlesscoin
|
9b56e21f81
|
added a proper error message for messing up the -f flag
|
2013-08-03 16:12:02 -04:00 |
|
charmlesscoin
|
d34e4a3408
|
added the -f flag for toxic
|
2013-08-03 15:12:02 -04:00 |
|
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
|
e4d63c63c7
|
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core
|
2013-08-03 11:41:47 -07:00 |
|
NemDiggers
|
a1c31557f2
|
People aren't that excited to send messages
|
2013-08-03 11:53:51 -04: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
|
dc8e188f30
|
Merge pull request #287 from greato/master
Added break; Statement
|
2013-08-03 05:03:05 -07:00 |
|
Michael Kress
|
d5493bb24f
|
added backspace to nTox; removed trailing spaces
|
2013-08-03 13:27:52 +02:00 |
|
Sean Qureshi
|
86d7734efe
|
Removed some useless code
|
2013-08-03 04:10:47 -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
|
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 |
|
charmlesscoin
|
9b6283c084
|
whoops, removed part of a string by accident.
|
2013-08-03 01:27:20 -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 |
|
Sean Qureshi
|
7dd63b45ca
|
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core
|
2013-08-02 19:55:44 -07:00 |
|
charmlesscoin
|
b9e3bf1fa6
|
changed some formatting, fixed the removal of x and y
|
2013-08-02 22:34:45 -04:00 |
|
Jfreegman
|
8fa074db5e
|
cursor done better, fixed for chat windows
|
2013-08-02 21:36:01 -04:00 |
|
charmlesscoin
|
3678b302db
|
cleaned up print_friendlist(), it now prints a message if you have _no_ friends
|
2013-08-02 21:22:02 -04:00 |
|
Sean Qureshi
|
d19b4b9db1
|
Moved PATCH.md to the toxic folder
|
2013-08-02 17:50:35 -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 |
|
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 |
|
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 |
|
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 |
|
ragesalmon
|
563c2b3157
|
Fixed a build error due to the removal of getnumfriends()
|
2013-08-02 12:40:39 -04:00 |
|
Jfreegman
|
7189f4c7b2
|
fixed cursor
|
2013-08-02 05:10:41 -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
|
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 |
|
plutooo
|
9fbff0c758
|
nTox: fixed 2 possible crashes, 3 incorrect packet lengths
|
2013-08-01 16:28:48 -04:00 |
|
Jfreegman
|
8abc0a3462
|
added error code for no message on friend add & updated nTox.c/nTox_win32.c
|
2013-08-01 15:27:08 -04:00 |
|
irungentoo
|
f6c510b3cc
|
Merge pull request #244 from plutooo/master
core: getaddrinfo() lookup error handling
|
2013-08-01 12:21:45 -07:00 |
|
plutooo
|
3d916b35f2
|
core: getaddrinfo() lookup error handling
|
2013-08-01 11:54:06 -07:00 |
|
irungentoo
|
8b4c116aa5
|
Merge pull request #241 from clpr/master
Add back-tab support for toxic.
|
2013-08-01 11:11:13 -07:00 |
|
clpr
|
1d04ab39b4
|
Add back-tab support for toxic.
|
2013-08-01 18:48:50 +01:00 |
|
irungentoo
|
1d19cbcb1c
|
Merge pull request #238 from clpr/master
Use print_usage for help command
|
2013-08-01 04:34:36 -07:00 |
|
clpr
|
aee2d059df
|
Use print_usage for help command
|
2013-08-01 12:03:01 +01:00 |
|
Spittie
|
42e955db8c
|
Add nicknames to the chat list
Change from [chat <number>] to [<nickname> (<number>)]
|
2013-08-01 06:32:54 +02:00 |
|
Jfreegman
|
a604de9017
|
fixed friend add bugs
|
2013-07-31 21:44:57 -04:00 |
|
irungentoo
|
c3b5fe3fa1
|
Merge pull request #227 from Proplex/master
Add help command to Toxic
|
2013-07-31 17:29:35 -07:00 |
|
irungentoo
|
b5b28e43f8
|
Merge branch 'master' of https://github.com/Astonex/ProjectTox-Core into Astonex-master
Conflicts:
testing/nTox_win32.c
|
2013-07-31 20:27:13 -04:00 |
|
NemDiggers
|
1e1c731470
|
Add help command to Toxic
|
2013-07-31 20:23:15 -04:00 |
|
Astonex
|
7417dfe216
|
Fixed friends list and deleting friends. Automatically loads name/status from last time.
|
2013-08-01 01:14:02 +01:00 |
|
irungentoo
|
bf17d6eb2e
|
Merge pull request #224 from cedeon/master
added required linker flag to 'compile with' remark
|
2013-07-31 16:44:18 -07:00 |
|
NemDiggers
|
d7dcb6f095
|
Remove period from status set
It can make for awkward displays if you put a period in your status.
|
2013-07-31 19:02:06 -04:00 |
|
William Culver
|
5d8a1c60e8
|
added required linker flag to 'compile with' remark
|
2013-08-01 00:01:35 +01:00 |
|