1
0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-15 05:13:03 +01:00
Commit Graph

1561 Commits

Author SHA1 Message Date
Jfreegman
470eaeb97b Merge branch 'master' of https://github.com/hardlyeven/toxic into hardlyeven-master 2015-03-18 15:45:37 -04:00
JFreegman
6503349ed3 Merge pull request #314 from al42and/fd_leak
Fixing couple leaking file descriptors
2015-03-18 15:38:40 -04:00
Andrey Alekseenko
ec23cedc3a Fixing couple leaking file descriptors 2015-03-18 19:28:04 +03:00
jlo
ce1ae1d7dc added tab autocomplete for "/status o" => "/status online" 2015-03-17 14:25:15 -05:00
mannol
6669d5632f Merge pull request #310 from Ansa89/trivial-fix
Some cosmetics changes
2015-03-16 13:26:17 +01:00
Ansa89
59e1114997 Some cosmetics changes 2015-03-16 13:16:03 +01:00
JFreegman
c20510e5aa Merge pull request #308 from henriqueleng/openbsd
Openbsd
2015-03-15 15:52:37 -04:00
Henrique N. Lengler
2b2e746549 added gnumake as dep., because you can't compile with *BSDmake 2015-03-15 16:34:56 -03:00
Henrique N. Lengler
dc5a8d44e5 Add OpenBSD option to Makefile 2015-03-15 16:27:00 -03:00
Jfreegman
02a0cac85a
. 2015-03-13 20:38:44 -04:00
Jfreegman
0976804fdf Merge branch 'master' into new_groupchats 2015-03-13 20:34:49 -04:00
Jfreegman
090d3339a0
fix auto-away bugs
Manually set aways no longer unaway when they shouldn't, and busy status is no longer overridden
2015-03-13 20:33:23 -04:00
Jfreegman
f8ff5df2f3
fix race conditions 2015-03-13 16:32:35 -04:00
Jfreegman
22acba5aa8
merge wit upstream 2015-03-11 18:52:28 -04:00
Jfreegman
442d9e22b4
use pthread for mplex detach polling for better portability 2015-03-11 18:38:07 -04:00
fr33domlover
0c39e7b158 Add support for auto-away based on screen attach/detach 2015-03-09 01:38:30 +02:00
Jfreegman
2bcce234a8
add group rejoin command 2015-03-07 00:05:54 -05:00
Jfreegman
5859763f04
load saved group names 2015-03-04 00:08:30 -05:00
Jfreegman
4cc0805036
fix small bug 2015-02-28 14:37:28 -05:00
Jfreegman
830ddb21b5 add support for group persistence 2015-02-28 02:44:41 -05:00
Jfreegman
b31bd93e7d
api function name change 2015-02-26 19:59:55 -05:00
JFreegman
3e3f2614b5 Merge pull request #303 from louipc/interface
Add support for custom timestamps in chat and logs.
2015-02-23 22:38:50 -05:00
Loui Chang
53e4b2c971 Add support for custom timestamps in chat and logs.
Internal representations of the time_format setting are replaced by timestamp format strings.
time_format is only used in the setup.

Signed-off-by: Loui Chang <louipc.ist@gmail.com>
2015-02-23 00:46:33 -05:00
Jfreegman
a89e6b2cdc
merge mistake 2015-02-19 21:36:21 -05:00
Jfreegman
dd3ea3dab5
merge with upstream 2015-02-19 21:33:46 -05:00
Jfreegman
c3179b3b22
fix memory leak 2015-02-19 21:24:52 -05:00
mannol
d6c57c7aa3 Merge pull request #302 from Ansa89/trivial-fix
README.md: update download section
2015-02-19 12:49:50 +01:00
Ansa89
3efc984ae9 README.md: update download section 2015-02-18 15:56:19 +01:00
JFreegman
7618a0871a Merge pull request #301 from Ansa89/trivial-fix
Add INSTALL.md
2015-02-17 14:37:17 -05:00
Ansa89
b87f73cc47 Add INSTALL.md 2015-02-17 11:12:58 +01:00
JFreegman
785d39d78f Merge pull request #296 from louipc/interface
Interface
2015-02-13 14:23:44 -05:00
Loui Chang
38a0f6fae4 Make little action indicators on each output line configurable.
Also added a new DISCONNECTION line info type.

Signed-off-by: Loui Chang <louipc.ist@gmail.com>
2015-02-13 02:09:40 -05:00
JFreegman
710be51cad Merge pull request #298 from Ansa89/trivial-fix
travis.yml: use latest libsodium stable
2015-02-11 19:19:47 -05:00
JFreegman
50438425e5 Update README.md 2015-02-11 19:06:40 -05:00
Ansa89
4b4bfe8876 travis.yml: use latest libsodium stable 2015-02-11 10:12:05 +01:00
JFreegman
67da4bdd5b Merge pull request #297 from urras/patch-1
Travis should build with Libsodium stable, fix clang
2015-02-10 14:27:13 -05:00
Urras
e230badb47 Fix Clang
I didn't expect this to work, but it is and I'm not complaining.
2015-02-10 10:01:44 -05:00
Urras
d48d9ed4dc Travis should build with Libsodium stable 2015-02-10 09:47:06 -05:00
Sean
b9fe6bfa10 Merge pull request #280 from DomT4/darwin
Darwin Build
2015-02-09 21:05:10 -08:00
Loui Chang
5cbbb62ce2 Fix whitespace
Signed-off-by: Loui Chang <louipc.ist@gmail.com>
2015-02-09 23:33:49 -05:00
JFreegman
3369c9d808 Merge pull request #293 from Spagy/patch-1
Correct filename comment from main.c to toxic.c
2015-02-04 15:47:58 -05:00
Spagy
dfc594f949 Correct filename comment from main.c to toxic.c 2015-02-04 13:56:31 +00:00
Sean Qureshi
d714cda145
Vital commit fixing serious Toxic bug 2015-02-01 17:10:44 -08:00
JFreegman
428e1e4100 Merge pull request #292 from Ansa89/trivial-fix
Update for toxcore API break
2015-02-01 15:16:29 -05:00
Ansa89
2b19f56e63 Update for toxcore API break 2015-02-01 21:09:48 +01:00
Jfreegman
5c98c1c51e
group invite API change 2015-01-27 18:00:25 -05:00
JFreegman
4badc983ea Merge pull request #291 from dantok/master
Fix some edge cases when obtaining paths
2015-01-25 15:54:27 -05:00
dantok
c8a4f88ff3 Update configdir.c 2015-01-25 21:53:13 +01:00
dantok
eeeaf8d707 Update autocomplete.c 2015-01-25 21:52:07 +01:00
dantok
37b3b5a5ed Fix an edge case when obtaining home directory.
Make the path to home directory empty before calling get_home_dir(), otherwise if the call fails, the contents are undefined.
2015-01-25 20:49:52 +01:00