Commit Graph

36 Commits

Author SHA1 Message Date
Jfreegman
6f98fc47b0 fix magic numbers 2013-08-08 04:51:58 -04:00
Maxim Biro
f669b28a6c Merge branch 'master' of http://github.com/irungentoo/ProjectTox-Core
Conflicts:
	core/Messenger.c
	core/Messenger.h
2013-08-07 19:18:40 -04:00
irungentoo
00ecb05c1b Merge branch 'master' of https://github.com/stqism/ProjectTox-Core into pull-requests
Conflicts:
	testing/toxic/prompt.c
2013-08-07 18:20:36 -04:00
Maxim Biro
b1a2af23e5 Modified clients to properly work with the changes 2013-08-07 18:12:59 -04:00
irungentoo
59f873fd68 Merge branch 'read-receipt' of https://github.com/stal888/ProjectTox-Core into pull-requests
Conflicts:
	testing/toxic/chat.c
	testing/toxic/prompt.c
2013-08-07 13:51:58 -04:00
Sebastian Stal
9f6262f3dd Check for correct error value in toxic. 2013-08-07 09:57:23 -07:00
Sean Qureshi
c02e1a095c Fixed flash killing beep 2013-08-07 00:26:21 -07:00
Jfreegman
16b3ec746e code format/clean up 2013-08-06 18:27:51 -04:00
irungentoo
eacd12385f Merge branch 'master' of https://github.com/JFreegman/ProjectTox-Core into JFreegman-master
Conflicts:
	testing/toxic/prompt.c
2013-08-06 10:16:26 -04:00
Sean Qureshi
caee2c3fe5 Added flash, apparently in weird cases it works when beep fails 2013-08-05 17:47:49 -07:00
irungentoo
109fe7bd0a Merge pull request #341 from stal888/userstatus-ext
An extension to user statuses.
2013-08-05 17:24:04 -07:00
Sean Qureshi
cb39cdbe5e Throws in a bell when a message is recieved, to warn to user 2013-08-05 15:39:32 -07:00
Jfreegman
663764e046 spacing didn't match outgoing msgs 2013-08-05 18:38:55 -04:00
Jfreegman
16a74ffaf9 list commands on chat window popup 2013-08-05 16:34:55 -04:00
Jfreegman
4b76983a69 chat window deleting and re-adding - it just werks 2013-08-05 16:04:06 -04:00
Sebastian Stal
5ec3b2330e Make test clients compatible with userstatus kinds
No features were added, just fixed callbacks.
2013-08-05 12:30:40 -07: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
Sean Qureshi
0fad8e3638 Fixed a calloc getting freed before being used 2013-08-04 13:16:08 -07:00
Sean Qureshi
b471236c50 Manally merged #314 and #317 2013-08-04 03:52:24 -07: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
a65715e811 fix for issue #306 2013-08-03 17:29:18 -04:00
Michael Kress
1ae2bfbb75 added seconds to time stamp in toxic 2013-08-03 16:26:23 +02:00
Michael Kress
28944151c7 fixed printing time stamp in toxic 2013-08-03 16:00:48 +02:00
Sean Qureshi
86d7734efe Removed some useless code 2013-08-03 04:10:47 -07:00
Sean Qureshi
52f1dcd9ff Fixed a segfault when recieving text 2013-08-03 03:59:27 -07:00
Sean Qureshi
97fbdea304 Merge https://github.com/JFreegman/ProjectTox-Core 2013-08-02 22:31:21 -07:00
Jfreegman
8fa074db5e cursor done better, fixed for chat windows 2013-08-02 21:36:01 -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
Sean Qureshi
10feea4474 Adds timestamp to toxic, fixes issue #217 2013-08-02 16:44:32 -07:00
Spittie
42e955db8c Add nicknames to the chat list
Change from [chat <number>] to [<nickname> (<number>)]
2013-08-01 06:32:54 +02:00
irungentoo
0d5eef4b43 Backspace key should now work on more terminals in toxic. 2013-07-31 15:22:43 -04:00
plutooo
0815d1110d toxic: Made everything 1000x more userfriendly. 2013-07-31 11:20:16 -07:00
plutooo
2247b7fad5 Added chat windows, and some clean up. 2013-07-31 10:20:03 -07:00