2035 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jfreegman	035420e5c7	Revert commit 312d0c3 (localization/gettext) ... There were serious problems with branch merging that need to be resolved first	2015-07-04 01:19:16 -04:00
Jfreegman	444d8e7a74	update translations	2015-06-30 23:51:27 -04:00
Jfreegman	84a0276668	Fix some possible race conditions related to line printing	2015-06-30 22:40:45 -04:00
Jfreegman	312d0c3f42	Merge branch 'Ansa89-add_translation'	2015-06-29 03:17:52 -04:00
Jfreegman	d8eca8393c	s/tox.im/tox.chat/g -- reflect new tox domain	2015-06-29 03:16:09 -04:00
Jfreegman	374b78c763	manually fix merge conflicts	2015-06-29 03:11:21 -04:00
mannol	409e4ddd96	Merge pull request #340 from Ansa89/update_travis_deps ... travis.yml: update dependencies	2015-06-12 18:23:22 +02:00
Ansa89	1beb35025b	travis.yml: update dependencies	2015-06-12 18:22:08 +02:00
Ansa89	51a1c660b4	Add localization system (gettext)	2015-05-30 11:55:59 +02:00
Ansa89	85d3c18ba6	Add localization system (gettext)	2015-05-28 15:50:55 +02:00
Jfreegman	d0a7ca17d2	separate bootstrapping and adding TCP relays per toxcore API changes	2015-05-24 17:56:30 -04:00
Jfreegman	36640224af	toxcore API changes to tox_new	2015-05-24 17:36:13 -04:00
Jfreegman	231078b6b9	default tox options on initialization	2015-05-18 19:52:22 -04:00
Jfreegman	414f58d896	correctly handle tox_new errors	2015-04-14 17:18:09 -04:00
Jfreegman	4d73f8b241	not clear which error message is given for ipv6 failure	2015-04-13 00:58:33 -04:00
Jfreegman	82e76a3b5b	try to fall back to ipv4 if tox fails to init with ipv6	2015-04-13 00:32:35 -04:00
Jfreegman	0bc610e18d	null terminate status message	2015-04-10 00:16:01 -04:00
Jfreegman	02e6d2db3c	fix possible segfault	2015-04-09 02:14:23 -04:00
Ansa89	5a2c341259	Makefile: try to fix Tox/toxic#307 ... @henriqueleng please test it and report back if it works for you.	2015-04-06 11:44:02 +02:00
Jfreegman	1a7eaeddba	fix a few avatar bugs	2015-04-04 21:15:34 -04:00
JFreegman	f656d0a722	Update .travis.yml	2015-04-04 03:42:43 -04:00
Jfreegman	09c1ad4566	Merge branch 'master' of https://github.com/Tox/toxic	2015-04-04 03:27:27 -04:00
Jfreegman	8b9e34db75	Merge branch 'master' of https://github.com/JFreegman/toxic	2015-04-04 03:27:01 -04:00
Jfreegman	dd9186e834	re-implement avatar setting	2015-04-04 03:26:38 -04:00
mannol	5ff1517b28	Merge pull request #322 from Ansa89/trivial-fix ... Makefile: add uninstall target	2015-04-03 15:43:18 +02:00
Ansa89	bbb639c5aa	Makefile: add uninstall target	2015-04-03 13:04:28 +02:00
JFreegman	860db2f612	Update .travis.yml	2015-04-02 22:44:19 -04:00
Jfreegman	523f205646	re-implement friendlist last seen	2015-04-02 22:19:09 -04:00
Jfreegman	e998c8a866	fix encryption API breakage	2015-03-31 21:56:11 -04:00
Jfreegman	eaea68c33e	fix bug where contacts would appear online twice in a row	2015-03-31 18:39:42 -04:00
Jfreegman	4780cfeafc	remove non-existant group commands	2015-03-31 17:11:43 -04:00
Jfreegman	bdb0951c84	a few small filetransfer fixes	2015-03-29 19:29:38 -04:00
Jfreegman	e3130c92c0	small fix	2015-03-29 19:26:16 -04:00
Jfreegman	12c880ab51	fix bootstrapping	2015-03-29 19:05:24 -04:00
Jfreegman	522aabd4e4	Refactor and clean up file transfers ... (No longer rely on undefined core filenumber property for indexing)	2015-03-29 18:33:51 -04:00
Jfreegman	bf09b3b6c4	Merge branch 'master' of https://github.com/Tox/toxic	2015-03-28 02:58:24 -04:00
Jfreegman	2d3c5c9450	Mostly finished with new API port ... - File transfers currently don't support pausing/resuming - Avatars are not yet done	2015-03-28 02:56:54 -04:00
Jfreegman	ae87b2eb2d	begin port to new API	2015-03-25 22:56:45 -04:00
mannol	c34ecc8dfd	Merge pull request #318 from Ansa89/trivial-fix ... README.md: fix typo	2015-03-23 15:44:19 +01:00
Ansa89	2c2938c647	README.md: fix typo	2015-03-23 15:36:58 +01:00
JFreegman	22dd883f28	Merge pull request #316 from Ansa89/trivial-fix ... Makefile: be less aggressive when cleaning	2015-03-21 14:32:23 -04:00
Ansa89	dfbb1338a5	Makefile: be less aggressive when cleaning	2015-03-21 19:31:00 +01:00
mannol	f8dc82516e	Merge pull request #315 from Ansa89/trivial-fix ... Move makefile into root directory	2015-03-21 19:25:05 +01:00
Ansa89	59b16f7760	Fix travis build	2015-03-21 18:38:28 +01:00
Ansa89	a11289de79	Move makefile into root directory ... Requested by @mannol.	2015-03-21 18:35:40 +01:00
Jfreegman	a64b8cae89	Merge branch 'hardlyeven-master'	2015-03-18 15:51:18 -04:00
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