mirror
/
bazarr
mirror of https://github.com/morpheus65535/bazarr
1
0
Fork 0
Code Issues Releases Wiki Activity
875 Commits 9 Branches 694 Tags 364 MiB
Commit Graph

875 Commits

Author SHA1 Message Date
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
Halali e9677354a2 Merge remote-tracking branch 'origin/development' into halali 
# Conflicts:
#	bazarr/check_update.py
 2018-12-27 15:13:50 +01:00
Halali 97b456835b Fox for no-update 2018-12-20 13:23:21 +01:00
morpheus65535 9d4e4483e0 Merge remote-tracking branch 'origin/development' into development 2018-12-18 06:40:56 -05:00
morpheus65535 bfb211ccda Fix for test notification returning a 404 behind a reverse proxy. 2018-12-18 06:39:49 -05:00
morpheus65535 ad4a63cb5b Continuing development 2018-12-17 19:38:59 -05:00
morpheus65535 046f4e652b Continuing development 2018-12-16 23:35:48 -05:00
morpheus65535 e12b09bca9 Continuing development 2018-12-16 23:18:53 -05:00
Halali 889dad8fed Merge remote-tracking branch 'origin/development' into halali 2018-12-15 20:14:10 +01:00
Halali 6286676bcd Implement new config to wizard template 2018-12-15 19:43:25 +01:00
Halali eaa726d715 Disabling unwanted full rescan for movies every 5 minutes. 2018-12-15 19:41:36 +01:00
Halali 6c72da41da Fix template 2018-12-15 01:53:24 +01:00
Halali ead8dbfe0a More work for new Config code 2018-12-15 01:42:09 +01:00
Halali 99118f87fd More work for new Config code 2018-12-15 01:36:28 +01:00
Halali ead1f31eb1 Preparation for new Config code 2018-12-14 23:18:52 +01:00
morpheus65535 a1364c0d09 Continuing development 2018-12-14 09:28:14 -05:00
morpheus65535 306487880b Continuing development 2018-12-14 07:25:18 -05:00
morpheus65535 4686e7da55 Continuing development 2018-12-14 06:52:09 -05:00
morpheus65535 fd840d86c0 Continuing development 2018-12-13 23:01:15 -05:00