3124 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
tux3	fdd34718fb	Merge branch 'pr1738'	2015-05-25 23:25:09 +02:00
tux3	88057c7782	Merge branch 'pr1737'	2015-05-25 23:23:56 +02:00
Diadlo	32aaee7568	Update ru.ts	2015-05-26 00:12:29 +03:00
PKEv	6fa42c1aa0	Correct duplication long messages on sender side #1703 & #1697	2015-05-26 00:08:39 +03:00
Diadlo	b25910ab98	Fix russian translation	2015-05-26 00:06:58 +03:00
tux3	2db617bc6f	Recover if tox fails to start	2015-05-25 22:37:19 +02:00
tux3	52d573bb69	Merge branch 'pr1735'	2015-05-25 22:29:39 +02:00
tux3	ef6385b6c4	Fix failedToStart/badProxy blocking signals	2015-05-25 22:28:59 +02:00
tux3	4a8bc7a0ce	Merge branch 'pr1733'	2015-05-25 22:22:57 +02:00
Diadlo	a480f31169	Update translation/ru.ts	2015-05-25 23:21:29 +03:00
Сухарик	fe7dc995d6	use toxcore error codes	2015-05-25 23:09:09 +03:00
Zetok Zalbavar	75d3274332	Fix quoting; everything after '>' is a quote ... Plenty of people voiced their opinion that everything after '>' should be a quote. Trying to conform to anything other brings only chaos and makes situation worse, since it is impossible to catch every exception. There are already plenty of cases where regexp simply can't work with unicode. In the future, qTox should have easy to use r-click options for 'Paste text as a quote' and 'Copy as a quote', which makes it a must to have quote detection as simple as possible, to avoid situation where user wants to paste something as a quote, and suddenly it doesn't seem to work. Fixes #1059 #1099 #1173 Continuation of #1332	2015-05-25 20:52:51 +01:00
tux3	c3e70d6c59	Revert "Updated for latest toxcore api" ... This reverts commit 7c8334bca9.	2015-05-25 20:23:06 +02:00
tux3	df7480f59c	Merge branch 'pr1730'	2015-05-25 18:39:49 +02:00
Daniel Hrabovcak	051a88a7e8	For range loops	2015-05-25 12:38:52 -04:00
Daniel Hrabovcak	992e648f64	Fix compile issues	2015-05-25 12:32:34 -04:00
Daniel Hrabovcak	399f2c9fef	Merge https://github.com/tux3/qTox	2015-05-25 12:20:05 -04:00
Daniel Hrabovcak	bd2f8b5db5	Add al delete to group leave	2015-05-25 12:19:56 -04:00
tux3	cbcca5e66d	Merge branch 'pr1729'	2015-05-25 18:11:14 +02:00
Daniel Hrabovcak	fb707fe1f1	Group audio not being reset	2015-05-25 11:58:54 -04:00
saneki	7c8334bca9	Updated for latest toxcore api	2015-05-25 08:08:47 -05:00
tux3	30b3f54202	Merge branch 'pr1728'	2015-05-25 13:20:47 +02:00
Zetok Zalbavar	d62ebf7384	Update Polish translation	2015-05-25 12:19:03 +01:00
tux3	9082783483	Merge branch 'pr1725'	2015-05-25 13:00:12 +02:00
tux3	6e97c7f9c3	Merge branch 'pr1724'	2015-05-25 12:59:49 +02:00
tux3	c3927f9cfc	Merge branch 'pr1726'	2015-05-25 12:58:51 +02:00
Zetok Zalbavar	1403ee970b	Improve error message when profile is alrady used ... I.e. don't imply that profile belongs to same user, since it is possible that multiple users are using qTox.	2015-05-25 09:39:47 +01:00
Ansa89	98031bd68f	Italian translation: update	2015-05-25 09:38:01 +02:00
ovitei	52e0dae0d8	added Norwegian Bokmal (nb_NO) translations	2015-05-25 02:15:34 +02:00
tux3	435b4d98be	Merge branch 'pr1722'	2015-05-25 01:41:31 +02:00
TheLastProject	5e9081abd7	Update profileform.cpp	2015-05-25 01:25:00 +02:00
tux3	21ff829be1	Merge branch 'pr1721'	2015-05-25 00:53:57 +02:00
PKEv	9a239ed4a6	Correct for win install	2015-05-25 00:43:37 +03:00
tux3	f83dacb9c4	Update busy icons	2015-05-24 21:40:24 +02:00
tux3	1178df61ef	Merge branch 'pr1719'	2015-05-24 17:46:55 +02:00
Ansa89	6b337ce935	Italian translation: update	2015-05-24 17:30:13 +02:00
tux3	4d21f34e72	Merge branch 'pr1718'	2015-05-24 17:20:56 +02:00
Ansa89	264732bf10	chatmessage.cpp: detectQuotes() simplify conditional statement	2015-05-24 17:16:30 +02:00
tux3	a32609230f	Merge branch 'pr1717'	2015-05-24 16:49:22 +02:00
Zetok Zalbavar	87e6b038f9	Properly fix quoting in action messages ... * Allow quoting in action messages if line number is >1. * Fix regression introduced by 1244d689f6 where '\n' was being trimmed in action messages. * Add comment about typing notifications placeholder that needs to be fixed.	2015-05-24 15:30:21 +01:00
tux3	874abd363f	Merge branch 'pr1714'	2015-05-24 15:17:00 +02:00
Ansa89	ce162ae91d	Italian translation: update	2015-05-24 14:47:04 +02:00
tux3	d16f9a542e	Merge branch 'pr1712'	2015-05-24 14:43:13 +02:00
tux3	be87047896	Merge branch 'pr1710'	2015-05-24 14:42:40 +02:00
tux3	326dc3973a	Merge branch 'pr1707'	2015-05-24 14:39:28 +02:00
tux3	5b036a1784	Merge branch 'pr1706'	2015-05-24 14:39:04 +02:00
tux3	b8077775ce	Merge branch 'pr1684'	2015-05-24 14:38:30 +02:00
tux3	65490654f9	Merge branch 'pr1713'	2015-05-24 14:36:18 +02:00
Ansa89	f716027180	Fix needed to compile on slackware64 14.1 (with multilib)	2015-05-24 14:33:51 +02:00
Zetok Zalbavar	1244d689f6	Don't quote with action messages ... Quoting with action messages produces badly looking messages, where nick is blue coloured, while rest of text that is preceded by '> ' is green. To avoid that, quoting should not be triggered in action messages.	2015-05-24 01:56:57 +01:00