1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Commit Graph

1817 Commits

Author SHA1 Message Date
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
apprb
13306031e2
fix #902 2014-12-11 21:33:38 +06: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
krepa098
0f2a339a98 margins, update selection rect during resize 2014-12-09 21:47:25 +01:00
Dubslow
5cb1b6fe8e
check for no systray, fixes #908
cant believe it took this long to figure out ;_;
2014-12-09 14:18:12 -06:00
krepa098
2b20a23c3d changed color of selGraphItem 2014-12-09 19:24:01 +01:00
krepa098
661a8c4da4 revisited selection 2014-12-09 13:17:08 +01:00
krepa098
c91b7cb03c don't depend on valid cursur 2014-12-09 13:11:42 +01:00
Dubslow
eacef9834f
Merge branch 'pr914' 2014-12-08 17:54:41 -06:00
Zetok Zalbavar
fd6608b154
Update INSTALL.md 2014-12-08 23:48:48 +00:00
Dubslow
91f99762a0
Merge branch 'pr912' 2014-12-08 15:16:46 -06:00
krepa098
a1cfbeffcb removed ChatLine vAlignCol 2014-12-08 22:08:23 +01:00
Sascha Brendel
17bcd969b2 Update chatform.cpp
Improved that line of code.
Thanks to @dubslow
2014-12-08 20:28:34 +01:00
Lednerb
dfb51d7d29 Added Translation for error message on sending a file. Also included the German Version. 2014-12-08 19:07:51 +01:00
Lednerb
cd82ee9f11 Added translation. 2014-12-08 14:55:57 +01:00
Lednerb
cfae6104d4 Fixed language error. 2014-12-08 14:39:39 +01:00
krepa098
fdee08df32 ui tweaks 2014-12-07 20:52:01 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
32863bb272
Merge branch 'pr884' 2014-12-07 19:54:49 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
983c0b7e6b
Merge branch 'pr857' 2014-12-06 14:02:24 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
53d7bc9dc1
Push to talk with input msgedit focused 2014-12-06 13:59:19 +01:00
Simon Vermeersch
424af0505e Focus the text input area when clicking on the text area 2014-12-06 13:54:37 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
324d075cfe
Change push to talk shortcut to CTRL+P 2014-12-06 13:49:04 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
9a7548fe86
Merge branch 'pr878' 2014-12-06 13:22:12 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
a5c5618b97
Fix include 'Windows.h' -> 'windows.h'
MinGW is case sensitive
2014-12-06 12:44:38 +01:00
Dubslow
b3c08f8e09
Merge branch 'pr899' 2014-12-05 17:21:23 -06:00