Dubslow
a572ccff27
Merge branch 'encryption' into master
...
Conflicts:
src/core.cpp
src/historykeeper.h
2015-02-03 10:21:59 -06:00
Dubslow
9c1cbb7a4d
Reword opening password dialog per srkunze's suggestion
2015-02-02 21:31:56 -06:00
Dubslow
625eb3cf5b
Code cleanup
2015-02-02 21:28:20 -06:00
Dubslow
8d999efae7
Fix the previous todo
2015-02-02 17:56:51 -06:00
Dubslow
ca5e9c324d
When enabling history encryption, check for and use previously-ignored encrypted history
...
Should close dubslow/qTox#5 and close dubslow/qTox#6
Note that the GUI isn't updated with the ignored history, that's a TODO
2015-02-02 17:19:43 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
5bd3cd041d
Windows installer: Fix x64 install path
...
Program Files instead of Program Files (x86)
2015-02-01 22:30:13 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
aa3134c09f
Merge branch 'pr1082'
2015-02-01 17:33:16 +01:00
Christoffer Sterner
aee04c92e4
Playback audio slider support non-group call
2015-02-01 17:18:45 +01:00
Christoffer Sterner
866c38e7df
Add support for playback audio slider setting
2015-02-01 16:58:59 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
58b3e66c6b
Merge branch 'pr1081'
2015-02-01 15:59:19 +01:00
Zetok Zalbavar
32370128df
Update Polish translation
2015-02-01 14:24:02 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
a2ef070f73
Merge branch 'pr1079'
2015-02-01 13:16:07 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
2f8d512a2f
Merge branch 'pr1078'
2015-02-01 13:14:32 +01:00
Zetok Zalbavar
c2eaa3cdb4
Some tweaks for tooltips in settings
2015-02-01 10:56:28 +00:00
Ansa89
81155da0e6
Italian translation: update
2015-02-01 11:28:27 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
d6b34aef78
Update for toxcore API break
2015-02-01 01:25:22 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
4d5b924d0d
Merge branch 'pr1077'
2015-02-01 00:57:08 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
c1f41cd7ec
Merge branch 'pr1070-rebase'
2015-02-01 00:52:59 +01:00
Sascha Brendel
f43f09e568
Updated German translation
...
Conflicts:
translations/de.ts
2015-02-01 00:51:11 +01:00
Christoffer Sterner
627768b83a
Added sudo to yum install
2015-02-01 00:29:19 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
efef2b2178
Merge branch 'pr1073'
2015-02-01 00:09:20 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
8ccd3bb3bf
Fix spurious quitting when dialog closed and in tray
2015-02-01 00:03:42 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
dc36bf379f
Merge branch 'pr1076'
2015-01-31 23:06:06 +01:00
Christoffer Sterner
0290aea47b
Fix keypad enter not sending message
...
Issue #1068
2015-01-31 22:54:52 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
c745bc4513
Merge branch 'pr1070'
2015-01-31 11:51:49 +01:00
Zetok Zalbavar
13bd334d78
Add tooltips in settings
...
some tooltips changed to be more helpful/reflect reality
2015-01-31 09:53:12 +00:00
Ansa89
58eb8d3ec1
Italian traslation: update
2015-01-31 09:54:57 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
7574569b3d
Fix some systray issues on windows
...
Fix qTox not hiding when clicking on systray icon due to losing focus when clicking on the system tray
Fix the icon not being properly hidden on exit
Thanks to @toweI for reporting those issues
2015-01-30 13:44:41 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
c32eb98e6c
CppCheck, some video perf improvements
2015-01-30 13:40:04 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
64bd3b7b47
Merge branch 'pr962'
...
dation.
2015-01-29 19:29:23 +01:00
kushagra
0e0e1fe83c
issue 960
2015-01-29 19:22:43 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
33b32bcc33
Allow coloring multi-level quotes
...
To make >>mahkoh happy
2015-01-29 18:10:59 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
5fd2828dfa
Merge branch 'newsystray'
...
Fixes #541
Fixes #659
Fixes #807
Fixes #579
2015-01-29 17:46:47 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
da4fbf9ffb
Show systray icon by default on linux too
2015-01-29 17:46:31 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
4cc9f0f824
Fix some SystemTrayIcon issues with Qt backend
2015-01-29 17:44:23 +01:00
Tux3/Mlkj
fe83dd9445
Implement SystemTrayIcon Unity backend
...
With some limitations and some awful hacks, since appindicators can not differentiate left click, right click and middle click. It's already a massive pain to just get a signal when the menu is shown, without actually knowing what opened it.
I love ubuntu.
2015-01-29 17:33:17 +01:00
Dubslow
56784d2a78
Fix #1064
2015-01-29 10:26:21 -06:00
Tux3/Mlkj
f8e069f053
Fix tr warning in CallConfirmWidget
2015-01-29 14:57:30 +01:00
Tux3/Mlkj
f75e32e1e3
Implement SystemTrayIcon with Qt backend and Unity stub
2015-01-29 14:56:53 +01:00
Dubslow
b6f79e7365
Merge branch 'pr1061'
2015-01-28 22:44:13 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
19ad3ac7f1
Change -P command line option to -p
...
Flags should be lowercase by default for consistency
2015-01-28 21:40:09 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
7b7ff9c474
Exit if nonnexistant profile passed to -P
2015-01-28 21:33:41 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
edef42ec69
Use YYYY-MM-DD date format in logs, fixes #1060
2015-01-28 13:43:32 +01:00
Сухарик
568e21f188
fix greentext, take 2
2015-01-28 11:48:16 +03:00
Dubslow
31ac5dbe46
Fix SPE
2015-01-27 18:45:15 -06:00
Dubslow
2dc5cea1d2
Merge branch 'encryption' into master
...
Conflicts:
src/autoupdate.cpp
src/core.cpp
src/core.h
src/misc/settings.cpp
src/widget/widget.cpp
2015-01-27 18:29:39 -06:00
Dubslow
0470b5a6af
Potential fix for history issues, both dubslow/qTox#5 and dubslow/qTox#6
2015-01-27 17:25:41 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
a62b1dc7ac
Merge branch 'pr1045'
2015-01-27 21:33:44 +01:00
Dubslow
60e819baee
Hacky fix to cancelling a switch to an encrypted profile closing
...
It's either this or some fairly major refactoring, which is preferable,
but I've got another even bigger refactoring in mind, and fixing this
will be rolled into that.
Closes dubslow/qTox#4
2015-01-27 14:16:28 -06:00
agilob
2f9f57d5a4
adding volButtonDisabled to rsc
2015-01-27 12:15:18 +00:00
