agilob
ad3326b95d
Merge remote-tracking branch 'briskycat/issue2558_desktop'
2016-01-07 20:16:45 +00:00
agilob
b8a0a7d404
Merge remote-tracking branch 'zetok/readme-portable'
2016-01-07 18:03:31 +00:00
agilob
fae0d33317
Merge remote-tracking branch 'zetok/rm_travis'
2016-01-07 18:02:56 +00:00
Zetok Zalbavar
a9795473dc
README.md: expose portable builds for windows
...
closes #2766
2016-01-07 13:36:29 +00:00
Nils Fenner
e952d1a654
Merge pull request #2767 from branch agilob:chat_window_icon
...
* Set status icon on separate chat window, closes #2210
2016-01-04 22:34:30 +01:00
Zetok Zalbavar
b25faf0426
Merge pull request #2770 from a68366:issue2484
...
Fixes #2484 - Error message inside the chat
Remove extra spaces
2016-01-04 12:23:25 +00:00
Andrey S
d69139bf4a
Remove extra spaces
2016-01-04 14:02:37 +03:00
Zetok Zalbavar
ee2d6d0db0
Remove useless travis
2016-01-03 16:56:32 +00:00
agilob
cb43a9b70e
Remove ctrl+q from tray menu
2016-01-02 22:01:41 +00:00
Andrew Novikov
371900b56f
Fix for the issue #2458
2016-01-02 21:59:38 +00:00
agilob
09d1fd3fdd
Merge remote-tracking branch 'antis81/fix_default_audio_device'
2016-01-02 17:27:27 +00:00
agilob
b8b27d6245
Merge remote-tracking branch 'ovalsevel/smiley-color'
2016-01-02 16:40:03 +00:00
Andrey S
8ce16ad399
Fixes #2484 - Error message inside the chat
2016-01-02 00:00:05 +03:00
tux3
defae04227
Merge branch 'pr2755'
2015-12-31 14:38:15 +01:00
tux3
f2ba03b45f
Fix some messages being saved with history disabled
2015-12-31 14:36:12 +01:00
Zetok Zalbavar
910264a7d6
Add CONTRIBUTING.md
...
It was taken from 76c16e0994/CONTRIBUTING.md
2015-12-31 13:18:57 +00:00
agilob
7f34290129
Merge remote-tracking branch 'antis81/chat/fix-mouse-crsr'
2015-12-30 21:40:19 +00:00
Nils Fenner
26768de94a
set mouse cursor to I-Beam shape, when hovering over text within chat
2015-12-30 14:45:55 +01:00
Nils Fenner
79ddbf7d02
open the first available audio in/out device as default, if specifier is empty
2015-12-28 12:06:22 +01:00
ovalseven8
f70b249ed8
Fix default smiley pack. Necessary because of the name changes.
2015-12-24 16:00:05 +01:00
Nils Fenner
552155bd1f
Merge PR #2719 from antis81:fix_audio_subscriptions
...
* fix dangling audio output device
* do not resubscribe sid in copy constructor
2015-12-23 23:29:20 +01:00
Zetok Zalbavar
dd1b0efd61
Merge pull request #2731 from sudden6:patch-1
...
sudden6 (1):
add sqlcipher as dependency for opensuse
2015-12-23 21:05:58 +00:00
sudden6
9a3df5094c
add sqlcipher as dependency for opensuse
2015-12-23 18:17:27 +01:00
Andrew Novikov
985def25ff
Implemented screen capturing support for Mac OS X
2015-12-23 15:31:28 +03:00
Andrew Novikov
bd8a2c84ef
Optimized working with strings
2015-12-23 11:03:56 +03:00
tux3
f61332bc56
Fix bad casts in updater code
2015-12-21 20:16:48 +01:00
Andrew Novikov
ce2e2efc76
Merge pull request #1 from tux3/master
...
Update from original
2015-12-21 21:12:41 +03:00
Rowen Stipe
d3e266b71b
Updated bootstrap-sox for sqlcipher
...
Updated the bootstrap file for use with sqlcipher.
2015-12-21 18:15:39 +01:00
tux3
73c4c07dbd
Merge branch 'pr2687'
...
Closes #2687
2015-12-21 13:35:20 +01:00
Jacob Henner
e9b34f5154
Fixes #2686 - Profiles will store avatars in distinct files
2015-12-21 13:30:46 +01:00
Jacob Henner
3f4c21216a
Fixes #2629 : avatars will be re-encrypted when the profile password changes
2015-12-21 13:30:46 +01:00
tux3
119fbe7468
Merge branch 'pr2715'
2015-12-21 12:41:05 +01:00
Johannes Löthberg
e5baa403e0
Add SVG support to filetransfer preview
...
Only requires Qt SVG which is already a dependency of qTox.
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2015-12-21 06:02:32 +01:00
tux3
7b7016781c
Merge branch 'pr2707'
2015-12-21 01:35:59 +01:00
tux3
19b6368f1e
Merge branch 'pr2714'
...
Rebased on master.
Merges #2714
2015-12-21 01:27:48 +01:00
Andrew Novikov
cc64db3f27
Implemented listing and setting video modes on Mac OS X
2015-12-21 01:27:38 +01:00
Andrew Novikov
9d43062639
Changed the type of VideoMode::FPS to float: this is necessary for Mac OS X which uses frame rates like 29.97
2015-12-21 01:27:01 +01:00
Andrew Novikov
1dac0d09c8
Rearranged link dependencies.
2015-12-21 01:27:01 +01:00
Andrew Novikov
cf6623cfc8
Implemented enumeration of video devices.
2015-12-21 01:26:18 +01:00
tux3
b01f47b1aa
Use pre Qt5.4 QTimer::singleShot
...
For compatibility with Debian Jessie
2015-12-21 01:14:23 +01:00
Nils Fenner
19201dda8a
Merge pull request #2713 from antis81:newav_audio_cleanup
2015-12-20 23:10:03 +01:00
ovalseven8
00fa6abc2f
The color of the eight smileys is black now.
...
All smileys are visible, now.
2015-12-20 15:51:39 +01:00
ovalseven8
015a3be2c0
Smiley changes:
...
- Removed 'Kappa'-smiley from 'Classic'-pack because it doesn't fit in this pack
- Removed 'raw.svg' from 'Classic'-pack because it actually wasn't used
- Fixed broken path in Basic/emoticons.xml
2015-12-20 15:46:13 +01:00
ovalseven8
26a3384f5a
Change order so that there are less problems with displaying unicode characters
2015-12-20 15:35:10 +01:00
ovalseven8
44b8568e83
Rename smiley packs
...
- Rename 'krepa098' -> 'Classic'
- Rename 'cylgom' -> 'Basic'
- Rename 'TwitterEmojiSimple' -> 'ASCII+Universe'
- Rename 'TwitterEmojiSVG' -> 'Universe'
2015-12-20 15:30:15 +01:00
Nils Fenner
e73fd27d8b
fix: don't subscribe to in/out device when initialization failed
2015-12-20 09:45:43 +01:00
Nils Fenner
0615c7c3c6
reimplement audio in/out subscription concept
2015-12-20 09:45:43 +01:00
Nils Fenner
27bfade9e1
unsubscribe invalid ToxCall from audio when copied
2015-12-20 09:45:43 +01:00
Nils Fenner
d8607324ce
cleanup AudioPrivate
...
* rename mAudioMeter -> audioMeter
* move class declaration below other classes
2015-12-20 09:45:43 +01:00
Nils Fenner
ace3662757
further improved audio metering
...
Give qTox time to do more important things -> do not measure with 100%.
2015-12-20 09:45:43 +01:00
