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

2590 Commits

Author SHA1 Message Date
TheLastProject
ebf4af830d Fix #1204 2015-03-18 00:45:57 +01:00
isn0gud
de423571eb
add friend on enter key pressed #1404 2015-03-17 13:23:34 -05:00
Dubslow
99e8d71fca
Merge branch 'pr1400', with style fixes @agilob
Conflicts:
	src/widget/form/profileform.cpp
2015-03-17 13:18:47 -05:00
Dubslow
9d5b77aa61
Fix qr label wordwrap 2015-03-17 11:14:16 -05:00
Dubslow
42fe29e83d
Merge branch 'pr1397' 2015-03-16 17:53:00 -05:00
sudden6
0c4cc87ed0 fix #1394 2015-03-16 17:46:56 -05:00
Dubslow
0a2e1b8d75
Merge branch 'pr1396' 2015-03-16 17:40:49 -05:00
PKEv
c8c9e24cf2 Update Russian translation 2015-03-16 17:40:35 -05:00
Dubslow
fc720f570d
Merge branch 'pr1392' 2015-03-16 17:37:38 -05:00
Dubslow
34e927560a
Add -lqrencode to JENKINS 2015-03-16 17:26:09 -05:00
Dubslow
4087778b88
Merge branch 'pr1378' 2015-03-16 16:47:12 -05:00
Dubslow
e96211199d
Check for writability for Qr saves 2015-03-16 16:41:59 -05:00
Dubslow
ad09980ce7
Less agressive tooltip 2015-03-16 16:15:34 -05:00
Dubslow
b908852e3b
Cleanup QR PR
Fix coding style, #include "" -> #include <>
Remove tooltip
Move "tox:" addition out of qr-related code

Conflicts:
	src/misc/qrwidget.cpp
2015-03-16 15:41:39 -05:00
Dubslow
01a4cdd07e
Merge branch 'pr1351' 2015-03-16 14:56:01 -05:00
agilob
f72a5b0d85
rm qrcodewindow 2015-03-16 19:38:05 +00:00
novist
95f2a3d8b3 Missing svgs 2015-03-16 20:46:41 +02:00
agilob
209f8a19ba
disable css interitance in setpassworddialog 2015-03-16 18:03:14 +00:00
Dubslow
3da818e35a
Merge branches 'pr1344' and 'pr1403' 2015-03-16 12:56:26 -05:00
Ansa89
a5b5b8ce74 Italian translation: update 2015-03-16 17:46:50 +01:00
kushagra
de8f4a60ad Resize notification only if theres lot of text 2015-03-16 12:07:19 +05:30
agilob
b60cfef749
closes tux3/qtox #1399
disabling scrolling on comboboxes in all settings forms
2015-03-15 20:29:23 +00:00
agilob
42133a3d00
copy image to clipboard 2015-03-15 18:53:10 +00:00
agilob
9d99007e2c
qrcode always visible, button to save 2015-03-15 15:45:28 +00:00
PKEv
e3946b4435 #1379 correct 2015-03-14 23:06:33 +03:00
tux3
ac9b327fe7
Merge branch 'pr1391' 2015-03-14 19:51:58 +01:00
tux3
2547029140
Merge branch 'pr1390' 2015-03-14 19:51:17 +01:00
tux3
c5a8a17e21
Merge branch 'pr1389' 2015-03-14 19:49:04 +01:00
tux3
48dd053d07
Merge branch 'pr1388' 2015-03-14 19:48:05 +01:00
tux3
224c877fb1
Merge branch 'pr1387' 2015-03-14 19:46:12 +01:00
Flakebi
3aca73e4b5 Align file bubbles better 2015-03-14 18:57:07 +01:00
Flakebi
ae9cf96631 Rename dialog buttons 2015-03-14 18:44:26 +01:00
Flakebi
b73c8bcce6 Add askQuestion with custom buttons 2015-03-14 18:44:26 +01:00
agilob
3ec5d30f35
UI fixes in general form:
disable light tray icon if system tray icon disabled (didn't work for
some reason)

disable emoticons combobox if emoticons disabled globally

prevent comoboxes and spinboxes stealing mouse scroll event while
scrolling in generalform, prevents from accidential language/timestamp
format/theme/skin changes while scrolling in the widget

disable passing CSS to qfiledialog in general form, qfiledialog will use
default system theme instead of not fully written from qwidget

fixed tab order in generalsettings
2015-03-14 17:01:59 +00:00
Flakebi
63150ab022 Reset activeChatroomWidget when switching to addFriendForm 2015-03-14 17:16:32 +01:00
Flakebi
53589df799 Disable call buttons in a lonely groupchat 2015-03-14 17:04:06 +01:00
tux3
419a3cc041
Merge branch 'pr1386' 2015-03-14 17:00:05 +01:00
dbuday
1282859377 Merge branch 'master' of https://github.com/dbuday/qTox
Adding croatian translation
2015-03-14 16:35:40 +01:00
tux3
b84d45c896
Merge branch 'pr1385' 2015-03-14 16:34:41 +01:00
Davor
200ae23de3 Update generalform.cpp 2015-03-14 16:34:12 +01:00
Davor
d72698a9e5 Update res.qrc 2015-03-14 16:32:06 +01:00
Davor
efb879a706 Update i18n.pri 2015-03-14 16:25:18 +01:00
minj
dbea77e692 update Lithuanian translation 2015-03-14 16:55:57 +02:00
dbuday
81187f2b7b Added croatian translation to qTox 2015-03-14 15:27:51 +01:00
agilob
a501620d92
fixing conflict 2015-03-14 11:36:38 +00:00
Dubslow
3357024b4a
Merge branch 'comment-1367' of https://github.com/zetok/qTox 2015-03-14 04:47:46 -05:00
agilob
0bf15013e5
s/=>/>=/ 2015-03-14 08:30:52 +00:00
agilob
7432f8d007
s/qrcode/qrencode/ 2015-03-14 08:24:43 +00:00
Zetok Zalbavar
9ed4b3fb7d
Add missing comment for #1367 2015-03-14 08:12:42 +00:00
novist
c6312fd196 PNG images replaced with SVG
Closes #1050
2015-03-13 20:30:54 +02:00