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

2544 Commits

Author SHA1 Message Date
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
Ovidiu Sabou
98fb61525b Merge branch 'master' into 1012-enhancement-quick-tox-id-access
Conflicts:
	src/widget/widget.h
2015-03-04 21:43:46 +02:00
Ovidiu Sabou
c3dd285864 Set a header to be consistent and to have the profile page remain open when switching profiles 2015-03-04 21:35:34 +02: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
Ovidiu Sabou
75f5901aec Refresh the available profiles when the profile page is shown. Fix regression for #1012
I carelessly removed perfectly good code from the present() method and this commit brings that back
2015-03-04 00:04:16 +02:00
Ovidiu Sabou
b155830e4c Move the identity settings tab into its own dedicated profile page
Make the page directly accessible from the main screen by clicking the avatar or the username. Changing the avatar or the username are now possible only from the profile page
2015-03-03 22:29:01 +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
krepa098
00af059a4f use QUrl::fromLocalFile (fix #1305) 2015-03-01 10:43:43 +01:00
krepa098
4852a7efa5 Text: Tooltips (issue #1238) 2015-03-01 10:34:20 +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
sudden6
1a17b2efb8 Fix build for openSUSE and probably others 2015-02-25 19:46:59 +01:00
tux3
3824b567ef
Don't build desktop resource files on android 2015-02-25 19:36:06 +01:00
tux3
068f65b389
Fix missing brace 2015-02-25 17:50:34 +01:00
tux3
0cb45e6527
Disable systray unity backend by default
It's confusing too many people, lacks some features, and is only useful on Unity
2015-02-25 17:48:43 +01:00
tux3
bb8464bbde
Upload update FTP deployement scripts
In case someone finds those interesting, or if I get hit by a bus unexpectedly
2015-02-25 16:16:18 +01:00
tux3
351bc3f037
Merge branch 'pr1279' 2015-02-25 16:09:04 +01:00
tux3
66225bbd79
Merge branch 'pr1278' 2015-02-25 16:08:16 +01:00
minj
6014bc2968 update Lithuanian translation 2015-02-25 17:01:59 +02:00
tux3
1a1debf167
Merge branch 'pr1243' 2015-02-25 15:55:32 +01:00
TheLastProject
741539d5b8 Update Dutch translation 2015-02-25 15:53:32 +01:00