2364 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
lumirayz	f469e1b892	fix more consistency issues	2014-12-11 19:11:21 +01:00
Zetok Zalbavar	e0993a72f6	Style corrections ... 'if()' → 'if ()' 'for()' → 'for ()'	2014-12-11 18:05:52 +00:00
apprb	13306031e2	fix #902	2014-12-11 21:33:38 +06:00
lumirayz	038b4cedcb	make the code style more consistent	2014-12-11 15:31:01 +01:00
lumirayz	c73b07db72	added a compact layout for the friends list	2014-12-11 13:02:45 +01:00
krepa098	380d7b9a07	Text: detect anchors	2014-12-10 19:56:08 +01:00
krepa098	170e2e6e29	Text: selection use fuzzy hit	2014-12-10 19:31:27 +01:00
krepa098	fd7fe15e31	renamed firstLineVOffset to getAscent	2014-12-10 16:45:12 +01:00
krepa098	0692c484f0	adjusted Image, Spinner, ChatLineContentProxy vOffset	2014-12-10 16:42:12 +01:00
krepa098	2003f7c5aa	Text: use ascent rather than height	2014-12-10 16:35:07 +01:00
krepa098	26718f7147	cleanup	2014-12-10 10:59:10 +01:00
krepa098	ba24da3184	filetransferwidget.ui: reverted margins. chatlinecontentproxy: calculate ... firstLineVOffset	2014-12-10 10:57:09 +01:00
krepa098	b6fd9ed02e	chatline: fixed bbox height calculation	2014-12-10 10:41:22 +01:00
krepa098	5ae506fe3b	filetransferwidget: added open (browse?) button, fixed layout	2014-12-10 10:35:56 +01:00
Dubslow	de6a443f37	fix loading an encrypted chat log failing	2014-12-09 19:13:39 -06:00
Dubslow	a1a1a6f989	fix clearing duplicate passwords ... fixes dubslow/qTox#2	2014-12-09 19:12:20 -06:00
Dubslow	09602731f7	when loading, try using main password for history	2014-12-09 18:40:05 -06:00
Dubslow	31c072d296	more file open checking	2014-12-09 18:08:38 -06:00
Dubslow	0e21a8d497	check for non-existent file	2014-12-09 17:44:20 -06:00
Dubslow	c5b945bbd5	minor tweaks	2014-12-09 15:43:56 -06:00
Dubslow	7fc7b57934	refactor/fix switching profile with separate settings	2014-12-09 15:43:43 -06:00
krepa098	0f2a339a98	margins, update selection rect during resize	2014-12-09 21:47:25 +01:00