Commit graph

6702 commits

Author SHA1 Message Date
sledgehammer999
f91fa45860 Merge pull request #4561 from Chocobo1/appveyor
Add appveyor support
2016-03-16 16:28:35 -05:00
Chocobo1
c15ddbc53c Add appveyor support 2016-03-17 02:29:00 +08:00
sledgehammer999
45b68bd46c Sync translations from Transifex and run lupdate. 2016-03-15 00:40:44 +02:00
sledgehammer999
8c83fd5e24 Merge pull request #4916 from funkydude/master
Move some URLs overs to HTTPS
2016-03-14 12:15:46 -05:00
funkydude
268a5a95c8 Move some URLs overs to https 2016-03-14 17:01:51 +00:00
sledgehammer999
2efdddb9af Always delete partfile (libtorrent 1.1.x). 2016-03-14 14:53:14 +02:00
sledgehammer999
8c36f753f9 Merge pull request #4867 from evsh/peers-show-files
Show downloading files in peers list. Attempt #2
2016-03-13 19:14:48 -05:00
sledgehammer999
d39d40c064 Don't display Country option in PeerListWidget header menu when country resolution is disabled. 2016-03-14 01:17:59 +02:00
sledgehammer999
9a91ed501e Merge pull request #4767 from thalieht/toggle_peer_columns
Add toggle columns menu for peerlist. Closes #3301
2016-03-13 18:17:12 -05:00
sledgehammer999
502d633175 Merge pull request #4930 from Chocobo1/refactor
Minor refactor
2016-03-13 17:30:47 -05:00
sledgehammer999
d1ce5826e1 Merge pull request #4917 from Chocobo1/fix_comment_space
Fix additional space in comment label
2016-03-13 17:29:14 -05:00
sledgehammer999
1fb020fb3a Merge pull request #4939 from Chocobo1/option_tab_sel
Fix tab icons messed up.
2016-03-13 15:30:40 -05:00
Chocobo1
7ac7268b8f Fix tab icons messed up in Ubuntu 16. Closes #4929.
Fixup of 1c25603686.
The following settings default are different between DEs, so they must set explicitly:
movement, flow, isWarpping, resizeMode, viewMode
2016-03-11 14:13:33 +08:00
sledgehammer999
e21c346183 Merge pull request #4935 from evsh/cmake
cmake: fix library namaes for Qt5 version of QtSingleApplication
2016-03-10 14:30:41 -06:00
Eugene Shalygin
5fbac5da5b cmake: fix library namaes for Qt5 version of QtSingleApplication
At least on Gentoo they start with 'Qt5', not 'Qt'
2016-03-09 23:32:35 +01:00
Chocobo1
e7ff5eb6b1 Minor refactor 2016-03-09 14:08:44 +08:00
sledgehammer999
d41031ebf7 Merge pull request #4925 from evsh/cmake
cmake: copy qt version requirements from autotools
2016-03-07 15:52:15 -06:00
Eugene Shalygin
05e4d4fc0d cmake: copy qt version requirements from autotools
Set versions 4.8.0 and 5.2.0 as minimal required for Qt4 and Qt5.
2016-03-07 22:38:40 +01:00
sledgehammer999
8656c1897d Merge pull request #4922 from evsh/cmake
cmake: fix man installation
2016-03-07 14:17:02 -06:00
Eugene Shalygin
6800c1a6ad cmake: fix man installation
Fix copy-n-paste error: for non-GUI build we have to install
qbittorrent-nox.1, but not qbittorrent.1.
2016-03-07 15:15:38 +01:00
Chocobo1
dd2dcc4147 Fix additional space in comment label 2016-03-07 12:34:01 +08:00
thalieht
1fa6f3123b add toggle columns for peerlist 2016-03-06 23:59:36 +02:00
sledgehammer999
80ac326f28 Merge pull request #4911 from glassez/fixes
Fix save path bugs
2016-03-06 15:46:46 -06:00
Vladimir Golovnev (Glassez)
c047ef5b37 Fix save path bugs 2016-03-06 21:23:15 +03:00
sledgehammer999
b11ab06bb2 Merge pull request #4904 from UnDifferential/master
Support SSL certificate bundles. Closes #4896.
2016-03-06 10:49:14 -06:00
UnDifferential
f50a8d4f59 Support SSL certificate bundles. Issue #4896. 2016-03-05 14:10:28 -05:00
sledgehammer999
45617e086c Merge pull request #4908 from evsh/cmake
cmake: fix systemd unit install path
2016-03-05 13:05:30 -06:00
Eugene Shalygin
5996738030 cmake: fix systemd unit install path 2016-03-05 19:23:43 +01:00
sledgehammer999
46a355675e Fix commit 83e931766f (wrong conflict resolution). 2016-03-05 19:49:15 +02:00
sledgehammer999
89b334d71c Merge pull request #4451 from netjunki/master
add a remaining column to the torrent content model
2016-03-05 10:42:14 -06:00
sledgehammer999
8372c819e9 Merge pull request #4903 from evsh/cmake
fix cmake build
2016-03-05 08:51:34 -06:00
sledgehammer999
96c2947283 Merge pull request #4849 from Chocobo1/run_ext_slash
Save "Run external program" input as is. Closes #4830.
2016-03-05 08:51:14 -06:00
Chocobo1
83e931766f Add tip about adding quotation marks around parameter 2016-03-05 11:34:56 +08:00
Chocobo1
6835b99f10 Save "Run external program" input as is. Closes #4830. 2016-03-05 11:33:55 +08:00
Eugene Shalygin
45b1a75d56 fix cmake build 2016-03-05 00:36:17 +01:00
sledgehammer999
15ec515872 Merge pull request #4877 from evsh/cmake
add basic cmake support
2016-03-04 17:30:08 -06:00
sledgehammer999
0190ac9037 Merge pull request #4885 from Chocobo1/comment_scroll
Put comment_lbl in QScrollArea.
2016-03-04 17:28:42 -06:00
sledgehammer999
ee0306c4fd Merge pull request #4883 from evsh/fix-avg-speed-units
Fix typos in speed label text
2016-03-04 17:28:12 -06:00
sledgehammer999
56605cd0c3 Merge pull request #4865 from Chocobo1/os_name
Shorten crash report on windows
2016-03-04 17:27:48 -06:00
sledgehammer999
3ddb1b98b3 Merge pull request #4833 from dsemi/master
Do not try to parse request message when content-length is 0
2016-03-04 17:26:28 -06:00
sledgehammer999
8b559a8b51 Merge pull request #4824 from starius/mxe-compat
compatibility with MXE
2016-03-04 17:25:57 -06:00
sledgehammer999
1cfda610cc Merge pull request #4781 from DoumanAsh/python_align_search_style
[search engine] Align search engine url getting mechanism. Closes #4778
2016-03-04 17:25:05 -06:00
sledgehammer999
6ff929e567 Merge pull request #4784 from glassez/asm
Implement Advanced Saving Management subsystem
2016-03-04 17:22:06 -06:00
Vladimir Golovnev (Glassez)
dd34663224 Implement Advanced Saving Management subsystem
Closes #4696
2016-03-04 19:59:53 +03:00
Vladimir Golovnev (Glassez)
d05d5a85a5 Move Preferences backend code into SettingsStorage class
Closes #4764
2016-03-04 08:39:00 +03:00
Boris Nagaev
f4dc5c6809 configure: pass variable QMAKE_LRELEASE to qmake 2016-03-03 07:54:34 +03:00
Boris Nagaev
e4c8862cc5 winconf-mingw.pri: clean library names
* remove versions from libraries,
  * remove *.dll from libraries
    (actual name of library files can be "libfoo.a")
2016-03-03 07:52:57 +03:00
Boris Nagaev
39d8f09c38 winconf.pri: change example library path for build
Path with "<", ">" causes errors when building in MXE.
http://mxe.cc/

Removing or commenting out these hardcoded paths is not
desirable, as they serve as a guide (on what to edit) for
the newcomers that want to build on windows.

See https://github.com/qbittorrent/qBittorrent/pull/4824#issuecomment-186936960
2016-03-03 07:52:57 +03:00
Boris Nagaev
fa2a1ad6d3 winconf.pri: use mask "win32-g++*"
Mask "win32-g++" doesn't match MXE.
Mask "win32-g++*" match MXE.
See http://stackoverflow.com/a/14523545
See http://mxe.cc
2016-03-03 07:50:20 +03:00
Chocobo1
94ae44bb71 Put comment_lbl in QScrollArea. Closes #4881. 2016-03-02 12:05:56 +08:00