1949 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
krepa098	a0ea0675a7	Merge branch 'master' into chatlog_v3_1 ... Conflicts: qtox.pro res.qrc src/misc/smileypack.cpp src/widget/chatareawidget.cpp src/widget/chatareawidget.h src/widget/form/chatform.cpp src/widget/form/genericchatform.cpp src/widget/form/genericchatform.h src/widget/form/settings/generalform.cpp src/widget/tool/chatactions/messageaction.cpp src/widget/tool/chatactions/systemmessageaction.cpp src/widget/widget.cpp	2015-01-03 10:17:53 +01:00
Dubslow	eb6a563f8b	Merge branch 'pr970'	2014-12-31 19:14:09 -06:00
Dubslow	8ef6e5b9d5	Merge branch 'pr969'	2014-12-31 19:13:53 -06:00
Zetok Zalbavar	86c672b8d7	Update INSTALL.md	2014-12-31 12:43:43 +00:00
krepa098	f1f42fc237	innerStyle, groupchats	2014-12-31 13:42:06 +01:00
krepa098	7a4af239b0	Text: toHtmlChars	2014-12-31 09:59:35 +01:00
Ansa89	956f680eed	Italian translation: update	2014-12-31 09:47:49 +01:00
Dubslow	f7bef8d5c3	Merge branch 'pr966'	2014-12-31 00:55:59 -06:00
Dubslow	75331af311	Merge branch 'pr965'	2014-12-31 00:50:03 -06:00
Dubslow	7fbd6438df	Merge branch 'pr959'	2014-12-31 00:22:00 -06:00
Dubslow	4795349198	Merge branch 'pr957'	2014-12-31 00:20:00 -06:00
Dubslow	2489f2a49d	Merge branch 'pr950' ... Finally have access to a gnu-linux box for a couple of days... but the internet is so bad my ssh sometimes lags :/	2014-12-31 00:15:00 -06:00
apprb	1194df2f78	renaming: Direct Connect -> None	2014-12-30 22:02:26 +06:00
apprb	f8bdaac121	messages splitting fix	2014-12-28 23:32:19 +06:00
apprb	1719c72f67	tiny polishing	2014-12-28 19:04:32 +06:00
apprb	a14da15d79	fix #963	2014-12-28 18:32:25 +06:00
Toxicop	78f33edfb3	Update Deutsch translation	2014-12-24 08:20:46 +01:00
Théo Bueno	0c2473d68f	update nodes list ... the previous one was 4 months old	2014-12-22 13:22:02 +01:00
novist	30d9862c4f	Removed explanations from tray menu	2014-12-18 20:32:28 +02:00
Dubslow	9bc6ae57fa	try mac fix	2014-12-17 16:49:17 -06:00
Dubslow	0fff9dab3d	Merge branch 'pr943'	2014-12-17 14:44:26 -06:00
Dubslow	0e9a6fc10e	Merge branch 'pr942'	2014-12-17 14:44:01 -06:00
Dubslow	54e8be75d2	Merge branch 'pr938'	2014-12-17 14:43:34 -06:00
Dubslow	4853d60dd3	Merge branch 'pr898'	2014-12-17 14:42:56 -06:00
Zetok Zalbavar	e5b9e8c59c	Make quote colour more readable	2014-12-17 15:37:07 +00:00
agilob	5861c6daa5	removing fixed size from mic/volume buttons so they align nicely	2014-12-17 12:36:34 +01:00
Сухарик	e83c1a2ca1	update russian translation	2014-12-17 14:05:11 +03:00
agilob	f8d870f374	removing spacing from microphone layout	2014-12-17 12:00:41 +01:00
Ansa89	4caef8743b	Italian translation: udpate	2014-12-17 10:30:08 +01:00
Dubslow	9d193c752e	Merge branch 'pr933'	2014-12-16 18:51:21 -06:00
Dubslow	5cbe175ddc	update the build system	2014-12-16 18:50:52 -06:00
Dubslow	fc749880eb	minor style tweaks	2014-12-16 18:05:13 -06:00
Dubslow	fa5f10ed69	Merge branch 'pr939'	2014-12-16 13:45:06 -06:00
Sean Qureshi	e30b74a984	Switch to subtree	2014-12-16 02:51:31 -08:00
Sean Qureshi	1e2e482c68	Merge commit '8934a11dbffce6b0611d97d5748668a5cdb8ba8a' as 'osx/updater'	2014-12-16 02:51:14 -08:00
Sean Qureshi	8934a11dbf	Squashed 'osx/updater/' content from commit a558402 ... git-subtree-dir: osx/updater git-subtree-split: a5584021435fc74a1e5da447524b37dcf7311bbc	2014-12-16 02:51:13 -08:00
agilob	8f173af3d7	removing border from contact name linedit	2014-12-15 17:14:17 +01:00
Ansa89	276c5ce828	Italian translation: update	2014-12-15 11:11:10 +01:00
Maximilian Wuttke	e0cb122abe	Merge branch 'filter_audio' of https://github.com/mwuttke97/qTox into filter_audio ... Added some `#ifdef QTOX_FILTER_AUDIO`s. Conflicts: qtox.pro Conflicts: src/coreav.cpp	2014-12-14 10:55:38 +01:00
krepa098	3190530686	filling the gaps	2014-12-13 21:11:03 +01:00
Dubslow	e7cad9b942	Merge branch 'pr931'	2014-12-13 12:20:10 -06:00
Dubslow	84dea5e12c	Revert "fix #902" ... @apprb #932 This reverts commit 13306031e2.	2014-12-13 12:18:43 -06:00
Sabri	22002efc09	Huge French translation fixes	2014-12-13 09:26:37 +01:00
Dubslow	fdcb8997ce	Merge branch 'pr926'	2014-12-12 18:43:43 -06:00
Dubslow	a8b1f60256	Merge branch 'pr923'	2014-12-12 18:40:24 -06:00
Dubslow	cc4cc7d7a8	Merge branch 'pr922'	2014-12-12 18:37:06 -06:00
Dubslow	96ddde8bc1	Merge branch 'pr921'	2014-12-12 18:28:25 -06:00
novist	e2bf37c139	Light tray icon option	2014-12-12 12:12:12 +02:00
Sean	4a00125f7c	Refactor OS X updater ... Went and rewrote half of it in an actually sane manner, recursive functions > nested loops.	2014-12-11 21:29:09 -08:00
Zetok Zalbavar	e0993a72f6	Style corrections ... 'if()' → 'if ()' 'for()' → 'for ()'	2014-12-11 18:05:52 +00:00