1606 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jfreegman	0597152352	merge with master	2015-07-14 02:19:10 -04:00
Jfreegman	ecefc19b23	Merge branch 'ony-master'	2015-07-14 02:15:38 -04:00
Jfreegman	23bb980173	Add group callbacks for password, peerlimit and privacy state changes	2015-07-14 02:07:52 -04:00
Mykola Orliuk	e83b397494	Makefile: allow overriding pkg-config	2015-07-14 08:27:07 +03:00
Jfreegman	a846c38695	Port to new group API	2015-07-13 22:12:13 -04:00
Jfreegman	688ea927f8	Update dht nodes list and fix URL's	2015-07-08 22:40:17 -04:00
Jfreegman	1f7f4490b2	merge with master	2015-07-08 21:09:58 -04:00
Jfreegman	40b220c821	Revert "Merge branch 'Ansa89-add_translation'" ... This reverts commit 312d0c3f42, reversing changes made to 409e4ddd96.	2015-07-08 21:08:55 -04:00
Jfreegman	904f58c0e8	Add option to enable acting as TCP relay server	2015-07-08 21:01:32 -04:00
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
Jfreegman	cb4a631df0	strcasecmp should be strcmp	2015-06-12 23:16:00 -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
Jfreegman	35718db46f	fix ban command bug	2015-06-10 19:30:44 -04:00
Jfreegman	1ba0891f71	fix ban API calls	2015-06-08 21:56:32 -04:00
Jfreegman	b36ada0f5b	remove obsolete prune command	2015-06-04 16:46:30 -04:00
Jfreegman	9cd2158c72	add group silencing and improve group help menu	2015-06-04 04:08:11 -04:00
Jfreegman	928134da7a	implement banning/unbanning	2015-06-03 04:32:59 -04:00
Jfreegman	52a3367b5e	small API fix	2015-06-01 03:12:12 -04:00
Jfreegman	7e7087e94e	add mod-list prune command	2015-05-30 23:57:30 -04:00
Ansa89	51a1c660b4	Add localization system (gettext)	2015-05-30 11:55:59 +02:00
Jfreegman	9cd8afe90a	add mod and unmod commands	2015-05-29 02:00:18 -04:00
Ansa89	85d3c18ba6	Add localization system (gettext)	2015-05-28 15:50:55 +02:00
Jfreegman	526bd02189	Add group peer kicking && update related callback	2015-05-26 01:23:09 -04:00
Jfreegman	3826fd793d	Merge branch 'master' into new_groupchats	2015-05-24 18:13:15 -04: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	a6d7e9b839	add ability for founder to set group peer limit	2015-05-24 03:27:50 -04:00
Jfreegman	29d0384a90	add ability for founder to set group privacy state	2015-05-22 21:41:32 -04:00
JFreegman	0481f43746	Update .travis.yml	2015-05-20 21:00:28 -04:00
Jfreegman	f021908f8b	implement group passwords	2015-05-20 19:07:25 -04:00
Jfreegman	f82d58bbfc	Merge branch 'master' of https://github.com/Tox/toxic into new_groupchats	2015-05-19 04:26:38 -04:00
Jfreegman	231078b6b9	default tox options on initialization	2015-05-18 19:52:22 -04:00
Jfreegman	9385f1145f	update group api call	2015-05-05 22:32:42 -04:00
Jfreegman	414f58d896	correctly handle tox_new errors	2015-04-14 17:18:09 -04:00
Jfreegman	2acd99b04c	show self in group when it's first created	2015-04-14 01:59:39 -04:00
Jfreegman	4d73f8b241	not clear which error message is given for ipv6 failure	2015-04-13 00:58:33 -04:00
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