1
0
mirror of https://github.com/Tha14/toxic.git synced 2024-07-01 18:37:46 +02:00
Commit Graph

2110 Commits

Author SHA1 Message Date
Sean Qureshi
dd504a6b59 Merge branch 'master' of https://github.com/stqism/ProjectTox-Core 2013-08-03 11:45:07 -07:00
Sean Qureshi
c85d41bad0 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-08-03 11:41:47 -07:00
Sean Qureshi
daaa85303c Merge pull request #4 from m-kress/master
fixed time stamps in toxic
2013-08-03 11:32:22 -07:00
NemDiggers
5e905ca12a People aren't that excited to send messages 2013-08-03 11:53:51 -04:00
Michael Kress
f3ee620777 added seconds to time stamp in toxic 2013-08-03 16:26:23 +02:00
Michael Kress
bbffe1b8a3 fixed printing time stamp in toxic 2013-08-03 16:00:48 +02:00
irungentoo
5d91b83fc2 Merge pull request #281 from JFreegman/master
cursor done better, fixed for chat windows
2013-08-03 05:14:44 -07:00
Sean Qureshi
503e4e0058 Merge pull request #3 from stqism/master
Removed some useless code
2013-08-03 04:12:50 -07:00
Sean Qureshi
c571696c46 Removed some useless code 2013-08-03 04:10:47 -07:00
Sean Qureshi
0ebd87eff7 Merge pull request #2 from stqism/master
Adds fixes from master in testing
2013-08-03 04:07:59 -07:00
Sean Qureshi
9b37ca7894 Merge branch 'master' of github.com:stqism/ProjectTox-Core 2013-08-03 04:00:13 -07:00
Sean Qureshi
77b7694c41 Fixed a segfault when recieving text 2013-08-03 03:59:27 -07:00
Sean Qureshi
e55bbfcd8b Merge pull request #1 from stqism/master
Toxic testing
2013-08-03 02:00:10 -07:00
Sean Qureshi
3e5b40c0db 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
84aa9a9e3b 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
3a2caf8bb9 Merge https://github.com/greato/ProjectTox-Core 2013-08-03 01:46:01 -07:00
g
bf4b71e617 Added break Statement 2013-08-03 15:59:46 +08:00
Sean Qureshi
36bd785cc7 Merge https://github.com/JFreegman/ProjectTox-Core 2013-08-02 22:31:21 -07:00
Sean Qureshi
19ed6a4bea Removed the seconds patch, it breaks things 2013-08-02 19:58:00 -07:00
Jfreegman
53f7d9af0d cursor done better, fixed for chat windows 2013-08-02 21:36:01 -04:00
Sean Qureshi
a938076f99 Moved PATCH.md to the toxic folder 2013-08-02 17:50:35 -07:00
Sean Qureshi
1b53b8ecc4 By popular demand, I made a patch to add seconds to the timestamp 2013-08-02 17:44:30 -07:00
Sean Qureshi
6f331d6fcb Fixed a bug with the minutes only being 1 character long when less than 10 2013-08-02 17:14:47 -07:00
Sean Qureshi
873736df5c Adds timestamp to toxic, fixes issue #217 2013-08-02 16:44:32 -07:00
irungentoo
2ebd30bdb3 Merge pull request #273 from rlt3/master
Changing INSTALL.md in response to Issue #239
2013-08-02 11:30:43 -07:00
rlt3
84775df888 INSTALL.md should reflect how you build on OSX now. 2013-08-02 14:05:23 -04:00
rlt3
3a0e85fc5f reverting unneeded changes 2013-08-02 14:01:34 -04:00
rlt3
47cc00762e removing useless files 2013-08-02 13:43:54 -04:00
rlt3
cad5f61372 changing OSX instructions in INSTALL.md to reflect how everything works 2013-08-02 13:42:30 -04:00
Jfreegman
1a000307f7 Merge branch 'master' of https://github.com/JFreegman/ProjectTox-Core 2013-08-02 05:12:15 -04:00
Jfreegman
5aea1c8c15 fixed cursor 2013-08-02 05:10:41 -04:00
Jfreegman
64157963ec rm unused arg 2013-08-02 05:08:04 -04:00
Jfreegman
8eaf96e7bb remove cursor from friend and chat windows 2013-08-02 04:58:15 -04:00
Jfreegman
c4f31e4646 fixed cursor 2013-08-02 03:36:31 -04:00
irungentoo
6405632b49 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
rlt3
22cfcc7585 removing unnecessary binary files 2013-08-01 17:03:06 -04:00
rlt3
594964d105 Trimming some things down and re styling comments 2013-08-01 16:11:36 -04:00
rlt3
e1282627c8 Merge branch 'master' of https://github.com/rlt3/ProjectTox-Core 2013-08-01 16:01:29 -04:00
rlt3
396d39f3a6 Trying to make Lossless UDP more readable with style changes 2013-08-01 15:58:19 -04:00
Jfreegman
a77b4a962d added error code for no message on friend add & updated nTox.c/nTox_win32.c 2013-08-01 15:27:08 -04:00
irungentoo
ff212413c3 Merge pull request #244 from plutooo/master
core: getaddrinfo() lookup error handling
2013-08-01 12:21:45 -07:00
plutooo
3923114da4 core: getaddrinfo() lookup error handling 2013-08-01 11:54:06 -07:00
irungentoo
2ce4907107 Merge pull request #241 from clpr/master
Add back-tab support for toxic.
2013-08-01 11:11:13 -07:00
clpr
f96602d45c Add back-tab support for toxic. 2013-08-01 18:48:50 +01:00
irungentoo
209e0d53eb Merge pull request #238 from clpr/master
Use print_usage for help command
2013-08-01 04:34:36 -07:00
clpr
484575afdb Use print_usage for help command 2013-08-01 12:03:01 +01:00
Spittie
f5ec15f11c Add nicknames to the chat list
Change from [chat <number>] to [<nickname> (<number>)]
2013-08-01 06:32:54 +02:00
Jfreegman
2e0fa701cc fixed friend add bugs 2013-07-31 21:44:57 -04:00
NemDiggers
2f302b36e0 Add help command to Toxic 2013-07-31 20:23:15 -04:00
NemDiggers
1b431e19da 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