Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-14 04:53:02 +01:00
Code Issues Projects Releases Wiki Activity
75 Commits 20 Branches 34 Tags 18 MiB
8ab8f6b834
Commit Graph

75 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jfreegman
8ab8f6b834 test 2013-08-05 02:32:50 -04:00
Jfreegman
765a722c90 added ability to close and reopen chat windows & other minor changes 2013-08-05 01:57:29 -04:00
irungentoo
19efe3727a 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
Sean Qureshi
6f9dea8510 Manally merged #314 and #317 2013-08-04 03:52:24 -07:00
plutooo
3c43b27617 toxic: Fixed doMessenger() interval.. Toxic is much faster and responsive now. 2013-08-04 03:27:36 -07:00
Jfreegman
337d87a3ef already a pull request with this addition 2013-08-04 05:32:53 -04:00
Jfreegman
18dcb06920 didn't mean to delete that 2013-08-04 05:00:16 -04:00
Jfreegman
6ea6af557b added command functionality to chat windows and a few minor improvements 2013-08-04 04:42:17 -04:00
Jfreegman
67e76d397d Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-08-04 02:40:57 -04:00
charmlesscoin
99410a5100 fix for issue #306 2013-08-03 17:29:18 -04:00
Jfreegman
508c805983 added command to clear prompt screen 2013-08-03 17:13:44 -04:00
irungentoo
e2ce3d5397 Merge pull request #276 from stqism/master 
Adds timestamp to toxic, fixes issue #217
 2013-08-03 13:33:27 -07:00
charmlesscoin
68476fba64 added a proper error message for messing up the -f flag 2013-08-03 16:12:02 -04:00
charmlesscoin
25093fa76e added the -f flag for toxic 2013-08-03 15:12:02 -04:00
Sean Qureshi
49fddd21be Removed an early break 2013-08-03 11:51:40 -07:00
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