mirror
/
bazarr
mirror of https://github.com/morpheus65535/bazarr
1
0
Fork 0
Code Issues Releases Wiki Activity
1,550 Commits 7 Branches 756 Tags 384 MiB
Commit Graph

71 Commits

Author SHA1 Message Date
Louis Vézina b055d89b4f Merge branch 'development' into python3 
# Conflicts:
#	bazarr.py
#	bazarr/get_subtitle.py
 2019-09-22 20:38:43 -04:00
Louis Vézina f389c38a9c WIP 2019-09-18 11:30:46 -04:00
Kraken 28e010fd0c
Update menu.tpl 2019-09-17 16:33:59 +01: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 f892c93bd8 Continuing development. 2019-08-08 06:33:00 -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
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
Louis Vézina 1322dcde2f Continuing development. 2019-04-28 23:01:05 -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
Halali 79f39e791e Merge remote-tracking branch 'origin/development' into updater 
# Conflicts:
#	bazarr/config.py
 2019-04-10 22:59:49 +02: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
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 af438d1236 Continuing development. 2019-03-21 11:32:58 -04:00
Louis Vézina c47c3359f1 Added spinning icon when tasks are running. 2019-02-24 23:05:58 -05:00
Louis Vézina 7d823a2930 Added queue argument for notifications. 2019-02-23 22:58:13 -05: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 5bbaae5442 Add port argument 2019-02-17 10:38:45 +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 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 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
Halali 1cc7efa413 Add Feature Request #229 2019-01-06 18:15:43 +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 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
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 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 82793da436 Continuing development 2018-12-12 21:50:05 -05:00
Halali 4586cd422d Update Jquery to v3.3.1 and templates clean up 2018-12-09 21:23:51 +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 f692930e26 rewrite get_argv to get_args; use in daemon and bazarr; fix os.path.join usage; PEPify most 2018-10-31 20:34:40 +01:00
Louis Vézina 09206a91d8 Fix for reverse proxy port and loader message when restarting. 2018-10-16 23:25:04 -04:00
Louis Vézina fb2860396a Fix for incorrect reloading URL 2018-10-16 22:04:07 -04:00
Louis Vézina e124e1c3fd Fix to create daemon stop and restart file in config_dir. Add a fix for automatic reloading after restart when using a reverse proxy with SSL. 2018-10-16 21:15:42 -04:00