4496 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
sudden6	44ea20f921	port groupinvitform to new ui	2016-02-21 00:45:18 +01:00
sudden6	a89b673b40	Revert "Revert changes from merge of #2092 pull request" ... This reverts commit 06611d618e.	2016-02-20 22:32:57 +01:00
Zetok Zalbavar	ef5b9b8c1e	Merge pull request #2962 from RowenStipe:patch_OSX-Script ... Condensed a little bit and fixed function name	2016-02-20 11:24:56 +00:00
RowenStipe	ef608e1361	Condensed a little bit and fixed function name	2016-02-18 14:28:46 -05:00
Kaur Männamaa	dba6ebe262	Added Estonian translation	2016-02-17 13:34:18 +00:00
Vincas Dargis	857dfbcd4c	Open downloaded image with mouse click on thumbnail	2016-02-14 17:20:11 +02:00
Zetok Zalbavar	d614f74947	Merge pull request #2941 from SeventhSonOfASeventhSon:patch-1 ... Fixed grammatical errors	2016-02-08 17:42:47 +00:00
SeventhSonOfASeventhSon	a2d130f804	Fixed grammatical errors	2016-02-08 16:24:52 +00:00
Zetok Zalbavar	eb6082d37e	Merge pull request #2934 from minj:l10n-lt ... update Lithuanian translation	2016-02-07 19:38:09 +00:00
minj	0ee5984812	update Lithuanian translation	2016-02-07 16:45:07 +02:00
Zetok Zalbavar	49b8a48888	Merge pull request #2923 from andrii-zymohliad:master ... Almost full translation into Ukrainian	2016-02-04 14:46:18 +00:00
Andrii Zymohliad	26e9208a05	Almost full translation into Ukrainian	2016-02-04 15:58:31 +02:00
Andrew Morgan	e04bd912b9	Fixed link to Markdown syntax in user manual	2016-02-01 14:46:54 -08:00
Andrew Morgan	08e9f0b885	Use new connection syntax	2016-02-01 11:50:21 -08:00
Andrew Morgan	cc310e592b	Merge branch 'master' of https://github.com/anoadragon453/qTox	2016-02-01 11:22:47 -08:00
Andrew Morgan	ee4ccf1f68	Added message styling section to user manual	2016-02-01 11:22:29 -08:00
tux3	7206b9c251	Merge branch 'pr2914'	2016-01-31 23:37:14 +01:00
sudden6	d22b7cb140	make qt version in about window copy paste able	2016-01-31 23:17:43 +01:00
tux3	1f03ed11ad	Merge branch 'pr2908'	2016-01-31 19:34:30 +01:00
RowenStipe	6e1b7b3464	Fix travis trying to pull qTox	2016-01-31 12:16:19 -05:00
tux3	b1731baadc	Merge branch 'pr2905'	2016-01-31 17:46:30 +01:00
RowenStipe	0e9347cff1	Revert change	2016-01-31 11:39:58 -05:00
RowenStipe	62e0679032	Quick changes for clarity	2016-01-31 11:32:24 -05:00
RowenStipe	fa5cd325ed	Updated Compiling instructions	2016-01-31 11:27:00 -05:00
RowenStipe	6d9551b1fd	Updated script to work on user machines and not just travis.	2016-01-31 11:25:38 -05:00
Zetok Zalbavar	0dae1a6af0	docs: put in INSTALL.md info about installing qTox from Arch repo ... thanks to @DX37 for the info in #2900	2016-01-31 12:43:53 +00:00
Andrew Morgan	0120cfb9fe	Fix merge issues	2016-01-30 21:46:19 -08:00
Andrew Morgan	db84074926	Markdown Preference now uses enumeration type instead of integer.	2016-01-30 21:43:58 -08:00
tux3	7a846b85e0	Merge branch 'pr2894'	2016-01-30 18:21:20 +01:00
Andrew Morgan	4c51be9a6b	Changed rules to keep in line with actual markdown. Although Tox is marketed somewhat as a Skype-replacement, that doesn't mean we have to break compatibility with the rest of the web.	2016-01-29 15:17:41 -08:00
sudden6	25359d55b5	Fix proxy set only after request sent.	2016-01-30 00:15:14 +01:00
sudden6	53330daab7	toxme now supports proxies	2016-01-29 23:30:07 +01:00
Andrew Morgan	a809897850	Removed leftover debug logging.	2016-01-28 16:57:34 -08:00
Andrew Morgan	518a398ca0	Added tooltip to warn user markdown preference will not change until restart.	2016-01-28 16:43:41 -08:00
Andrew Morgan	a5f9e77a6b	Changed asterisk rule to bold instead of italics. Fixed extraneous container in settings.	2016-01-28 15:30:24 -08:00
Andrew Morgan	aa5d0f660c	Changed markdown settings titles	2016-01-28 15:30:24 -08:00
Andrew Morgan	fd31dd816d	Added space detection for markdown #imdeadinside	2016-01-28 15:30:15 -08:00
Andrew Morgan	e15315b618	Added markdown preference chooser to settings which chat abides by. ... Don't parse md if only one character is involved. Prevent things like ~3~ being caught	2016-01-28 15:18:32 -08:00
Zetok Zalbavar	3307855130	travis build script: fix copyright date	2016-01-27 19:06:32 +00:00
Zetok Zalbavar	3723f4b465	osx build script: fix building on travis ... copy libs/headers required by qTox into `libs/`	2016-01-27 03:08:58 +00:00
Sean	ffa312b91b	tabs to spaces	2016-01-26 13:34:29 -06:00
Sean	f96570a9f3	Merge branch 'pixfmt' of https://github.com/seanlaguna/qTox into pixfmt	2016-01-26 13:34:06 -06:00
Sean	a62d5a6bf3	Merge branch 'master' of https://github.com/seanlaguna/qTox into pixfmt	2016-01-26 13:33:25 -06:00
Sean Laguna	de4dcb5bd7	whoops, forgot an else in an else if	2016-01-26 13:27:32 -06:00
Sean	ded8d87ba8	generic pixel format selection	2016-01-26 13:14:58 -06:00
Zetok Zalbavar	0abeaa4b62	osx build script: install vpx and opus	2016-01-26 18:36:37 +00:00
Zetok Zalbavar	529349d8d3	osx build script: install toxcore into libs/	2016-01-26 17:09:44 +00:00
RowenStipe	3a452a700f	General clean up	2016-01-26 16:22:06 +00:00
Zetok Zalbavar	5a02091441	Fix osx travis - use bootstrap-osx.sh	2016-01-26 16:21:10 +00:00
RowenStipe	ab769d1175	Updated libsodium check	2016-01-26 13:50:36 +00:00