mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-12-16 05:01:37 +03:00
Code Issues Projects Releases Packages Wiki Activity
7647 commits 16 branches 243 tags 246 MiB
Commit graph

6787 commits

Author SHA1 Message Date
Eugene Shalygin
f99ba03177 cmake: fix typo in the manifest file name 2017-04-19 17:06:44 +02:00
Eugene Shalygin
b06080e2e7 Replace platform-specific code in Private::DefaultProfile with QStandardPaths. 
This should also fix Profile::location(SpecialFolder::Config) on
Windows.
 2017-04-19 12:51:07 +02:00
sledgehammer999
ae0a9d74c4 Merge pull request #6487 from Chocobo1/ui 
GUI polish
 2017-04-18 04:01:13 +03:00
Eugene Shalygin
4e1b7c3b87 Remove generated include from headers 
Not only fixes compilation with CMake 3.8 (without messing with include
paths) but makes sources cleaner.
 2017-04-17 16:31:19 +02:00
Eugene Shalygin
34798399da cmake: fixes for cmake 3.8 
AUTOUIC seems to became stricter.
 2017-04-17 16:27:24 +02:00
sledgehammer999
018574e546 Merge pull request #6475 from OpenGG/master 
[WebUI-API] Add "skip_checking" and "paused" to "/command/download" and "/command/upload"
 2017-04-17 17:12:24 +03:00
sledgehammer999
48b0cf8a48 Merge pull request #6621 from Chocobo1/webui 
Webui: refactor
 2017-04-17 17:08:25 +03:00
sledgehammer999
ae0ec716cb
Fix inverted check when applying the IP filter. 2017-04-17 17:07:12 +03:00
sledgehammer999
c27108c97a Merge pull request #6630 from evsh/fix-6454 
Start up torrents after UI was created. Fixes #6454.
 2017-04-17 16:44:03 +03:00
sledgehammer999
56436d3f97 Merge pull request #6626 from evsh/fix-desktop-filename 
Rename .desktop file to match executable name. Fixes #6625.
 2017-04-17 16:03:06 +03:00
Vladimir Golovnev (Glassez)
22178f9997 Fix strip torrent root folder 2017-04-15 17:33:20 +03:00
Vladimir Golovnev (Glassez)
6d7d566cdf Fix TorrentHandle rootPath() and contentPath() methods 2017-04-15 10:11:53 +03:00
Vladimir Golovnev (Glassez)
d413bc65ef Improve strip torrent root folder 
Fix issue when you rename the "root item" in the "Add New Torrent" dialog
and uncheck "Create subfolder", it will create the subfolder with the
renamed name.
Fix PropertiesWidget first folder is expanded after app restart.
Strip root folder if torrent was added via magnet link.
Fix crash when you get name of torrent without metadata.
 2017-04-15 10:11:53 +03:00
sledgehammer999
4b2d8a7941 Setting for creating subfolder on multifile torrents. Closes #588. 2017-04-15 10:11:53 +03:00
Eugene Shalygin
21a72c651f Start up torrents after UI was created. Fixes #6454. 
Commit dd0537d changed torrents startup code adding alerts processing
into it. Therefore alerts were processed before UI code subscribed to
signals and therefore part of alerts was not reflected in the UI.

Thus here we do not start torrents in Session constructor, but do that
from Application::exec() after UI was constructed and is ready to process
signals.
 2017-04-14 00:58:43 +02:00
Eugene Shalygin
ecd67b9d75 Rename .desktop and appdata files to match executable name. Fixes #6625. 2017-04-12 17:26:12 +02:00
Eugene Shalygin
a8d95dd8bd Save relative paths in fastresume files 
Conditionally change absolute paths to relative in the fastresume data files.
The condition is specified by user via a command line parameter and
paths are relative to the profile dir.

On Windows the convertion to relative path is performed if the path and
the profile are on the same drive only.
 2017-04-12 00:51:37 +02:00
Eugene Shalygin
0710a59bf5 Refactor parameters parsing 
Introduce classes that encapsulate parameter names and parsing schemes
from command line and from environment variables.
 2017-04-12 00:50:33 +02:00
Eugene Shalygin
0bf7fa15c1 Replace wrappers in base/utils/fs.h with Profile::SpecialFolders::location() 2017-04-12 00:50:33 +02:00
Eugene Shalygin
44b6cb28f6 Add environment variables usage description to the help text 2017-04-12 00:50:33 +02:00
Eugene Shalygin
d5414631c3 Initialise QBtCommandLineParameters members from environment 
This allows to pass options via environment variables. The variable name
is constructed from parameter name by transforming the name to upper
case and prefixing "QBT_".
 2017-04-12 00:50:33 +02:00
Eugene Shalygin
0f746ffd5a Add support for different configurations. Partially closes #465 
It may be useful to have different configurations either for portable
versions or for debugging purposes. To implement this we add two
options, avaliable via command line switches
1. An option to change configuration name ("--configuration"). The name
supplied via this option is appended to
QCoreApplication::applicationName() to form "qBittorrent_<conf_name>"
name for the configuration files.
2. An option to provide a path do directory where all the settings are
stored (kind of profile directory). There is a shortcut "--portable"
which means "use directory 'profile' near the executable location".

In order to implement that we have to perform initialisation of the
profile directories before the SettingStorage and Preferences singletones
are initialised. Thus, options parsing shall be performed without defaults
read from preferences.
 2017-04-12 00:50:28 +02:00
Chocobo1
d1ee54f6ea Refactor: move methods under the same #if section. 2017-04-11 23:16:16 +08:00
Chocobo1
7f346b49a7 Refactor: move the validation of certificates & key functions under Server class 
Rename method
Add log messages
 2017-04-10 21:18:59 +08:00
Chocobo1
05d8c46bb0 Rename class variables 2017-04-10 21:07:08 +08:00
Chocobo1
35ab86d32f Refactor: group port forwarding code together 
Unify log message
 2017-04-10 20:14:19 +08:00
sledgehammer999
e40444d1ad
Bump API_VERSION and API_VERSION_MIN to 13. 2017-04-06 02:03:44 +03:00
sledgehammer999
50f0ba4f7a
Sync translations of .desktop file from Transifex. 2017-04-06 02:02:01 +03:00
sledgehammer999
be7facdfaf
Sync translations from Transifex and run lupdate. 2017-04-06 01:50:52 +03:00
sledgehammer999
1111ca9d90 Merge pull request #6548 from Chocobo1/cookie 
Fixes for AbstractWebApplication
 2017-04-05 18:37:51 +03:00
Chocobo1
812bd4c83a Uncrustify 2017-04-05 17:39:44 +08:00
Chocobo1
a86f189f53 Relax comparsion for floating point 2017-04-05 17:36:47 +08:00
Chocobo1
59556dfc6a Cleanup & refactor 2017-04-05 17:36:47 +08:00
Chocobo1
86e82c71e5 Setup parent pointer 
Rely on Qt to do the delete, since the parent ownership is setup
correctly.
 2017-04-05 17:36:36 +08:00
sledgehammer999
f3d6ae3433 Merge pull request #6590 from FranciscoPombal/webui_remaining 
fixed "remaining" column in WebUI
 2017-04-04 01:35:59 +03:00
sledgehammer999
40948ab652 Merge pull request #6519 from evsh/cmake 
cmake: fix build and add build configurations for Travis
 2017-04-04 01:24:59 +03:00
sledgehammer999
b2528f7573 Merge pull request #6581 from Chocobo1/set_location 
Fix cancel "Set location" causes files move to installation dir
 2017-04-04 01:15:27 +03:00
FranciscoPombal
829ad2e1e6 fixed "remaining" column in WebUI 
the key had the wrong name. In the js code, the expected key is "amount_left" and not "remaining".
 2017-04-03 16:20:01 +01:00
opengg
b271fa9f00 [WebUI] Add skip_checking and paused to /command/download and /command/upload 2017-03-31 14:05:19 +08:00
Chocobo1
5de505acfe Cleanup headers 
Remove unused headers
Sort header includes
 2017-03-30 16:45:11 +08:00
Chocobo1
faaafce35b Fix cancel "Set location" causes files move to installation dir. 
Closes #6568.
 2017-03-30 16:45:10 +08:00
Chocobo1
0d3c670728 Add log message 2017-03-30 16:45:10 +08:00
Chocobo1
272d53fdf8 Set cookie SID value to empty on logout 
Set cookie SID expiration date to 1 day in the past on logout
 2017-03-22 17:22:10 +08:00
Chocobo1
4e48408eaa Fire up the timer to clean inactive sessions 2017-03-22 17:21:10 +08:00
Chocobo1
e26b30a5f4 Refactor: initialize class variable directly 2017-03-22 17:20:28 +08:00
Chocobo1
e4d6fe2d02 Refactor: reorder headers 2017-03-22 17:20:27 +08:00
Chocobo1
e9bd75f4e1 Set HttpOnly attribute to SID cookie 2017-03-21 15:24:41 +08:00
Eugene Shalygin
b2ff058bc0 cmake: fix OSX bundle creation 2017-03-20 19:47:21 +01:00
Eugene Shalygin
5c0bf86405 cmake: remove qt4 leftover 2017-03-20 19:07:52 +01:00
epicgirl1998
f904cfa32d Remove extra space 
fixes https://github.com/qbittorrent/qBittorrent/issues/6523
 2017-03-17 03:43:49 +02:00
opengg
db3158c410 [WebUI] bugfix: RequestParser::splitMultipartData drop extra trailing newline. 2017-03-11 01:26:22 +08:00
sledgehammer999
9eb01fbe4d Merge pull request #6489 from evsh/fix-fileguard 
Fix TorrentFileGuard::setAutoRemove() recursion problem. Closes #6488.
 2017-03-08 12:18:58 +02:00
Eugene Shalygin
3091e03a95 Fix CMake build 2017-03-08 09:12:49 +01:00
Eugene Shalygin
3752d112fb Fix TorrentFileGuard::setAutoRemove() recursion problem. Closes #6488. 
The problem was created during Qt 4 drop, when FileGuard was promoted
from a member to a base class. The function was blindly changed.
 2017-03-08 09:05:58 +01:00
Chocobo1
a16c557137 Always draw background 2017-03-08 14:36:42 +08:00
Chocobo1
2b2b3a4fe7 Fix downloaded/uploaded columns were not highlighted properly when selected. 
Refactor
 2017-03-08 14:36:09 +08:00
sledgehammer999
bc910798da
Indicate bitness in stackstrace and about dialog. Closes #6172. 2017-03-08 01:01:17 +02:00
sledgehammer999
a7dcf20ed1
Fix state of IP filter widgets. 2017-03-08 00:30:54 +02:00
sledgehammer999
729fbb2e50
Change named of getter function. 2017-03-08 00:16:25 +02:00
sledgehammer999
aa51907387
Merge pull request #6369 from magao/issue6367 
Use Perl-compatible regexes for RSS rules. Closes #6367.
 2017-03-08 00:04:17 +02:00
sledgehammer999
be60b3e046
Change the user-agent format in the session.cpp too. 2017-03-07 23:41:29 +02:00
sledgehammer999
147f4d76e2 Merge pull request #6445 from Chocobo1/fix 
Follow http user-agent format
 2017-03-07 23:38:14 +02:00
sledgehammer999
7a6da3d3ce
Merge pull request #6479 from Chocobo1/qt4 
Remove remainings of Qt4
 2017-03-07 23:28:56 +02:00
sledgehammer999
b90db12ba0
Use a QTreeView and a sort proxy in the manually banned IP list to have a consistent sort order with QStringList::sor(). 2017-03-07 23:16:51 +02:00
sledgehammer999
431658bee6
Fix race condition where there was a chance to allow all ips between reparsings of the ip filter. 2017-03-07 23:16:50 +02:00
sledgehammer999
14513cd81f
Allow edit of manually banned IPs regardless if an IP filter has been set. 2017-03-07 23:16:43 +02:00
sledgehammer999
5084c01c2b Merge pull request #5877 from dzmat/to_pull_request 
locally banned IP list managment (Closes #1837 )
 2017-03-07 23:14:20 +02:00
sledgehammer999
140187649d Merge pull request #6473 from FranciscoPombal/stats_webui 
Implement statistics window in web UI
 2017-03-07 22:51:57 +02:00
sledgehammer999
f3cbb7f9da Merge pull request #6384 from glassez/safe-macros 
Remove exception suppressing from torrenthandle.cpp
 2017-03-07 22:50:06 +02:00
sledgehammer999
b69b6d1f55
Revert "Set default locale". Closes #6436 and #6459. 
This reverts commit 75ef6356d3.
 2017-03-07 15:35:42 +02:00
Vladimir Golovnev (Glassez)
79e8f69fb6 Remove exception-suppress macros 
Remove SAFE_* macros from TorrentHandle class.
These macros using seems to be unneeded.
 2017-03-07 15:04:57 +03:00
Chocobo1
fa2128cbae Replace Utils::String::fromStdString() by QString::fromStdString() 2017-03-07 19:42:44 +08:00
sledgehammer999
9839ef7292
Add keywords to the .desktop file. 2017-03-06 20:58:02 +02:00
Chocobo1
87384ca2a2 Replace Utils::String::toHtmlEscaped() by QString::.toHtmlEscaped() 2017-03-07 00:03:53 +08:00
Chocobo1
ffdcfe9686 Replace Utils::String::toStdString() by QString::toStdString() 2017-03-06 23:58:38 +08:00
Chocobo1
7539bee5c5 Remove remaining QBT_USES_QT5 defines. 
Fixup of e64bb1de8c.
 2017-03-06 23:47:07 +08:00
dzmat
59de1af31b implemented UI for managment of locally banned IP list (Closes #1837 ) 2017-03-06 19:40:34 +07:00
Chocobo1
2091dfaa69 Follow http user-agent format 
Add version variable without the starting "v"
 2017-03-06 14:42:32 +08:00
Chocobo1
cb1646be32 Prepend QBT_ for preprocessor variables 2017-03-06 13:41:58 +08:00
FranciscoPombal
1ce71fc63e Implement statistics window in web UI 2017-03-06 03:05:18 +00:00
sledgehammer999
fc49856857 Merge pull request #6391 from Chocobo1/cert 
Allow QSsl::Ec as private key format
 2017-03-06 01:22:09 +02:00
sledgehammer999
fa1149e1f2
Remove remnant of qt4 version checking. 2017-03-06 00:53:25 +02:00
Eugene Shalygin
008d7dbedc Raise minimal Qt version to 5.5.1 2017-03-05 22:24:59 +01:00
Eugene Shalygin
e64bb1de8c Drop Qt 4 support 2017-03-05 22:24:59 +01:00
sledgehammer999
60998a68eb Merge pull request #6417 from Chocobo1/manifest 
Embed manifest when compiling with MSVC
 2017-03-05 19:40:35 +02:00
sledgehammer999
922fec44d2 Merge pull request #6447 from buinsky/master 
WebUI: Improve performance of updating 'progress' column
 2017-03-05 14:46:30 +02:00
sledgehammer999
22989a436e Merge pull request #6461 from Chocobo1/rand_fix 
Workaround thread_local on osx
 2017-03-05 14:43:29 +02:00
Chocobo1
cae2f3059c Workaround thread_local not supported on OSX 
Drop back to xcode7.3 on TravisCI
 2017-03-04 20:37:48 +08:00
buinsky
b6c6b70915 Improve performance of updating 'progress' column 2017-03-04 12:19:36 +03:00
Chocobo1
3b5e7eb0ea Fix compile error: ‘escape’ is not a member of ‘Qt’ 2017-03-04 16:22:00 +08:00
Chocobo1
ea9d65f377 Fix incomplete type compile error with Qt4 2017-03-04 16:20:36 +08:00
Chocobo1
38063c388e Capitalize title strings 
Remove DISCARDABLE keyword which is ignored on 32-bit windows
 2017-03-04 13:17:55 +08:00
Chocobo1
7da29f7654 Embed manifest when compiling with MSVC 
Update manifest
 2017-03-04 13:09:32 +08:00
sledgehammer999
5c730f984d
Bump API_VERSION to 12. 2017-03-03 22:31:58 +02:00
Chocobo1
0fb3b18a8f
Utilize escapeHtml 2017-03-03 21:28:32 +02:00
Chocobo1
6ca3e4f094
Add Utils::String::toHtmlEscaped 2017-03-03 21:28:30 +02:00
Chocobo1
eba45a0b26
Cleanup 2017-03-03 21:28:29 +02:00
Chocobo1
7756dd80f3
[WebUI]: add X-XSS-Protection, X-Content-Type-Options, CSP header 2017-03-03 21:28:28 +02:00
ngosang
f5ad04766f
[WebUI] Avoid clickjacking attacks 2017-03-03 21:28:27 +02:00
Chocobo1
f9c39e3dac
[WebUI]: exclude insecure ciphers 2017-03-03 21:28:26 +02:00
Chocobo1
84bc011df5
Code formatting 
Remove extra private keyword
 2017-03-03 21:28:25 +02:00
sledgehammer999
31b69ae6f6
Update copyright year. 2017-03-03 21:26:38 +02:00
sledgehammer999
82edc5c495
Sync translations from Transifex and run lupdate. 2017-03-03 21:13:31 +02:00
ngosang
f0fe8808bd [Search engine] Update Extratorrent plugin 2017-03-02 21:21:33 +01:00
sledgehammer999
b5f81a34cb
Use new create_torrent constructor were available. 2017-02-22 19:25:50 +02:00
sledgehammer999
ad4b691fa5 Merge pull request #6413 from evsh/no-proxy-in-webui-server 
Disable proxy in WebUI HTTP server. Closes #6349.
 2017-02-21 13:15:22 +02:00
Eugene Shalygin
be8eab4e54 Disable proxy in WebUI HTTP server. Closes #6349. 
Due to a bug in Qt 5.8 (QTBUG-58706) QTcpServer tries to use HTTP proxy
when it is set as default app proxy (for instance via "http_proxy"
environment variable) and this breaks the server. So we disable any proxy
in it.
 2017-02-21 00:07:09 +01:00
sledgehammer999
9e56f3d318 Merge pull request #6385 from thalieht/Trackerlist 
Trackerlist: Seperate seeds from peers for DHT, PeX, LSD
 2017-02-20 01:53:54 +02:00
sledgehammer999
4adcd03ec7 Merge pull request #6366 from Chocobo1/rand 
Replace rand()
 2017-02-20 01:49:27 +02:00
Chocobo1
759bf4d73d Allow to load/use ECDSA certificate in webUI. 
Limit max read size
Improve messages in dialogs
Refactor
 2017-02-17 12:23:51 +08:00
Chocobo1
511796f74e Replace rand() by a true uniform distribution generator 2017-02-16 12:21:26 +08:00
Chocobo1
c7d10dc091 Turn off port forwarding of WebUI by default for GUI users 2017-02-16 12:21:26 +08:00
thalieht
4f1c428d8f Seperate seeds from peers for DHT, PeX and LSD 2017-02-15 21:24:47 +02:00
murlakatamenka
78438d7044 Update mainwindow.h (remove duplicate declaration) 2017-02-11 21:36:52 +03:00
Tim Delaney
a844ccb06a Cache rule regular expressions for performance 
--HG--
branch : magao-dev
 2017-02-11 18:43:50 +11:00
Tim Delaney
f9abd254f4 Use Perl-compatible regexes for RSS rules. Closes #6367. 
--HG--
branch : magao-dev
 2017-02-11 16:33:18 +11:00
sledgehammer999
d045f64ebb Merge pull request #6288 from Falcosc/fix_add_torrent_queue_overflow 
fix queue overload for add torrent at session start
 2017-02-08 22:46:58 +02:00
falco
ee239ddd1e fix queue overload for add torrent at session start 2017-02-08 15:13:21 +00:00
sledgehammer999
73f762250c Merge pull request #6358 from Chocobo1/coverity 
Fix issues on coverity
 2017-02-08 15:34:45 +02:00
Chocobo1
4ad541d066 Fix coverity issues 
torrentcontentmodel: Use a variable to store filesCount
optionsdlg: add fallthrough comment to suppress warning
speedPlotview: initialize member
misc: fix wrong type used, add spaces
 2017-02-08 13:49:47 +08:00
Chocobo1
cab10aa7b4 Use QString::toStdString() 
Qt5 utilized the desired toUtf8() instead of toAscii().
 2017-02-08 13:21:36 +08:00
Tim Delaney
c0339d4f6a Fix regex RSS matching. Closes #6337. 
--HG--
branch : magao-dev
 2017-02-05 08:53:33 +11:00
Tim Delaney
f96eb587ff Bugfix RSS feed list and rules editor. Closes #3782, #6281. 
--HG--
branch : magao-dev
 2017-01-22 15:36:27 +11:00
Tim Delaney
e4d9e9f63f Follow project coding style. Issue #2192. 
--HG--
branch : magao-dev
 2017-01-29 09:24:41 +11:00
sledgehammer999
f6a941defc Merge pull request #6294 from thalieht/hotkeys 
Add hotkeys for some things. Closes #2090
 2017-02-06 22:41:30 +02:00
sledgehammer999
01ddf23745
Remove unnecessary semicolon. 2017-02-06 18:52:04 +02:00
sledgehammer999
83009adbc0
Use same casting method and fix code style. 2017-02-06 18:52:03 +02:00
sledgehammer999
c8f955e302
Fix previous commit. 2017-02-06 18:51:56 +02:00
thalieht
0240c87095 TransferListWidget: Some coding style 2017-02-06 17:52:40 +02:00
thalieht
5675021895 enable RSS, Search and Execution Log widgets before switching to them via hotkeys 2017-02-06 17:52:40 +02:00
sledgehammer999
12b73747f5
Merge pull request #3058 from VladimirSinenko/master 
Fixed sort order for datetime columns with empty values (closes #2988)
 2017-02-06 17:49:26 +02:00
sledgehammer999
179b686e42 Merge pull request #6176 from magao/issue873 
Improve UI responsiveness during RSS downloading. Closes #873, #1089, #1235, #5423
 2017-02-06 16:17:08 +02:00
sledgehammer999
2a7f4217df Merge pull request #6321 from magao/rss_icon_themed 
Rss icon themed
 2017-02-06 10:08:33 +02:00
sledgehammer999
d880372b49
Fix unused variable warning by gcc. 2017-02-06 01:20:31 +02:00
sledgehammer999
fa8c69a5e1 Merge pull request #6315 from glassez/cat-tree-state 
Fix category filter widget doesn't save on/off state
 2017-02-06 00:13:59 +02:00
sledgehammer999
25c7c297e8 Merge pull request #6317 from dzmat/public_to_private 
reduce methods accessibility from public to private
 2017-02-06 00:11:38 +02:00
sledgehammer999
bcd6baa793 Merge pull request #6340 from Chocobo1/contentSort 
Use case-insensitive comparsion for torrent content window
 2017-02-05 23:12:55 +02:00
sledgehammer999
5046c36458
Immediately update torrent_status after manipulating super seeding mode. Partially fixes #6072. 2017-02-05 22:02:33 +02:00
Chocobo1
976504498a Use case-insensitive comparsion for torrent content window. 
Closes #6327
 2017-02-03 23:40:22 +08:00
dzmat
b167b4174e reduce methods accessibility from public to private 2017-01-29 15:17:55 +07:00
Tim Delaney
0fb8810c52 Resize RSS icon to fit theme. 
--HG--
branch : magao-dev
 2017-01-29 13:56:01 +11:00
thalieht
2bb2d3fc89 change all existing shortcuts to use Qt::Keys 2017-01-28 19:43:16 +02:00
Tim Delaney
5d185f1fcd Fix compilation error on Qt<5.4. Closes #6170. 
--HG--
branch : magao-dev
 2017-01-27 14:24:51 +11:00
sledgehammer999
3b3de81cb7 Merge pull request #6181 from magao/issue6170 
RSS episode filter improvements. Closes #800, #2749, #3876, #6170.
 2017-01-26 01:02:05 +02:00
sledgehammer999
769fe17a21 Merge pull request #6179 from magao/issue6165 
RSS use red text to indicate invalid filter. Closes #6165.
 2017-01-25 23:28:57 +02:00
sledgehammer999
354702140a Merge pull request #6180 from magao/issue6171 
Allow | in RSS must contain. Closes #6171.
 2017-01-25 23:27:59 +02:00
sledgehammer999
5df8ad32fe Merge pull request #6183 from magao/issue6163 
Save rule on enable/disable even if not selected. Closes #6163.
 2017-01-25 23:25:49 +02:00
sledgehammer999
b9b8352a31 Merge pull request #6184 from magao/issue5539 
RSS: allow resetting rule to no category. Closes #5539.
 2017-01-25 23:20:19 +02:00
sledgehammer999
eb3f4b8490 Merge pull request #6283 from Chocobo1/sort 
Use case-insensitive sort for Name column in Search tab. Closes #407.
 2017-01-25 23:07:11 +02:00
sledgehammer999
6c05b5f083 Merge pull request #6286 from ngosang/fix_webui 
[Web UI] Fix category in torrent upload. Closes #6260
 2017-01-25 23:06:50 +02:00