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

2504 Commits

Author SHA1 Message Date
agilob
3096d2422f
updated simple_make 2015-03-07 12:45:45 +00:00
agilob
34360741cb
I am not sure about this commit, someone check it please 2015-03-07 12:41:45 +00:00
agilob
4b1c5e80e9
qrcode support by html tooltip 2015-03-07 12:40:45 +00:00
tux3
bd12381bea
Merge branch 'pr1349' 2015-03-06 23:58:34 +01:00
tux3
3901bebf90
Merge branch 'pr1348' 2015-03-06 23:57:47 +01:00
TheLastProject
829415eed9 Fix yet another regression by using padding-less bigger icons 2015-03-06 18:00:54 +01:00
Domen Skamlic
f678d3caf5 Some minimal fixes 2015-03-06 17:59:49 +01:00
Domen Skamlic
af319bfa82 Added Slovenian translation. 2015-03-06 17:35:09 +01:00
tux3
ea1d3ccdcd
Merge branch 'pr1339' 2015-03-06 00:40:21 +01:00
tux3
e524e5a83c
Merge branch 'pr1340' 2015-03-06 00:39:13 +01:00
tux3
68afc8f623 Change OpenCV error mode
Should help with #1240
2015-03-06 00:35:46 +01:00
Dubslow
dd3087fc3d
Merge branch 'pr1341' 2015-03-05 12:20:30 -06:00
Sean
7fb6acdafc Fixes some OS X installer bugs 2015-03-05 10:16:59 -08:00
TheLastProject
1f53d33672 Resize images. Fixes #1204 2015-03-05 18:39:38 +01:00
Domen Skamlic
100f8278e4 Update README.md 2015-03-05 17:48:02 +01:00
tux3
641fc8c776
Catch OpenCV errors
Should help with #1240
2015-03-04 22:13:42 +01:00
tux3
ea7c3a9a80
Merge branch 'pr1337' 2015-03-04 21:36:48 +01:00
Sean
fd4365f286 Threw out your broken OS X instructions
Update INSTALL.md

Update INSTALL.md

Update INSTALL.md

Update INSTALL.md

Update INSTALL.md

Update INSTALL.md
2015-03-04 21:36:37 +01:00
tux3
96d39f6565
Merge branch 'pr1331' 2015-03-04 21:31:25 +01:00
Sean
dddf5b73d4 Political correctness 2015-03-04 12:29:12 -08:00
tux3
50601b4049
Merge branch 'pr1303' 2015-03-04 20:11:53 +01:00
tux3
cca1425b43
Merge branch 'pr1336' 2015-03-04 20:02:01 +01:00
tux3
ea6d52d4ea
Merge branch 'pr1335' 2015-03-04 20:01:21 +01:00
tux3
a96dbf6973
Merge branch 'pr1327' 2015-03-04 19:54:46 +01:00
tux3
805b9e14e4
Cherry-pick from #1323
Closes #1323
2015-03-04 19:53:29 +01:00
Sean
f19b6230ed High DPI scaling
High DPI scaling

Update qtox.pro

Oh right not everyone uses Qt5.4

Why did I use the web ui
2015-03-04 19:52:50 +01:00
tux3
17042c1aff
Merge branch 'pr1244' 2015-03-04 19:29:49 +01:00
TheLastProject
3c602ec0d6 Fix images with spaces or other non-HTML characters breaking the preview 2015-03-04 17:32:45 +01:00
Sean
f51cd63cff Almost forgot mv is harmful
Note that this is required because Qt applications cannot run under setuid(0) as qtox_sudo sets

.

Fix quitting
2015-03-04 08:26:16 -08:00
Sean
fbd0cc59b6 OS X applications folder support 2015-03-04 08:26:16 -08:00
minj
7b17a61712 tweak some Lithuanian translations 2015-03-04 18:15:53 +02:00
baloo79
9494f63841 Update generalform.cpp (for Hungarian translation) 2015-03-03 20:13:15 +01:00
baloo79
4aaf71ae8b Hungarian translation added 2015-03-03 20:01:29 +01:00
baloo79
827dc72f33 Update res.qrc (Hungarian translation) 2015-03-03 19:58:47 +01:00
baloo79
6ff994221f Update i18n.pri (Hungarian translation) 2015-03-03 19:56:37 +01:00
Dubslow
75a0e8ac2e
Merge branch 'pr1275'
Conflicts:
	src/widget/form/genericchatform.cpp
2015-02-28 12:20:40 -06:00
Dubslow
bfb0fdfee1
Merge branch 'pr1311' 2015-02-28 11:59:07 -06:00
TheLastProject
9dc52c1eb9 Add image preview on mouseover 2015-02-28 17:14:58 +01:00
tux3
27d20ba734
Merge branch 'pr1299' 2015-02-27 21:55:01 +01:00
tux3
33281f95d0
Merge branch 'pr1297' 2015-02-27 21:46:30 +01:00
agilob
8ceacdd519
clearing chatarea 2015-02-27 18:25:27 +00:00
agilob
2ec1bd0977
keyboard shortcut to change current chat 2015-02-27 17:56:47 +00:00
agilob
7a6b8ab256 qlabels will not support richtext, plaintext only
removes support for HTML, QML, JS and CSS in username/status labels

this commit closes #1298(bug) #1295(bug) and #1224(feature request)
2015-02-27 14:05:03 +00:00
Ansa89
78f6b8afd8 Italian translation: update 2015-02-27 10:50:10 +01:00
tux3
337bf0cd2b
Merge branch 'pr1291' 2015-02-26 22:30:16 +01:00
agilob
439dde5c8d
+comment 2015-02-26 21:10:35 +00:00
agilob
ed1cd04340 closes tux3/qtox #1289 2015-02-26 21:08:32 +00:00
tux3
6b2b92e445
Merge branch 'pr1287' 2015-02-26 21:56:35 +01:00
Zetok Zalbavar
2ec206b97a
[qtox.pro] fix building with support for libappindicator
* added INCLUDEPATHs for libappindicator support
* added INCLUDEPATHs for GTK tray backend
* sorted some INCLUDEPATHs
2015-02-26 20:51:13 +00:00
tux3
bcbc6bd65f
Merge branch 'pr1282' 2015-02-25 19:58:29 +01:00