1
0
mirror of https://github.com/Tha14/toxic.git synced 2024-12-23 19:43:26 +01:00
Commit Graph

1533 Commits

Author SHA1 Message Date
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
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
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
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
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
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
dantok
a561ef8c49 Fixed emptying avatar_path if the path is too long. 2015-01-25 20:17:32 +01:00
JFreegman
89f200e870 Merge pull request #290 from urras/master
Update DHT nodes again
2015-01-11 15:11:04 -05:00
urras
2823115a6c
Update DHT nodes again 2015-01-11 15:06:15 -05:00
JFreegman
5599d73760 remove invalid node from nodes list 2015-01-11 14:28:52 -05:00
JFreegman
bac66cb5ad Merge pull request #289 from urras/master
Update DHT node list
2015-01-11 14:16:50 -05:00
urras
61c50972e3
Update DHT node list 2015-01-11 14:06:33 -05:00
Jfreegman
ff0fbbc379
small fix 2015-01-01 12:50:51 -05:00
Jfreegman
4a124dea43 Merge branch 'flussence-master' 2015-01-01 01:56:31 -05:00
Anthony Parsons
e722b665d1
Make "Last seen" handle year rollover correctly 2015-01-01 05:44:18 +00:00
Jfreegman
4365b8d5ad
update man page 2014-12-27 13:17:05 -05:00
Jfreegman
e55e5f3f7e
add HTTP proxy support 2014-12-27 13:12:16 -05:00
Dominyk Tiller
d1036c8538 Darwin Build
Explains/Better Enables building on the OS X Platform. I’ve written a
Darwin.mk file for the purpose, given one is referenced in the Makefile
but doesn’t actually exist yet. I presume this is due to Toxic’s recent
move away from configure scripts?

Anyhow. It’s not perfect, and it could be prettier, but it should fix
2014-12-18 03:49:52 +00:00
Jfreegman
9240f62829 Merge branch 'jdp5087-tour' 2014-12-17 17:35:01 -05:00
Jon Poler
1b89bc9051 Made the keys section of settings_load more readable in settings.c 2014-12-17 12:15:18 -05:00
Jfreegman
7700ef83e0
disable broken callback 2014-12-09 20:30:13 -05:00
Jfreegman
9922b3a4f3
forgot IFDEFs 2014-12-09 18:55:14 -05:00
Jfreegman
d561d2e1ac
fix 2014-12-09 18:35:14 -05:00
Jfreegman
7865cea284
group audio stuff 2014-12-09 18:29:07 -05:00
Jfreegman
424189cad9
small fix 2014-12-07 21:48:29 -05:00