StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity
4,323 Commits 3 Branches 42 Tags 60 MiB
137bd242e1
Commit Graph

4323 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
minj
137bd242e1 fix Lithuanian translation 
a mix up caused by tux3#2985
 2016-03-01 21:19:06 +02:00
Zetok Zalbavar
1eb68542df
Merge pull request #2981 from VittGam:patch-1 
Fix toxURI parsing.
 2016-02-28 15:53:23 +00:00
Vittorio G (VittGam)
ffa0c2136e Fix toxURI parsing. 
It was always eating two characters more than needed.

A toxURI passed to handleToxURI always starts with "tox:", it's checked in the handleToxURI callers. So here we need to remove that prefix, that's long 4 characters and not 6.

The previous code was meant to handle tox:// and tox: cases, but the tox:// case is invalid and should not be handled (see #2118).

Fixes: d6a0910fc8 ("fix uri parsing and tox URI detection, closes #2118")
 2016-02-28 16:24:50 +01:00
Zetok Zalbavar
e5e4d561c9
fix(osx-script): remove unnecessary usage of sudo 
Neither toxcore or filter_audio require `sudo` to be installed under
`libs/`.
 2016-02-28 03:11:23 +00:00
Zetok Zalbavar
6c0fb9a0f5
Merge picked commits from pull request #2971 from linux-modder:patch-13 
Corey Sheldon (2):
      Updated sqlcipher compile instructions for Fedora
      Updated sqlcipher compile instructions for Fedora (Take #2)

Also, fixed some formatting.
 2016-02-28 03:06:23 +00:00
Zetok Zalbavar
f060c10023
Merge pull request #2967 from Twyz:Twyz-patch-1 
Updated Italian translation
 2016-02-28 02:56:18 +00:00
Nils Fenner
22b884ad7f
merge pull request #2953 from talkless:preview_click_handling 2016-02-26 16:30:13 +01:00
Corey Sheldon
b98e8c745a Updated sqlcipher compile instructions for Fedora (Take #2) 
- Cleaned up the code blocks
- Removed unneeded whitespace throughout previous commit
 2016-02-25 19:38:25 -05:00
Corey Sheldon
719e137582 Updated sqlcipher compile instructions for Fedora 2016-02-22 05:48:55 -05:00
Twyz™
839582cbed Updated Italian translation 2016-02-21 12:53:26 +01:00
Zetok Zalbavar
ef5b9b8c1e
Merge pull request #2962 from RowenStipe:patch_OSX-Script 
Condensed a little bit and fixed function name
 2016-02-20 11:24:56 +00:00
RowenStipe
ef608e1361 Condensed a little bit and fixed function name 2016-02-18 14:28:46 -05:00
Kaur Männamaa
dba6ebe262
Added Estonian translation 2016-02-17 13:34:18 +00:00
Vincas Dargis
857dfbcd4c Open downloaded image with mouse click on thumbnail 2016-02-14 17:20:11 +02:00
Zetok Zalbavar
d614f74947
Merge pull request #2941 from SeventhSonOfASeventhSon:patch-1 
Fixed grammatical errors
 2016-02-08 17:42:47 +00:00
SeventhSonOfASeventhSon
a2d130f804 Fixed grammatical errors 2016-02-08 16:24:52 +00:00
Zetok Zalbavar
eb6082d37e
Merge pull request #2934 from minj:l10n-lt 
update Lithuanian translation
 2016-02-07 19:38:09 +00:00
minj
0ee5984812 update Lithuanian translation 2016-02-07 16:45:07 +02:00
Zetok Zalbavar
49b8a48888
Merge pull request #2923 from andrii-zymohliad:master 
Almost full translation into Ukrainian
 2016-02-04 14:46:18 +00:00
Andrii Zymohliad
26e9208a05 Almost full translation into Ukrainian 2016-02-04 15:58:31 +02:00
tux3
7206b9c251
Merge branch 'pr2914' 2016-01-31 23:37:14 +01:00
sudden6
d22b7cb140 make qt version in about window copy paste able 2016-01-31 23:17:43 +01:00
tux3
1f03ed11ad
Merge branch 'pr2908' 2016-01-31 19:34:30 +01:00
RowenStipe
6e1b7b3464 Fix travis trying to pull qTox 2016-01-31 12:16:19 -05:00
tux3
b1731baadc
Merge branch 'pr2905' 2016-01-31 17:46:30 +01:00
RowenStipe
0e9347cff1 Revert change 2016-01-31 11:39:58 -05:00
RowenStipe
62e0679032 Quick changes for clarity 2016-01-31 11:32:24 -05:00
RowenStipe
fa5cd325ed Updated Compiling instructions 2016-01-31 11:27:00 -05:00
RowenStipe
6d9551b1fd Updated script to work on user machines and not just travis. 2016-01-31 11:25:38 -05:00
Zetok Zalbavar
0dae1a6af0
docs: put in INSTALL.md info about installing qTox from Arch repo 
thanks to @DX37 for the info in #2900
 2016-01-31 12:43:53 +00:00
tux3
7a846b85e0
Merge branch 'pr2894' 2016-01-30 18:21:20 +01:00
sudden6
25359d55b5 Fix proxy set only after request sent. 2016-01-30 00:15:14 +01:00
sudden6
53330daab7 toxme now supports proxies 2016-01-29 23:30:07 +01:00
Zetok Zalbavar
3307855130
travis build script: fix copyright date 2016-01-27 19:06:32 +00:00
Zetok Zalbavar
3723f4b465
osx build script: fix building on travis 
copy libs/headers required by qTox into `libs/`
 2016-01-27 03:08:58 +00:00
Zetok Zalbavar
0abeaa4b62
osx build script: install vpx and opus 2016-01-26 18:36:37 +00:00
Zetok Zalbavar
529349d8d3
osx build script: install toxcore into libs/ 2016-01-26 17:09:44 +00:00
RowenStipe
3a452a700f
General clean up 2016-01-26 16:22:06 +00:00
Zetok Zalbavar
5a02091441
Fix osx travis - use bootstrap-osx.sh 2016-01-26 16:21:10 +00:00
RowenStipe
ab769d1175
Updated libsodium check 2016-01-26 13:50:36 +00:00
Zetok Zalbavar
75607bcecc
Add travis (again) 
Beside making it work again, there are some improvements:

Linux side:

* use minimal supported Qt version, currently it's 5.3
* use minimal supported GCC version, currently 4.8
* use newer ffmpeg version to compile against - 2.8.5
* compile qTox 2 times, first run without support for optional dependencies
* use ubuntu 14.04 for building (less deps needs to be compiled/added from PPAs)

OSX:
* add osx to build targets
 2016-01-26 13:33:39 +00:00
Zetok Zalbavar
a3802bd586
Merge pull request #2861 from RowenStipe:Travis 
fixed small issue with functions
 2016-01-26 12:37:50 +00:00
RowenStipe
cc4dd1ab0f fixed small issue with functions 2016-01-26 07:28:07 -05:00
Zetok Zalbavar
cd3cce7f6e
Merge pull request #2860 from RowenStipe:Travis 
RowenStipe (2):
      Added script to set up OS X clients to build qTox
      Added copyright header
 2016-01-26 12:06:04 +00:00
RowenStipe
f6d7033b51 Added copyright header 2016-01-26 06:55:28 -05:00
RowenStipe
36ecde07da Added script to set up OS X clients to build qTox 2016-01-26 06:52:15 -05:00
tux3
c82e41ff6f
Properly ifdef filteraudio usage 2016-01-25 16:35:45 +01:00
tux3
9251f1f4ca
Fix #2854: Missing noexcept in Audio 2016-01-25 16:27:18 +01:00
Zetok Zalbavar
3343645b61
Merge pull request #2835 from agilob:login_form_style 
agilob (4):
      Fix label text colour in login profile
      Loginpage: Apply black colour to qcheckbox as well
      Loginpage: Apply black colour to progressbar
      Make disabled checkbox gray
 2016-01-24 14:42:35 +00:00
Zetok Zalbavar
88198a244d
Merge pull request #2851 from mahmodemos:add_ar_lang 
Adding arabic language file to the languages list
 2016-01-24 14:30:46 +00:00