irungentoo
57601e0c1a
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
Sean Qureshi
5411f62567
Moved main.c to maaster
2013-08-07 10:36:32 -07:00
Sebastian Stal
660bfc1340
Check for correct error value in toxic.
2013-08-07 09:57:23 -07:00
Sean Qureshi
9e5c88859a
Fixed it not compiling
2013-08-07 09:35:37 -07:00
irungentoo
088e7d3e17
Merge branch 'provide-status-type' of https://github.com/jin-eld/ProjectTox-Core into pull-requests
2013-08-07 09:11:51 -04:00
irungentoo
605f84ac4a
Merge branch 'master' of https://github.com/ptrasd/ProjectTox-Core into pull-requests
2013-08-07 09:11:41 -04:00
jin-eld
41238577e4
Allow to set a specific userstatus type in toxic
...
Use:
status <type> <message>, where type is one of
online
away
busy
offline
The message parameter is optional.
To set only the status message, as it was before, use:
statusmsg <message>
2013-08-07 10:28:17 +03:00
Sean Qureshi
65694a06c4
Fixed flash killing beep
2013-08-07 00:26:21 -07:00
Sean Qureshi
5614e73a17
Manually merged my earlier commits with upstream
2013-08-07 00:24:37 -07:00
Jfreegman
4cc4d3b755
forgot this
2013-08-07 02:52:56 -04:00
Jfreegman
c6cbaf8d2e
Fixed two bugs
2013-08-07 02:34:55 -04:00
ptrasd
132576c28c
testing/toxic/prompt.c: changed execute() to ignore whitespace at end of commands
2013-08-07 02:25:20 -04:00
ptrasd
78a37829c5
testing/toxic/prompt.c: changed execute() to skip whitespace at start of command
2013-08-07 02:10:46 -04:00
Jfreegman
5fd1a658bc
code format/clean up
2013-08-06 18:27:51 -04:00
irungentoo
2fbe37f7cf
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
Nominate
c9546b38d4
Fixed formatting
2013-08-06 11:50:10 +01:00
Nominate
79a731991f
Update prompt.c
2013-08-06 11:20:11 +01:00
Nominate
dfff1e3cc4
Corrected wrap-around
...
This should allow wrap-around and allow proper execution.
2013-08-06 11:16:17 +01:00
Nominate
1701ed7023
Stops line-spamming and clears before printing help
...
This addresses one issue in #340 perfectly and slightly improves the other.
2013-08-06 08:10:05 +01:00
Sean Qureshi
5b13bacc53
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core
2013-08-05 17:50:08 -07:00
Sean Qureshi
5517dc1f20
Added flash, apparently in weird cases it works when beep fails
2013-08-05 17:47:49 -07:00
irungentoo
1b35267f8a
Merge pull request #351 from joshuaj/toxic_flicker_fix
...
Fixed toxic friends list flicker
2013-08-05 17:37:10 -07:00
irungentoo
b984ea3356
Merge pull request #350 from stqism/master
...
Removed a useless ! from toxics status
2013-08-05 17:25:33 -07:00
irungentoo
173a1f8fb6
Merge pull request #341 from stal888/userstatus-ext
...
An extension to user statuses.
2013-08-05 17:24:04 -07:00
Sean Qureshi
7c6467168e
Removed a useless ! from toxics status
2013-08-05 17:08:05 -07:00
Sean Qureshi
e9ca1321b0
Throws in a bell when a message is recieved, to warn to user
2013-08-05 15:39:32 -07:00
Jfreegman
251a65ed0a
spacing didn't match outgoing msgs
2013-08-05 18:38:55 -04:00
Jfreegman
9b7dafc16f
bug fix and added wrapping on friends list
2013-08-05 18:07:08 -04:00
Jfreegman
3d0b16c681
list commands on chat window popup
2013-08-05 16:34:55 -04:00
Jfreegman
6494a4070b
chat window deleting and re-adding - it just werks
2013-08-05 16:04:06 -04:00
Sebastian Stal
51598d626a
Make test clients compatible with userstatus kinds
...
No features were added, just fixed callbacks.
2013-08-05 12:30:40 -07:00
Nominate
aaf3ce9761
Grammar/aesthetic amendment
2013-08-05 18:52:28 +01:00
Nominate
34a8d6ecb9
Added a 'clear' function to the prompt
2013-08-05 18:33:16 +01:00
joshuaj
14fe0b01f6
Fixed toxic friends list flicker
2013-08-05 10:14:44 -07:00
Jfreegman
f824373e6a
init array
2013-08-05 02:48:59 -04:00
Jfreegman
e0c0cedf8d
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core into testing
2013-08-05 02:33:15 -04:00
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
Sean Qureshi
805eb0195a
Fixed 2 Null pointer derefrences in both nTox and toxic
2013-08-04 14:36:09 -07:00
Sean Qureshi
4ef0b68602
Fixed a calloc getting freed before being used
2013-08-04 13:16:08 -07: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
