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

892 Commits

Author SHA1 Message Date
dubslow
1bacd2da7a Merge branch 'master' into profiles... yikes
Conflicts:
	core.cpp
	core.h
	misc/settings.cpp
	misc/settings.h
	widget/form/settings/generalform.h
	widget/form/settingsform.cpp
	widget/widget.cpp
	widget/widget.h
2014-10-08 20:25:26 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
20f2dac755 Merge pull request #404 from dubslow/ringtone
add ringtone (not well done, but still better than status quo)
2014-10-08 14:18:34 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
7ba9ac69dc
Embed pirate translation 2014-10-08 14:08:52 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
d036f5e061
Merge pull request #407 from zetok/translation-pirate
Add initial Pirate translation
2014-10-08 14:08:12 +02:00
Zetok Zalbavar
1919967082
Add initial Pirate translation 2014-10-08 11:57:41 +01:00
dubslow
54eb425238 add ringtone (not well done, but still better than status quo) 2014-10-07 22:33:55 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
f441ffd74a
Try to link opencv statically in linux packages 2014-10-08 00:41:56 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
aa11caa63b
debian: Exclude libs from source package 2014-10-07 23:05:05 +02:00
agilob
afc77f63db
css styles for mainHead and mainContent in widget.cpp
fixes problems with ugly UI on non-standard system theme.
before: https://i.imgur.com/XJ0mbpi.png
after: https://imgur.com/a/UbgNz
2014-10-07 21:55:20 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
f962391757
Merge commit 'refs/pull/399/head' of https://github.com/tux3/qTox 2014-10-07 21:40:44 +02:00
Zetok Zalbavar
b7dcbdc474
Update Polish translation 2014-10-07 20:33:06 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
32c56cbba4
Update french translation 2014-10-07 21:21:13 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
6aa974c764 Merge pull request #395 from apprb/chat
Reduction of CPU usage on new message insert
2014-10-07 19:58:18 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
da53c29bcd Merge pull request #398 from Ansa89/italian-translation
Italian translation: update
2014-10-07 17:43:44 +02:00
Ansa89
938325bd2a Italian translation: update 2014-10-07 14:54:58 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
39fd7b8b25 Merge pull request #392 from apprb/proxy
Proxy related set of patches
2014-10-07 14:17:39 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
65375a6bc7 Merge pull request #396 from Ansa89/italian-translation
Italian translation: update
2014-10-07 13:37:49 +02:00
apprb
57c7734c48 bug in file transfer widget displaying fix 2014-10-07 19:20:53 +09:00
Ansa89
7a7076eb19 Italian translation: update 2014-10-07 11:06:54 +02:00
apprb
1fdc98873b reimplemented insert chat line function: every line in own table 2014-10-07 14:49:24 +07:00
apprb
443ee0a4f8 Proxy settings is more close to General group in settings.ini than to Privacy 2014-10-07 09:25:00 +07:00
apprb
f5c6194656 Introduced "Connection Settings" group in GeneralSettings widget 2014-10-07 09:24:52 +07:00
apprb
ddf7a7edfd added "Use Proxy" checkbox 2014-10-07 09:24:29 +07:00
Tux3 / Mlkj / !Lev.uXFMLA
f0a825fd76 Merge pull request #388 from Ilya87/master
Update Russian translation
2014-10-06 23:53:14 +02:00
Ilya87
b898e55b75 Update Russian translation 2014-10-07 00:52:22 +04:00
Tux3 / Mlkj / !Lev.uXFMLA
3de960b2aa Merge pull request #385 from dubslow/master
Simplify groupchat names
2014-10-06 20:28:53 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
e4fc6d2614 Merge pull request #386 from apprb/fonts
relative to system wide default font sizes in css
2014-10-06 20:28:26 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
07a06f2fdc Merge pull request #387 from dubslow/proxy
Proxy support (clean PR this time)
2014-10-06 20:28:10 +02:00
dubslow
dc73d5658a add tooltip 2014-10-06 10:04:27 -05:00
dubslow
d093679d03 Add proxy support 2014-10-06 10:04:17 -05:00
dubslow
b9a666159a reduce space between chat lines 2014-10-06 09:58:48 -05:00
dubslow
d42f9d3166 Revert "reduce font size and space between chat lines", use #386
This reverts commit 200c6d30e9.
2014-10-06 09:57:50 -05:00
apprb
6e02240b56 relative to system wide default font sizes in css 2014-10-06 23:39:07 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
a85372a5c0 Merge pull request #381 from apprb/newsettings_v2
Newsettings v2
2014-10-06 13:29:44 +02:00
dubslow
200c6d30e9 reduce font size and space between chat lines 2014-10-06 03:21:47 -05:00
dubslow
9e2195c03c simplify groupchat names, fix #379, more simplification is possible 2014-10-06 01:46:30 -05:00
dubslow
227e483bdd tweak buildPackages 2014-10-06 00:49:26 -05:00
dubslow
d1c042ed5e add Kappa emote 2014-10-05 22:47:12 -05:00
apprb
35aeca5dd0 cosmetic fixes 2014-10-06 03:02:12 +09:00
apprb
866f986d04 small fixes 2014-10-06 01:30:31 +09:00
apprb
0c2bf63b1a add missed files 2014-10-06 01:17:20 +09:00
apprb
8fa9457305 base refactoring 2014-10-06 01:17:01 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
525552a6ac Merge pull request #380 from krepa098/master
More visual tweaks and fixes
2014-10-05 18:14:36 +02:00
krepa098
51f24115d7 GenericChatForm: use correct fontmetrics 2014-10-05 17:34:34 +02:00
krepa098
b5801f1800 Style: tweaked weight 2014-10-05 14:58:47 +02:00
krepa098
77d7189d66 FileTransferInstance: use correct fontmetrics 2014-10-05 14:47:22 +02:00
krepa098
8e664b5ff7 MaskablePixmapWidget::getPixmap: return the masked pixmap 2014-10-05 14:36:07 +02:00
krepa098
b487fddf99 cleanup 2014-10-05 14:22:58 +02:00
krepa098
7100fb707b fixed regression (#334) 2014-10-05 14:22:28 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
fc587659d5 Merge pull request #377 from zetok/indicator
Change indicator for action messages
2014-10-05 11:56:44 +02:00