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

4162 Commits

Author SHA1 Message Date
Zetok Zalbavar
94e467e561
INSTALL.md: correct link and mention sqlcipher for fedora dependencies 2016-01-15 16:49:54 +00:00
Zetok Zalbavar
68cc02a151
Merge pull request #2750 from linux-modder:patch-11
Corey Sheldon (4):
      Some small updates.
      Cleaned up sqlcipher instructions, added interlink
      Cleaning up some more....
      Cleaning up linkage again.
2016-01-15 16:44:15 +00:00
tux3
6b4f081fdf
dos2unix the updater 2016-01-15 17:40:12 +01:00
tux3
3645e39b89
Updater compatibility with Windows XP
With some LoadLibrary/GetProcAddress shenanigans
2016-01-15 17:38:40 +01:00
tux3
05162a63b9
Merge branch 'pr2793' 2016-01-14 14:11:52 +01:00
tux3
aeb26d1af7
Merge branch 'pr2782' 2016-01-14 14:03:03 +01:00
Zetok Zalbavar
ac077e0d44
Merge pull request #2790 from minj:l10n-lt
update Lithuanian translation
2016-01-11 19:06:39 +00:00
Zetok Zalbavar
1921a9887e
Remove empty src/main.h (closes #2792)
Looks like it was accidentally introduced in
9905042434
2016-01-11 19:00:43 +00:00
Taha
13b2ec54aa Removed static modifier 2016-01-09 19:55:03 -05:00
Nils Fenner
26019c20e2
Merge pull request #2725 from 'r-ku:ipc-cleanup' 2016-01-09 23:37:07 +01:00
agilob
0836c78551
Merge remote-tracking branch 'antis81/audio/auto-close-devices' 2016-01-09 19:12:02 +00:00
Nils Fenner
82dfe0f704
fix audio singleton implementation 2016-01-09 13:12:39 +01:00
Taha
03cb9d8a03 qTox uses default smiley pack if there's an invalid one in the qtox.ini file (fixes #2757) 2016-01-08 21:02:48 -05:00
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
Corey Sheldon
18b966e685 Cleaning up linkage again. 2016-01-01 15:49:12 -05:00
Corey Sheldon
f70e720d3f Cleaning up some more.... 2016-01-01 15:40:45 -05:00
Corey Sheldon
ca229baea1 Cleaned up sqlcipher instructions, added interlink 2016-01-01 15:16:55 -05: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
and adjusted for qTox needs.

Since qBittorrent is licensed under GPLv2+, file in qTox source is covered by
GPLv3+.
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
Corey Sheldon
b998dba373 Some small updates.
+ updated libsodium tag to current tag of 1.0.7
+ added sqlcipher  compile  for Fedora users and  any others where sqlcipher is  not a  distro available package ( linux distros)
2015-12-30 07:28:57 -05:00
minj
5ecc2d99a0 update Lithuanian translation 2015-12-29 20:44:51 +02: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
rku
056a77d4dd Cleaned up all the ipc/startup code:
* Removed duplicate code of ipc event sending
 * Removed duplicate code of profile loading
 * Fixed bug where activating existing instance still started new instance of qtox asking to select a profile
 * IPC messages are now profile-aware and are sent to instance that runs specified profile in -p flag or to ipc owner if -p is not specified.

If -p flag is specified ipc events will be send to instance which runs specified profile. If instance using that profile does not run - new qTox instance will be started. This works with password-protected profiles too - new instance will handle "uri" or "save" events after accepting user password.
2015-12-22 14:59:55 +02: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