1564 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jfreegman	6cd7fb9e5b	Merge branch 'master' into new_groupchats	2015-04-13 00:55:05 -04:00
Jfreegman	540bf4a5c4	not clear which error message is given for ipv6 failure	2015-04-13 00:45:15 -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	a360afe08a	remove group self-timeout callback	2015-04-12 21:56:42 -04:00
Jfreegman	b66a1f6ba1	merge branch 'master' into new_groupchats	2015-04-10 00:22:07 -04:00
Jfreegman	0bc610e18d	null terminate status message	2015-04-10 00:16:01 -04:00
Jfreegman	b66932fcec	Merge branch 'master' into new_groupchats	2015-04-09 02:14:50 -04:00
Jfreegman	02e6d2db3c	fix possible segfault	2015-04-09 02:14:23 -04:00
Jfreegman	de38df32c2	merge with upstream	2015-04-07 17:28:12 -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	bdfbda7cda	merge with upstream	2015-04-04 03:36:09 -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	0c49ab392d	Merge branch 'master' into new_groupchats	2015-04-02 22:45:06 -04:00
JFreegman	860db2f612	Update .travis.yml	2015-04-02 22:44:19 -04:00
JFreegman	b2c0753fdf	Update .travis.yml	2015-04-02 22:31:20 -04:00
Jfreegman	523f205646	re-implement friendlist last seen	2015-04-02 22:19:09 -04:00
Jfreegman	c97095be68	Merge branch 'master' into new_groupchats	2015-03-31 21:59:26 -04:00
Jfreegman	e998c8a866	fix encryption API breakage	2015-03-31 21:56:11 -04:00
Jfreegman	c2b9967691	merge with master	2015-03-31 19:34:33 -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	ee074f334e	merge with master (new api)	2015-03-30 21:46:25 -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	23429d8da4	Merge pull request #5 from stqism/patch-2 ... I'm not allowed to do this correctly on the first try.	2015-03-26 03:16:29 -04:00
Sean	e34ac70a72	I'm not allowed to do this correctly on the first try.	2015-03-26 00:12:30 -07:00
JFreegman	77d45334ac	Merge pull request #4 from stqism/patch-1 ... Build on commit	2015-03-26 03:00:08 -04:00
Sean	88719c4ccc	Update .travis.yml	2015-03-25 23:56:40 -07: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	386c5a8fa5	sound/desktop alert on private group message	2015-03-22 17:07:33 -04:00
Jfreegman	5caa9bed51	fix nick parsing bug for private messages	2015-03-22 17:01:46 -04:00
Jfreegman	59b90b1328	better format for private messages	2015-03-22 01:37:07 -04:00
Jfreegman	05c05868c6	implement group private messaging	2015-03-22 01:07:56 -04:00
Jfreegman	88d6d907d8	Merge branch 'master' into new_groupchats	2015-03-21 15:15:48 -04: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