1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr synced 2024-12-26 01:27:07 +00:00
Commit graph

82 commits

Author SHA1 Message Date
Louis Vézina
12912df6ac Updated deprecation warning. 2019-11-21 06:59:44 -05:00
Louis Vézina
61ab911747 Merge branch 'development' into python3
# Conflicts:
#	bazarr/main.py
2019-11-12 08:18:43 -05:00
Louis Vézina
2602a0550d Fix for #670. 2019-11-11 20:53:46 -05:00
Louis Vézina
c9f512e520 WIP 2019-11-08 10:49:07 -05:00
Louis Vézina
b3df181060 Updated UI Python deprecation warning. 2019-11-08 10:30:06 -05:00
Louis Vézina
b3b84abed1 Added Python 2.7 end of support banner. 2019-11-07 23:44:17 -05:00
Louis Vézina
fe6758858a Merge branch 'development' into python3
# Conflicts:
#	bazarr/database.py
#	bazarr/get_episodes.py
#	bazarr/get_movies.py
#	bazarr/get_series.py
#	bazarr/get_subtitle.py
#	bazarr/list_subtitles.py
#	bazarr/main.py
#	views/movie.tpl
2019-10-28 20:27:11 -04:00
Louis Vézina
4a911f43e5 WIP 2019-10-27 20:45:15 -04:00
Louis Vézina
d4115cb65f WIP 2019-10-26 14:52:22 -04:00
Louis Vézina
4626d3f93c Merge branch 'development' into python3 2019-10-01 15:21:25 -04:00
Halali
6f54777c9b Fix for rare issue with transparency 2019-09-28 19:52:47 +02:00
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