Commit Graph

563 Commits

Author SHA1 Message Date
Kraken 3442c5d2cf
Update movieseditor.tpl 2019-09-17 16:01:18 +01:00
Kraken bb156c1910
Update movie.tpl 2019-09-17 15:57:34 +01:00
Kraken dd85914881
Update movies.tpl 2019-09-17 15:43:27 +01:00
Kraken 6fb353aee4
Update settings_sonarr.tpl 2019-09-17 15:38:31 +01:00
Kraken 139d389fe6
Update settings_radarr.tpl 2019-09-17 15:36:49 +01:00
Kraken eccbfdaf1c
Update settings_radarr.tpl 2019-09-17 15:36:04 +01:00
Kraken 46be1725f3
Update settings_sonarr.tpl 2019-09-17 15:34:02 +01:00
Kraken a8d08fa06c
Update settings_radarr.tpl 2019-09-17 15:28:29 +01:00
Kraken 661c677c50
Update settings_subtitles.tpl 2019-09-17 15:27:01 +01:00
Kraken 29f2077606
Update settings_radarr.tpl 2019-09-17 15:17:49 +01:00
Kraken 0c63fcacc6
Update settings_notifications.tpl 2019-09-17 15:15:19 +01:00
Kraken 24c4acc255
Update settings_general.tpl 2019-09-17 15:14:09 +01:00
Kraken 85d9089a19
Update historyseries.tpl 2019-09-17 15:04:44 +01:00
Kraken 9465e8e8e1
Update historymovies.tpl 2019-09-17 15:03:35 +01:00
Kraken f8975ba9eb
Update historyseries.tpl 2019-09-17 15:01:26 +01:00
Kraken 596e17ea50
Update system.tpl 2019-09-17 14:58:59 +01:00
Louis Vézina a0200b23da Removed 1 hour interval for search subtitles task. 2019-09-14 09:32:19 -04:00
Louis Vézina 2fcf3dee08 Fix for new install since peewee integration. 2019-09-13 21:53:56 -04:00
Louis Vézina 490e4ad515 Added ability to customize tasks execution frequencies. 2019-09-11 06:50:33 -04:00
Louis Vézina 30b94a62ff Merge branch 'development' into morpheus
# Conflicts:
#	bazarr/get_subtitle.py
2019-09-04 22:28:11 -04:00
Louis Vézina 1abd291d51 Better description of what is analytics and how we use it. 2019-09-03 14:25:02 -04:00
Louis Vézina 1b4e4e1495 Merge branch 'development' into morpheus
# Conflicts:
#	bazarr/get_subtitle.py
#	bazarr/main.py
#	bazarr/utils.py
2019-09-02 23:30:23 -04:00
Louis Vézina d5c0061cc9 Google Analytics implementation to get usage data in order to better understand how Bazarr is used. 2019-09-02 23:22:38 -04:00
Louis Vézina ab68581eda Continuing development. 2019-08-25 23:34:35 -04:00
Louis Vézina 5b96df4c40 Merge branch 'development' into morpheus
# Conflicts:
#	bazarr/get_subtitle.py
#	bazarr/main.py
#	views/movie.tpl
2019-08-25 22:20:42 -04:00
Louis Vézina e774bd41d0 Merge remote-tracking branch 'origin/development' into development 2019-08-25 22:15:04 -04:00
Louis Vézina 4b12dea4cf Removing mediainfo related code. 2019-08-25 22:10:31 -04:00
Eduardo Almeida fdf04df0ed [Feature] Subtitles Upload (#512)
* Subtitle upload support.

* Changes requested for PR #512.

* Work on differentiating manual upload from the other types.

* Support for forced subtitles.

* Fixed message when forced.

* Fixed forced subtitle filename.

* Fixed missing subtitles for movies not updating.

* Changed subtitle upload dialog format.

* Fixed upload UI.

* Fixed toggle.

* Small fixes.

* Small fixes.
2019-08-22 20:02:11 -04:00
Louis Vézina d37e883f2c Merge branch 'development' into morpheus
# Conflicts:
#	views/movie.tpl
2019-08-15 17:21:27 -04:00
Louis Vézina 4bb47f01a3 Fix for ajax long polling not working as expected. #518 2019-08-15 08:05:58 -04:00
Louis Vézina 3a1285e2da Fix for mediainfo error on Linux. 2019-08-13 13:46:29 -04:00
Louis Vézina f892c93bd8 Continuing development. 2019-08-08 06:33:00 -04:00
Louis Vézina 93adaea3cb Continuing development. 2019-08-05 10:28:25 -04:00
Louis Vézina d7c824500a Merge remote-tracking branch 'origin/development' into development 2019-07-31 16:05:18 -04:00
Louis Vézina 6a7af0aabd Fix for downloading both forced and not forced when clicking on manual download link while having "Both" requested. 2019-07-31 16:04:52 -04:00
Louis Vézina 874984d529 Switching episodes page to peewee. 2019-07-31 06:09:08 -04:00
morpheus65535 531500f3cb
Update providers.tpl 2019-07-30 21:04:39 -04:00
Louis Vézina 9336473f0b Switching series page to peewee. 2019-07-29 13:04:29 -04:00
Mexx62 9cd7cfe07d Added betaseries provider (#486)
* Added betaseries provider

* Make the provider TV Shows only

* Fixed betaseries token save in wizard

* Boosted subtitles score

* Removed addic7ed_boost

* Fixed subtitle URL problem

* Changed variable names

* Change provider informations and add warning

* Reverted subliminal_patch/score.py
2019-07-18 19:21:22 -04:00
MoshiMoshi0 97b3b42c96 Restore MediaInfo refiner (#494)
* Remove linux libmediainfo files

* Uncomment refine_from_mediainfo call

* Add libmediainfo warning on linux

* Fix warning tooltip from libmediainfo to mediainfo
2019-07-18 11:45:31 -04:00
MoshiMoshi0 b56015e90b Add ability to use MediaInfo to refine video/audio properties (#479)
* Add ability to use MediaInfo to refine video/audio properties

* Remove pymediainfo from requirements.txt and add library files

* Look for .dll file if .exe was not found in get_binary

* Add pymediainfo to libs

* Switch to local MediaInfo library files

* Exit early if supported attributes are already set

* Log media info warnings to debug
2019-07-10 15:36:49 +02:00
Louis Vézina 0995df6c7d Fix for #436 and #459. 2019-06-20 21:34:14 -04:00
Louis Vézina 7f1f46a506 Merge branch 'development' into morpheus 2019-06-09 21:31:26 -04:00
Louis Vézina bed98832ed Added settings to disable UTF8 subtitles re-encoding. 2019-06-03 20:16:37 -04:00
Louis Vézina 9a9fdb0072 Small fix in form validation. 2019-05-30 06:33:35 -04:00
Louis Vézina e784a82f9f Continuing development. 2019-05-30 00:11:34 -04:00
Louis Vézina a420bb3c43 Fix after merging dev branch. 2019-05-30 00:11:07 -04:00
Louis Vézina 036df00f5b Merge branch 'development' into morpheus
# Conflicts:
#	views/settings.tpl
#	views/wizard.tpl
2019-05-29 23:47:06 -04:00
Louis Vézina f9b348ace7 Improvement to settings and wizard template to reuse providers instead of duplicating everything and also to simplify new development. 2019-05-29 23:45:33 -04:00
morpheus65535 412dfd4d21
Merge pull request #448 from ngosang/feature/subdivx
Add Subdivx provider Closes #307
2019-05-25 12:24:02 -04:00
ngosang 630438e4e7 Add Subdivx provider Closes #307 2019-05-25 17:40:52 +02:00
Louis Vézina d974f51630 Continuing development. 2019-05-24 13:42:54 -04:00
Louis Vézina 732cc056bb Continuing development. 2019-05-22 23:50:09 -04:00
Louis Vézina 85cad57b48 Continuing development. 2019-05-21 23:33:59 -04:00
Louis Vézina bb79ab5917 Continuing development. 2019-05-21 09:13:49 -04:00
morpheus65535 4a4b16e15e
Merge pull request #388 from morpheus65535/updater
Updater rework to support update from releases instead of using git.
2019-05-20 17:18:26 -04:00
Unknown db7b6158aa Add credentials form; Fix incorrect imports 2019-05-19 02:26:42 +02:00
Unknown 94972f29f0 Add Napisy24 provider 2019-05-18 18:54:58 +02:00
Louis Vézina 324ef72922 Merge branch 'development' into morpheus
# Conflicts:
#	bazarr/embedded_subs_reader.py
#	views/movies.tpl
2019-05-10 09:42:12 -04:00
Louis Vézina 2abf522d1f Continuing development. 2019-05-10 09:24:11 -04:00
morpheus65535 7338a781f6
Merge pull request #423 from girtskokars/latvian_providers
add subtitri.nekur.net and subtitri.id.lv subtitle providers
2019-05-08 20:39:08 -04:00
morpheus65535 a0e7e63286
Merge pull request #428 from sekkr1/development
added ignore pgs subs setting to embedded scan
2019-05-07 06:43:21 -04:00
morpheus65535 cbda709796
rename data attr to ignorepgs in jquery
Co-Authored-By: sekkr1 <dekel.reches@pm.me>
2019-05-07 03:27:11 +03:00
morpheus65535 f3b8f22b43
rename data attr to ignorepgs in html
Co-Authored-By: sekkr1 <dekel.reches@pm.me>
2019-05-07 03:27:00 +03:00
sekkr1 91e729ac06 added ignore pgs settings to embedded scan 2019-05-06 08:14:07 +03:00
Louis Vézina 85be773190 Typo fix in series history. 2019-05-05 20:21:46 -04:00
Zandor Smith 9f80fcfa80
Fixed grammar in tooltips on the history page. 2019-05-05 20:10:35 +02:00
Ģirts Kokars 34495b9263 add providers to the wizard 2019-05-03 14:03:50 +03:00
Louis Vézina 8a21265fe6 Merge remote-tracking branch 'origin/development' into development 2019-05-03 06:31:39 -04:00
Louis Vézina aba93482b0 Some small UI fixes. 2019-05-03 06:30:46 -04:00
Ģirts Kokars d910db7965 add subtitri.nekur.net and subtitri.id.lv subtitle providers 2019-05-02 21:32:52 +03:00
morpheus65535 164230c7cd
Fix input type for DBC password. 2019-05-01 06:31:15 -04:00
Halali efcf5161ad Fix for movies history paging 2019-04-30 20:52:18 +02:00
Louis Vézina 1322dcde2f Continuing development. 2019-04-28 23:01:05 -04:00
Louis Vézina 93e061462a Continuing development. 2019-04-27 08:13:47 -04:00
Louis Vézina 05ec091f69 Merge branch 'development' into morpheus
# Conflicts:
#	bazarr/get_subtitle.py
#	bazarr/list_subtitles.py
#	views/movie.tpl
2019-04-25 22:18:13 -04:00
Louis Vézina 07c37b8254 Fix for subtitles upgrading when a series doesn't have a desired language anymore. 2019-04-23 20:05:06 -04:00
Louis Vézina db189c7773 Merge branch 'halali' into development
# Conflicts:
#	bazarr/get_subtitle.py
2019-04-22 21:13:37 -04:00
Louis Vézina 3ffce6e5fa Some fixes and improvements. 2019-04-22 21:08:26 -04:00
Louis Vézina 26f57f5ca0 Continuing work on mobile UI. 2019-04-20 17:15:00 -04:00
Halali 6d7e547d6a Merge remote-tracking branch 'origin/development' into halali
# Conflicts:
#	bazarr/get_episodes.py
2019-04-19 21:53:56 +02:00
Halali 03b5cc456e Finished development 2019-04-19 21:49:45 +02:00
Louis Vézina c6fc6a37a0 Reworked the menu to make it more responsive on mobile. 2019-04-16 23:05:34 -04:00
Louis Vézina d9d0942d50 Added Bazarr website to status tab of system page. 2019-04-12 20:51:30 -04:00
Halali 79f39e791e Merge remote-tracking branch 'origin/development' into updater
# Conflicts:
#	bazarr/config.py
2019-04-10 22:59:49 +02:00
Halali d49a04ce15 Merge remote-tracking branch 'origin/development' into halali 2019-04-10 21:35:29 +02:00
morpheus65535 9e6141d4f4 Typo in settings.tpl 2019-04-08 17:10:45 -04:00
Louis Vézina 0dcb67b89e Added toggle to enable or disable Zimuku. 2019-04-08 06:52:45 -04:00
Louis Vézina b8df31f4a6 Merge branch 'development' into morpheus 2019-04-08 06:34:27 -04:00
Louis Vézina 7cc28a1da8 Continuing development. 2019-04-07 21:30:54 -04:00
Louis Vézina a619bbbe99 Continuing development. 2019-04-07 21:27:41 -04:00
Louis Vézina f5d9a868a1 Continuing development. 2019-04-07 17:54:31 -04:00
Louis Vézina c1e3d725d0 Merge branch 'development' into panni 2019-04-07 16:11:16 -04:00
Louis Vézina 6c101282f9 Continuing development. 2019-04-07 16:09:17 -04:00
Louis Vézina 18b9ce814c Fix for form validation error when upgrade subs is off but number of days is empty. Added dependency. 2019-04-06 23:13:42 -04:00
Louis Vézina 35401537d7 Continuing development. 2019-04-05 21:31:07 -04:00
Louis Vézina 5c65322c3c Merge remote-tracking branch 'origin/halali' into halali
# Conflicts:
#	views/menu.tpl
2019-04-04 15:05:18 -04:00
Louis Vézina 20e10d6720 Notification progress bar. 2019-04-04 15:04:06 -04:00
Halali e2500c9f84 Add long duration notification 2019-04-04 15:29:08 +02:00
Louis Vézina 679a76b476 Continuing development. 2019-04-04 07:11:53 -04:00
Halali 1a0e316dfc Continue developing 2019-04-03 19:08:43 +02:00
Halali caf4ede82a Add missed code for save settings 2019-04-03 18:03:55 +02:00
Halali 7d5bc71b32 Continue developing 2019-04-03 18:03:55 +02:00
Halali 8b5a04cb27 Continue developing 2019-04-03 18:03:55 +02:00
Halali b5b212ad76 Fix bad code format 2019-04-03 18:03:54 +02:00
Halali 5b1414f81f Continue developing 2019-04-03 18:03:54 +02:00
Halali b76acacbf0 Continue developing 2019-04-03 18:02:41 +02:00
Halali a26f64efc5 Continue developing 2019-04-03 18:02:41 +02:00
Halali 7f2a13f702 Continue developing 2019-04-03 18:02:41 +02:00
Louis Vézina 1e0980f8fc Merge remote-tracking branch 'origin/development' into morpheus
# Conflicts:
#	bazarr/list_subtitles.py
2019-04-03 10:46:23 -04:00
Louis Vézina 171fd61116 Fix for wizard not having the same options as settings for subfolder. 2019-04-02 22:43:44 -04:00
Louis Vézina 52a530a991 Fix for #375 2019-04-02 06:25:04 -04:00
Louis Vézina eeba43e492 Continuing development. 2019-04-01 22:34:03 -04:00
Louis Vézina 73269efebc First step in forced subtitles searching. 2019-03-30 23:09:52 -04:00
Louis Vézina 6045252d15 Index and identify in UI forced subtitles. 2019-03-28 21:39:18 -04:00
Louis Vézina f1ba4ca8dd Merge remote-tracking branch 'origin/development' into morpheus
# Conflicts:
#	bazarr/main.py
2019-03-27 15:11:46 -04:00
Louis Vézina 8a833ed941 Adding tooltip to have full timestamp. 2019-03-27 15:10:52 -04:00
Louis Vézina f47f107433 Fix for #368. 2019-03-27 06:29:11 -04:00
Halali a1a1ee68f1 Add Enable chmod setting 2019-03-26 20:49:03 +01:00
Halali b616ec76e0 Hide postprocessing settings if is not enabled 2019-03-26 20:40:41 +01:00
Louis Vézina 8d5d0f5bba Some tooltip and hide exception trace column. 2019-03-25 19:43:14 -04:00
Louis Vézina 0d4abad5e9 Added Debug log level to filtering. 2019-03-25 06:49:00 -04:00
Louis Vézina f4e22c76cb Switched log viewer to Ajax DataTables with filtering. 2019-03-25 00:02:14 -04:00
Louis Vézina 96fa041e9c Continuing development. 2019-03-22 22:25:40 -04:00
Halali 501aab3ff5 Some logging improvements 2019-03-22 17:41:19 +01:00
Halali d7364f87c1 Delete pattern in settings 2019-03-22 08:13:54 +01:00
Louis Vézina 596632c754 Continuing development. 2019-03-21 20:26:48 -04:00
Louis Vézina af438d1236 Continuing development. 2019-03-21 11:32:58 -04:00
Louis Vézina f75f215081 Continuing development. 2019-03-19 23:44:50 -04:00
Louis Vézina dd17672593 Continuing development. 2019-03-19 20:16:19 -04:00
Louis Vézina 3cc39c08da Continuing development. 2019-03-19 00:08:53 -04:00
Louis Vézina 8c7d658aa5 Ended development of upgrade subtitles. 2019-03-17 22:43:30 -04:00
Louis Vézina 340862401d Fix for Sonarr text fix in settings. 2019-03-03 15:48:31 -05:00
Louis Vézina 56c0d0edcc Completed custom folder for subtitles file. 2019-03-02 12:10:55 -05:00
Halali cba6b174e9 Chmod fixes 2019-02-27 23:38:13 +01:00
Halali ab693c4b50 Revert: Remove chmod feature 2019-02-27 21:55:06 +01:00
Louis Vézina 5f2a98776f Merge remote-tracking branch 'origin/development' into halali 2019-02-25 19:56:03 -05:00
Louis Vézina 198da9ab3f Fix to disable spinning icon when tasks is already running. 2019-02-25 19:48:43 -05:00
Louis Vézina 7aa6974a90 Merge remote-tracking branch 'origin/development' into development 2019-02-24 23:06:32 -05:00
Louis Vézina c47c3359f1 Added spinning icon when tasks are running. 2019-02-24 23:05:58 -05:00
Halali e7dc0379c9 Merge remote-tracking branch 'origin/development' into halali
# Conflicts:
#	bazarr/get_subtitle.py
#	bazarr/main.py
2019-02-24 20:01:23 +01:00
Halali 8dc026d19a Reorder providers and add new providers to wizard 2019-02-24 19:25:37 +01:00
Panagiotis Koutsias 176b2c818a Adds GreekSubtitles, Subs4Free, Subs4Series, SubZ and XSubs providers (#310)
* Adds GreekSubtitles, Subs4Free, Subs4Series, SubZ and XSubs providers

* Various optimizations in greek providers
2019-02-24 12:41:22 -05:00
Halali 85f3cf5ab0 Fix for #324 2019-02-24 12:37:14 +01:00
Louis Vézina 7d823a2930 Added queue argument for notifications. 2019-02-23 22:58:13 -05:00
Halali d2ab9aa38c fix for #315 2019-02-24 00:26:19 +01:00
Louis Vézina 23a7ade8ff Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	bazarr/main.py
2019-02-20 23:32:54 -05:00
Louis Vézina 5f4175a0e3 Optimizing the notification system (popup in browser). 2019-02-20 23:30:25 -05:00
Halali fd9007ff49 Remove chmod feature 2019-02-20 17:04:09 +01:00
Halali 3c2958ffd3 Merge remote-tracking branch 'origin/development' into halali 2019-02-20 17:03:25 +01:00
Halali 5bbaae5442 Add port argument 2019-02-17 10:38:45 +01:00
Halali 51bd040991 Changes for subfolder settings 2019-02-12 10:47:26 +01:00
Halali 2a6dc54c88 Merge remote-tracking branch 'origin/development' into halali
# Conflicts:
#	bazarr/get_subtitle.py
2019-02-12 09:51:31 +01:00
Louis Vézina 11ff3b3328 Fix for 0cd1d2cbda 2019-02-04 10:05:38 -05:00
Halali 0cd1d2cbda Add missing datat-title to wanted pages 2019-02-03 20:15:37 +01:00
Halali eef8e33554 Merge remote-tracking branch 'origin/development' into halali
# Conflicts:
#	bazarr/get_subtitle.py
2019-02-03 13:17:20 +01:00
Halali f7d308fc3d Try to fix subtitles deletion 2019-02-02 18:04:12 +01:00
Halali 63054e8a42 Merge remote-tracking branch 'origin/development' into development 2019-02-02 08:54:49 +01:00
Halali b178d8fd0f Change quotas to prevent issue with title contain "'" 2019-02-02 08:54:29 +01:00
Louis Vézina 3f5410dea3 Reordering of providers 2019-02-01 14:15:46 -05:00
Louis Vézina 626d7c81d7 Merge branch 'pr/292' into development 2019-02-01 13:51:02 -05:00
Halali 3a2c28f3cf Rewrite tooltips for new settings 2019-01-31 22:20:22 +01:00
Halali eeb63d2568 Merge remote-tracking branch 'origin/development' into halali
# Conflicts:
#	bazarr/get_subtitle.py
2019-01-31 21:35:04 +01:00
e01 1f8b5e84b8 Add tooltips to provider checkboxes 2019-01-30 19:41:54 +02:00
Louis Vézina d02fe76742 Modified increment for minimum score to 1 instead of 5. 2019-01-29 12:24:27 -05:00
e01 8fd96a2dfd Add subsunacs.net and subs.sab.bz providers 2019-01-29 15:27:45 +02:00
morpheus65535 968fad4193 Fix for #290. 2019-01-27 21:35:44 -05:00
morpheus65535 a5858c3328 Merge remote-tracking branch 'origin/development' into development 2019-01-27 21:21:10 -05:00
morpheus65535 96259b02c5 Removed page length dropdown in manual search dialog. 2019-01-27 21:19:56 -05:00
Halali 250af26f49 Merge remote-tracking branch 'origin/development' into subliminal_patch 2019-01-27 16:40:18 +01:00
Halali 62c89a8157 Reflect providers settings changes to wizard 2019-01-27 16:33:37 +01:00
Halali 181fe637de Add some basic rules for subfolder custom path 2019-01-27 01:00:00 +01:00
Halali 1e74036db4 Merge remote-tracking branch 'origin/subliminal_patch' into subliminal_patch 2019-01-26 20:27:37 +01:00
morpheus65535 a5d547556b Removed Shooter which do not exist anymore. 2019-01-26 12:32:04 -05:00
Halali 9fe6e8595e Merge remote-tracking branch 'origin/subliminal_patch' into subliminal_patch
# Conflicts:
#	bazarr/main.py
2019-01-26 08:16:39 +01:00
morpheus65535 693c82d57f Merge remote-tracking branch 'origin/development' into subliminal_patch
# Conflicts:
#	bazarr/main.py
#	bazarr/scheduler.py
#	views/settings.tpl
2019-01-25 23:47:53 -05:00
morpheus65535 f93c34b640 Added missing providers to UI. 2019-01-25 23:27:56 -05:00
Halali bddf6fbb55 Fix for #286 and maybe #285 2019-01-25 08:07:34 +01:00
Halali 944dee19eb Fix settings template 2019-01-24 21:59:30 +01:00
Halali 181e71fe65 Add feature #154 and chmod option is now available only for linux 2019-01-24 21:39:23 +01:00
Halali acbbf6e58b Add chmod, provider throttle, multithread options 2019-01-24 15:00:03 +01:00
morpheus65535 834f4b1cdd Fix for episodes and movies languages selection popup not showing anymore. 2019-01-21 06:41:31 -05:00
morpheus65535 f9f35f11c0 Adding donate button. 2019-01-20 23:20:18 -05:00
Halali 8472a48e28 Clean up and add some tooltips to providers 2019-01-20 14:53:43 +01:00
Halali 0d2e0daed3 Fix title is None in Wanted pages 2019-01-19 14:57:16 +01:00
Halali f5da9ebda0 Add providers settings UI 2019-01-16 22:49:44 +01:00
morpheus65535 42c0b95a5b Removing Subscenter provider from UI since it's not supported anymore in Subliminal. 2019-01-16 06:41:18 -05:00
Halali 0b706a4e41 Merge remote-tracking branch 'origin/development' into subliminal_patch
# Conflicts:
#	bazarr/get_movies.py
#	bazarr/get_subtitle.py
#	bazarr/init.py
#	bazarr/main.py
#	views/settings.tpl
2019-01-15 15:45:38 +01:00
morpheus65535 2006f7be31 Merge remote-tracking branch 'origin/development' into development 2019-01-11 23:26:47 -05:00
morpheus65535 ecfde95a94 Refactoring of providers UI in settings and wizard. Removec the ugly alert when savong settings and replacing it with a notification. 2019-01-11 23:23:53 -05:00
Halali 1cc7efa413 Add Feature Request #229 2019-01-06 18:15:43 +01:00
Halali c765359fcf Fixes after merge 2019-01-02 20:43:40 +01:00
Halali e6a8aea924 Merge remote-tracking branch 'origin/development' into subliminal_patch
# Conflicts:
#	bazarr/check_update.py
#	bazarr/get_episodes.py
#	bazarr/get_languages.py
#	bazarr/get_movies.py
#	bazarr/get_providers.py
#	bazarr/get_series.py
#	bazarr/get_settings.py
#	bazarr/get_subtitle.py
#	bazarr/init.py
#	bazarr/list_subtitles.py
#	bazarr/main.py
#	bazarr/notifier.py
#	bazarr/scheduler.py
#	bazarr/update_db.py
#	bazarr/utils.py
#	views/history.tpl
2019-01-02 20:19:31 +01:00
morpheus65535 35fcc703d6 Merge remote-tracking branch 'origin/halali' into halali 2019-01-01 21:06:08 -05:00
morpheus65535 af16492230 Fix for providers in wizard. 2019-01-01 21:03:23 -05:00
Halali 80b09d3e73 Merge remote-tracking branch 'origin/development' into subliminal_patch 2019-01-01 21:51:21 +01:00
Halali 4fd9ed1157 Merge remote-tracking branch 'origin/development' into halali 2019-01-01 21:50:42 +01:00
Halali b5dd80caf1 Remove alert from test notification 2019-01-01 21:49:44 +01:00
Halali d2cba5b2c1 Remove alert from test notification 2019-01-01 21:48:42 +01:00
Halali f89b4a94de Remove alert from test notification 2019-01-01 21:45:35 +01:00