mirror
/
bazarr
mirror of https://github.com/morpheus65535/bazarr
1
0
Fork 0
Code Issues Releases Wiki Activity
909 Commits 11 Branches 712 Tags 368 MiB
Commit Graph

226 Commits

Author SHA1 Message Date
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
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 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 d0ada2f16a Check for SSL when opening websocket connection. 2018-12-31 23:46:33 -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
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
morpheus65535 bfb211ccda Fix for test notification returning a 404 behind a reverse proxy. 2018-12-18 06:39:49 -05:00
Halali 6286676bcd Implement new config to wizard template 2018-12-15 19:43:25 +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
morpheus65535 a1364c0d09 Continuing development 2018-12-14 09:28:14 -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
morpheus65535 71421de09e One small change to use field value even if you haven't save settings. 2018-12-13 22:05:42 -05:00
morpheus65535 82793da436 Continuing development 2018-12-12 21:50:05 -05:00
Halali a80d425398 Merge branch 'development' of https://github.com/morpheus65535/bazarr into halali 2018-12-10 22:42:03 +01:00
Halali 4586cd422d Update Jquery to v3.3.1 and templates clean up 2018-12-09 21:23:51 +01:00
Halali 2761572948 Fix for console error after fix #245 2018-12-07 16:18:16 +01:00
Halali c7d37503d8 Fix for #245 2018-12-06 21:53:16 +01:00
Halali b2158ed08b Fix for Firefox 63 2018-12-05 10:26:35 +01:00
morpheus65535 005b78f350 Initial commit 2018-11-29 21:24:48 -05:00
Halali f941ee5199 Change get_argv to get_args in templates 2018-11-29 20:09:34 +01:00
panni 1f485d0aa7 get_subtitle: implement manual subtitle download 2018-11-29 14:40:31 +01:00
panni a1677bf9b6 movie/episodes template: properly escape single quotes for title attribute 2018-11-29 14:15:49 +01:00
panni 47295ac87a implement download_subtitle; add helper functions: get_video, get_scores 2018-11-29 14:03:44 +01:00
panni fca858c669 manual_search: implement hints, use full parsing with sceneName 2018-11-29 12:36:01 +01:00
panni 221c67449b Merge remote-tracking branch 'origin/development' into subliminal_patch 
# Conflicts:
#	bazarr/check_update.py
#	bazarr/get_argv.py
#	bazarr/get_movies.py
#	bazarr/get_settings.py
#	bazarr/get_subtitle.py
#	bazarr/main.py
#	bazarr/scheduler.py
 2018-11-28 12:36:44 +01:00
morpheus65535 1f38ec8c29 Fix for typo in missing language validation 2018-11-27 22:55:25 -05:00
Halali 18ea5442de Notification test button 2018-11-27 22:34:09 +01:00
Halali 797499a92e Fixe for malformed string 2018-11-27 21:00:13 +01:00
Halali aeb51b09cd Fixed small visual bug 2018-11-26 21:18:12 +01:00
morpheus65535 bf09e94c5b Some small improvement 2018-11-25 22:00:12 -05:00
morpheus65535 1fb0a4078f Merge branch 'development' into halali 2018-11-25 21:05:12 -05:00
morpheus65535 73b81dd558 Removed warning about too many subtitles providers and delays. 2018-11-17 22:10:13 -05:00
Halali 82a78275b7 Merge remote-tracking branch 'origin/development' into halali 
# Conflicts:
#	views/logs.tpl
 2018-11-13 20:40:53 +01:00