1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr synced 2024-12-25 01:02:19 +00:00
Commit graph

1194 commits

Author SHA1 Message Date
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
6a53ee784a Merge remote-tracking branch 'origin/halali' into development 2019-01-10 18:53:48 +01:00
Halali
04edd01746 Fix only_monitored for movies 2019-01-10 18:14:25 +01:00
Halali
9fef1ab9a3 Merge remote-tracking branch 'origin/halali' into development 2019-01-10 17:45:08 +01:00
morpheus65535
78de68b8a8 Revert "Merge pull request #249 from goldenpipes/goldenpipes-logo-remake"
This reverts commit 57e0363bb9, reversing
changes made to 02d9dc4799.
2019-01-09 20:50:24 -05:00
morpheus65535
57e0363bb9
Merge pull request #249 from goldenpipes/goldenpipes-logo-remake
Add files via upload
2019-01-09 20:43:53 -05:00
morpheus65535
02d9dc4799 Merge remote-tracking branch 'origin/master' into development 2019-01-06 13:54:59 -05:00
morpheus65535
4feeb3eaa9 Merge remote-tracking branch 'origin/development' into development 2019-01-06 13:51:32 -05:00
morpheus65535
8b3bf459ea Improvement to the episodes and movies update process. We now scan for existing subtitles and store them in DB when Sonarr or Radarr replace or rename the media file. 2019-01-06 13:50:36 -05:00
Halali
006fcd2be9 fix last commit 2019-01-06 18:18:28 +01:00
Halali
1cc7efa413 Add Feature Request #229 2019-01-06 18:15:43 +01:00
Halali
3ac4b75b88 Add exception for configparser import 2019-01-06 13:12:31 +01:00
morpheus65535
4141b7c280
Merge pull request #265 from kidburglar/264-Possibility-to-avoid-certificate-verification 2019-01-05 20:23:13 -05:00
Halali
d6d7c4bd1f Fix init script 2019-01-05 15:55:27 +01:00
kidburglar
83237af9ce Add verify=False for the test_url route 2019-01-05 15:08:56 +01:00
Halali
e561889902 Add rest providers config 2019-01-04 21:01:18 +01:00
Halali
ab4bbc35dd Start work on providers configs 2019-01-03 21:57:21 +01:00
Halali
7cdf9fcc4e Merge remote-tracking branch 'origin/development' into subliminal_patch 2019-01-03 21:30:34 +01:00
morpheus65535
84ccabfad4 Fix for configparser2 import error. 2019-01-02 23:12:33 -05: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
Halali
305cc616f1 Add .gitignore to data folder 2019-01-02 19:25:43 +01:00
morpheus65535
4667c306cb Merge remote-tracking branch 'origin/halali' into halali 2019-01-02 11:53:42 -05:00
morpheus65535
cd4e884533 Version bump 2019-01-02 11:51:02 -05:00
Halali
915dfa119d Remove unused configs from wizard 2019-01-02 15:51:08 +01:00
Halali
4661276844 Merge remote-tracking branch 'origin/halali' into halali 2019-01-02 09:58:43 +01:00
Halali
2a6b8d8934 Fix for Wizard 2019-01-02 09:58:20 +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
Halali
d12273926c Fix Merge 2019-01-01 21:31:01 +01:00
Halali
67bf114098 Merge remote-tracking branch 'origin/development' into subliminal_patch
# Conflicts:
#	bazarr/check_update.py
#	bazarr/get_episodes.py
#	bazarr/get_movies.py
#	bazarr/get_series.py
#	bazarr/get_subtitle.py
#	bazarr/init.py
#	bazarr/list_subtitles.py
#	bazarr/main.py
#	views/menu.tpl
#	views/settings.tpl
#	views/wanted.tpl
2019-01-01 21:15:12 +01:00
Halali
edf75a641c Some tweaks for settings migration 2019-01-01 19:27:50 +01:00
Halali
51d5e5c989 Fix configparser2 import 2019-01-01 16:06:10 +01:00
Halali
4c8b225926 Fix merge 2019-01-01 08:54:56 +01:00
Halali
2b564a060a Merge remote-tracking branch 'origin/development' into halali
# Conflicts:
#	bazarr/get_episodes.py
#	bazarr/get_movies.py
#	bazarr/get_series.py
#	bazarr/get_subtitle.py
#	bazarr/main.py
2019-01-01 08:46:27 +01:00
Halali
ef2dc275ed Move providers config from DB to config file 2019-01-01 08:32:40 +01:00
morpheus65535
af73fdf985 Version bump 2018-12-31 23:58:23 -05:00
morpheus65535
d0ada2f16a Check for SSL when opening websocket connection. 2018-12-31 23:46:33 -05:00
morpheus65535
368dc7e379 Merge remote-tracking branch 'origin/development' into development 2018-12-31 22:41:53 -05:00
morpheus65535
1c433d99e9 Continuing development. 2018-12-31 22:37:25 -05:00
morpheus65535
536f0196c0 Merge branch 'development' into notifications
# Conflicts:
#	bazarr/get_movies.py
#	bazarr/list_subtitles.py
#	bazarr/main.py
2018-12-31 13:18:32 -05:00
morpheus65535
108d7af1e6 Continuing development. 2018-12-31 12:49:11 -05:00
Halali
48648d1582 Move providers config from DB to config file 2018-12-27 23:10:10 +01:00
Halali
fcc663af91 Continue development for new config backend 2018-12-27 20:19:59 +01:00