5100 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Zetok Zalbavar	2a420b85ef	chore(test-pr.sh): commit merge as qTox testing <> ... With this one doesn't need to even have git properly configured to test a PR.	2016-07-13 20:50:40 +01:00
sudden6	9bd8ec0193	Merge pull request #3506 ... Nils Fenner (1): fix(about-qtox): fix QString "missing argument" warning	2016-07-13 21:43:43 +02:00
sudden6	c76d139172	Merge pull request #3495 ... Diadlo (5): style(widget): Style fixes style(audio, video): Style fixes style(chatlog, persistence): Style fixes style(platform): Style fixes style(core): Style fixes	2016-07-13 21:23:26 +02:00
Nils Fenner	f2f48a8f07	fix(about-qtox): fix QString "missing argument" warning	2016-07-13 13:33:59 +02:00
Diadlo	f8eda7eb57	style(core): Style fixes	2016-07-13 01:54:37 +03:00
Diadlo	9471065feb	style(platform): Style fixes	2016-07-13 01:54:37 +03:00
Diadlo	20d3225f29	style(chatlog, persistence): Style fixes	2016-07-13 01:54:37 +03:00
Diadlo	2258748d28	style(audio, video): Style fixes	2016-07-13 01:54:37 +03:00
Diadlo	76f694fe73	style(widget): Style fixes	2016-07-13 01:54:30 +03:00
Nils Fenner	88eca7e200	Merge pull request #3487 ... Diadlo (1): style(toxcall): Copy constructor return non-const reference	2016-07-13 00:14:20 +02:00
Diadlo	8e7a6c89c2	style(toxid, widgets): Made constructor explicit	2016-07-13 00:33:37 +03:00
Colomban Wendling	294bdab77f	fix(x11grab): try and use the current display ... Don't hard-code ":0" as the display and try and use the DISPLAY environment variable instead. This fixes screen grabbing under X11 when the user is not on screen 0. Fix #3500.	2016-07-12 21:31:33 +02:00
sudden6	e97a870c0f	Merge pull request #3392 ... Diadlo (12): refactor(avform): Extracted functions with best mode search and combo box filling refactor(avform): Replace `bestModeInds` on videoMode index and video height as quality name refactor(avform): Separeted search of preferred index in function fix(avform): Took default resolution from middle of list feat(videomode): Added possible video shift feat(cameradevice, avform): Added ability of screen selection feat(avform, screenshotgrabber): Added custom screen region selection style(corevideosource): Small style fixes fix(videoframe): Added correct image copy fix(avform): Added restoring selected region feat(camerasource): Change default video mode to preferred fix(directshow): Fixed problem with crosses initialization	2016-07-12 19:56:41 +02:00
sudden6	0a595ea679	Merge pull request #3453 ... Diadlo (2): fix(genericchatform): Fixed position of screenshot button fix(video): Changed minimum window size with video	2016-07-12 19:49:29 +02:00
qTox translations	888e9d3bbc	chore(i18n): update translation files for weblate	2016-07-12 09:29:39 +01:00
ati3	0c3f3817c3	feat(l10n): update Hungarian translation from weblate	2016-07-12 09:29:39 +01:00
ati3	8d94ca9227	feat(l10n): update Czech translation from weblate	2016-07-12 09:29:39 +01:00
ww Draw	6052364bca	feat(l10n): update Bulgarian translation from weblate	2016-07-12 09:29:39 +01:00
Viktar Vauchkevich	daabda84c4	feat(l10n): update Belarusian translation from weblate	2016-07-12 09:29:39 +01:00
Nils Fenner	b7f65ffe28	refactor(chat): fix type conversion warnings	2016-07-12 10:26:25 +02:00
Nils Fenner	b204d0abad	refactor(chat): cleanup document cache	2016-07-12 10:26:25 +02:00
Nils Fenner	b99a9e494a	refactor(chat): cleanup elided text	2016-07-12 10:26:25 +02:00
sudden6	939c97a0e9	Merge pull request #3441 ... Andrew Morgan (1): feat(textstyle): Change markdown syntax to be more intuitive	2016-07-11 21:52:58 +02:00
Zetok Zalbavar	ef5c094417	Merge pull request #3498 ... Nils Fenner (1): fix(chat): cleanup chat css base style	2016-07-11 10:21:45 +01:00
Nils Fenner	989b15e656	fix(chat): cleanup chat css base style ... fix chat area's inner stylesheet note: the base font is never a bold font (respects html tags: e.g. <b>bold text</b>) fix block colors: * action -> blue * alert -> red * quote -> green	2016-07-10 13:43:50 +02:00
Diadlo	f8a45b4051	fix(video): Changed minimum window size with video ... Fix #3396.	2016-07-09 22:15:04 +03:00
Diadlo	86e44143ad	fix(genericchatform): Fixed position of screenshot button ... Fix #2427.	2016-07-09 22:15:04 +03:00
Zetok Zalbavar	464daebdd7	chore(travis): exit linux build as soon as one of steps fails ... Closes #3468.	2016-07-08 16:57:22 +01:00
Andrew Morgan	32e48a979c	feat(textstyle): Change markdown syntax to be more intuitive ... BREAKING CHANGE: Current markdown syntax is unintuitive, and thus we have agreed on switching to @SkyzohKey's implementation. Replaces all instances of Markdown with Text Styling. Closes #3404.	2016-07-07 20:07:22 -07:00
Diadlo	ed04b2debf	style(toxcall): Copy constructor return non-const reference	2016-07-08 01:21:31 +03:00
sudden6	1bd86f7eee	Merge pull request #3475 ... a68366 (2): fix(groupinviteform): consider dateTime format in group invites fix(generalform): call UI retranslation when date or time format changes	2016-07-08 00:09:26 +02:00
sudden6	06475b7424	Merge pull request #3411 ... PafXUS (1): fix(persistence): pass by reference to const	2016-07-08 00:07:44 +02:00
sudden6	5be249e3fe	Merge pull request #3450 ... Diadlo (1): fix(widget): Added saving window state before closing	2016-07-07 23:57:56 +02:00
Diadlo	bfb5dae6fa	fix(widget): Added saving window state before closing ... It's needed if user setup `Close to tray` Fix #3397.	2016-07-08 00:32:34 +03:00
sudden6	ee0294bb4c	Merge pull request #3464 ... Andrew Morgan (1): feat(chatform): Disable call buttons if friend is offline	2016-07-07 23:31:54 +02:00
a68366	d601599de8	fix(generalform): call UI retranslation when date or time format changes ... Needed to update date and time display.	2016-07-08 00:18:12 +03:00
Zetok Zalbavar	34fb127db1	docs(MAINTAINING.md): note that not using merge script can break builds	2016-07-07 14:14:50 +01:00
Diadlo	29dbd03076	feat(l10n): update Russian translation from weblate	2016-07-07 13:48:49 +01:00
Zetok Zalbavar	699ffae422	Merge pull request #3486 ... wDraw (1): feat(l10n): update Bulgarian translation	2016-07-07 13:41:54 +01:00
wDraw	b6b149a756	feat(l10n): update Bulgarian translation ... feat(l10n): cleanup Bulgarian translation	2016-07-07 11:37:56 +03:00
a68366	6030b083b1	fix(groupinviteform): consider dateTime format in group invites ... Closes #3058	2016-07-07 00:55:23 +03:00
Zetok Zalbavar	3ae18f2090	Merge pull request #3482 ... minj (1): feat(l10n): update Lithuanian translation	2016-07-06 13:40:13 +01:00
minj	9d10884029	feat(l10n): update Lithuanian translation	2016-07-06 13:32:05 +03:00
Zetok Zalbavar	2d06b9960c	fix(qtox.pro): don't depend on GTK in order to build on Linux	2016-07-06 10:40:44 +01:00
Zetok Zalbavar	99ce719b80	chore: remove unnecessary indentation from merge commit message	2016-07-05 14:47:24 +01:00
Nils Fenner	b4a87a3a0e	Merge PR #3447 branch from 'anoadragon453:nautilus-fix'	2016-07-05 10:38:02 +02:00
Nils Fenner	1dd730841a	refactor(chat-settings): use safe methods to get the font's pixel size ... Further rename the pixel size vars to improve readability.	2016-07-05 08:48:09 +02:00
Nils Fenner	9ec5c11caa	fix(chat-settings): change order during chat-base-font UI initialization ... Setting "currentFont" fires a "currentFontChanged" signal, causing the wrong font pixel-size. After changing the order, the values still overwrite the font settings - yet with the correct values. Probably all signals should be blocked in c'tor during initialization of the settings widget(s) to avoid overwriting any settings.	2016-07-05 08:48:09 +02:00
Zetok Zalbavar	a01293f81e	Merge pull request #3472 ... C M B (2): feat(l10n): update French translation from weblate feat(l10n): update German translation from weblate Diadlo (1): feat(l10n): update Russian translation from weblate Reg Zi (1): feat(l10n): update Bulgarian translation from weblate ovalseven8 (1): feat(translation): Update for German translation file qTox translations (1): chore(i18n): update translation files for weblate	2016-07-04 17:21:59 +01:00
ovalseven8	beca3a9c45	feat(translation): Update for German translation file	2016-07-04 17:33:11 +02:00