23 Commits

Author	SHA1	Message	Date
Jfreegman	1d1c051a44	Merge branch 'master' into new_groupchats	2015-12-01 17:57:45 -05:00
Jfreegman	74c1eef1d1	Bump version to 0.7.0	2015-11-12 17:18:37 -05:00
Jfreegman	7025a33097	Merge with upstream	2015-11-01 21:07:22 -05:00
Jfreegman	8584feab80	Replace DNS-based username lookups with HTTPS & drop utox.org support	2015-10-28 17:14:17 -04:00
Jfreegman	171024428b	Merge with master branch	2015-10-16 21:01:49 -04:00
Jfreegman	ffcc804efe	Moved version up	2015-09-01 13:00:56 -04:00
Jfreegman	0597152352	merge with master	2015-07-14 02:19:10 -04:00
Mykola Orliuk	e83b397494	Makefile: allow overriding pkg-config	2015-07-14 08:27:07 +03: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	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
Ansa89	85d3c18ba6	Add localization system (gettext)	2015-05-28 15:50:55 +02: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
Ansa89	a11289de79	Move makefile into root directory ... Requested by @mannol.	2015-03-21 18:35:40 +01:00
Ansa89	59e1114997	Some cosmetics changes	2015-03-16 13:16:03 +01:00
Ansa89	f5090532fb	Makefile: add toxic.desktop to install target	2014-10-21 10:31:30 +02:00
Ansa89	431290d47a	Version: fix revision calculation	2014-10-16 20:26:00 +02:00
Ansa89	0a1457acde	Version: add revision only if git is available	2014-10-15 10:39:49 +02:00
Jfreegman	fa64fa8b93	replace call sounds ... Signed-off-by: Jfreegman <jfreegman@gmail.com>	2014-10-01 19:38:09 -04:00
Jfreegman	5af561c811	new default sounds; rm unused sounds	2014-10-01 01:16:17 -04:00
Jfreegman	97a8ecd115	small fix and bump version to 0.5.2	2014-09-29 13:56:17 -04:00
Jfreegman	13291d0365	bump version to 0.5.1	2014-09-19 01:24:39 -04:00
Jfreegman	2ce42ab057	bump version to 0.5.0	2014-09-01 18:56:20 -04:00
Ansa89	924e8e0860	Reworked manpage build system	2014-08-25 12:54:44 +02:00