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

2731 Commits

Author SHA1 Message Date
zero-one
0b64235c69 Settings singleton no longer emits signal when groupchat position changes 2015-03-23 03:06:44 -07:00
Ansa89
79df0c60f7 Italian translation: update 2015-03-23 10:42:41 +01:00
zero-one
a1e228e60d style fixes to conform to Allman style 2015-03-23 02:38:24 -07:00
zero-one
c15cc60137 Merge branch 'master' into friend_list 2015-03-23 02:35:20 -07:00
zero-one
de8eb5293c Merge branch 'master' into friend_list
Conflicts:
	src/widget/form/settings/generalform.cpp
2015-03-23 02:34:12 -07:00
Dubslow
f55fd40ec6
Merge branches 'pr1452', 'pr1453', 'pr1456' and 'pr1457' 2015-03-22 16:17:00 -05:00
PKEv
72c45a65fa Correct #1448 2015-03-22 23:44:42 +03:00
Jookia
e3bdd6d221 Added option to disable notification sounds. 2015-03-23 07:27:44 +11:00
Rohil Surana
c540c4dc91 Corrected a spelling mistake 2015-03-23 00:49:48 +05:30
PKEv
becd923c09 #1441 correct 2015-03-22 02:26:17 +03:00
Dubslow
ff4b431e5e
Fix minor memleak 2015-03-21 15:58:26 -05:00
agilob
5f15bc8b75 iso date 2015-03-21 15:48:43 +00:00
agilob
77e333ab05 long time format 2015-03-21 15:47:09 +00:00
PKEv
d8f414f84a Update translation profile widget 2015-03-20 23:48:42 +03:00
Dubslow
d33f87772d
Merge branches 'pr1440' and 'pr1443' 2015-03-20 12:10:40 -05:00
minj
896f624037 update Lithuanian translation
tweak a few words in previous translations
2015-03-20 14:54:06 +02:00
agilob
a873bb571f
generalsettings: time and date format from qlocale 2015-03-20 08:17:18 +00:00
Zetok Zalbavar
ab5704fd59
[INSTALL.md] fix typo 2015-03-20 07:01:57 +00:00
Dubslow
9079b334b9
Merge branches 'pr1433', 'pr1435', 'pr1436', 'pr1438' and 'pr1439' 2015-03-19 23:02:02 -05:00
PKEv
b201cb22ee manual how to build in Windows with qrencode 2015-03-20 01:11:32 +03:00
Stefan Merettig
15ff9355df INSTALL.md: Fixed package name of 'libvpx' on ArchLinux 2015-03-19 22:42:23 +01:00
PKEv
eabff1b8e4 Correct hearder file for windows 2015-03-20 00:13:56 +03:00
niXman
7b13bc88fe Update simple_make.sh
in Ubuntu `libqrencode-dev` should be used for `qrencode.h` header.
2015-03-19 22:40:45 +02:00
PKEv
e940459596 Correct for Maximized window 2015-03-19 22:41:31 +03:00
Dubslow
44662310da
Merge branches 'pr1429' and 'pr1431' 2015-03-19 11:03:37 -05:00
sudden6
df785e6608 Add some error handling in attempt to fix #1240
This should prevent the application from crashing, but there is still no
way to tell there is no webcam attached.
2015-03-19 13:30:19 +01:00
novist
a8cd541cb5 IPC improvements
* Removed waitUntilProcessed() because waitUntilAccepted() fits the job. They were nearly identical too so decreased code duplication
* Global events are set as processed only by instance that accepts them. Solves issue where global event would be consumed by first instance that saw it even if that instance ignored that event
* Fixed bug where running qtox instance would not properly exit after sending window activation event that was accepted by already running instance
2015-03-19 12:06:05 +02:00
Dubslow
2286d953d9
Merge branch 'pr1425' 2015-03-18 11:51:37 -05:00
kushagra
cb8d892724 fixed display of contact_dark.svg 2015-03-18 21:21:58 +05:30
Dubslow
6a43aa8680
Merge branches 'pr1419', 'pr1420', 'pr1421' and 'pr1424' 2015-03-18 08:21:19 -05:00
Ansa89
46d0122489 Italian translation: update 2015-03-18 11:25:10 +01:00
kushagra
41dc562b64 fixes #1091 2015-03-18 14:15:51 +05:30
kushagra
dc7cd7c027 fixes #1412 2015-03-18 12:40:23 +05:30
TheLastProject
6164426b13 Oops, forgot about groups 2015-03-18 00:51:22 +01:00
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