Commit Graph

12 Commits

Author SHA1 Message Date
Louis Vézina 49d81aab35 Merge branch 'development' into hermes
# Conflicts:
#	bazarr/main.py
#	views/providers.tpl
#	views/settings_general.tpl
2020-03-08 10:23:39 -04:00
Michiel van Baak 30a801b04d Move scandir.c header files to the correct directory 2020-03-03 14:06:25 +01:00
Louis Vézina 32a467cec5 WIP 2020-02-23 22:48:56 -05:00
Louis Vézina fc3923ad81 Merge branch 'development' into hermes
# Conflicts:
#	bazarr/main.py
#	libs/version.txt
#	views/menu.tpl
2020-02-16 11:41:17 -05:00
Louis Vézina 0e94a2a03d WIP 2020-02-12 23:17:36 -05:00
Michiel van Baak e13a2db994 Move anydbm and friends to libs2/ as they are only used in python2 conditional imports 2020-02-11 10:52:09 +01:00
Louis Vézina d933108766 Merge branch 'development' into hermes
# Conflicts:
#	bazarr.py
#	bazarr/get_series.py
#	bazarr/list_subtitles.py
#	bazarr/main.py
2020-02-10 19:42:17 -05:00
Michiel van Baak d4dd3ca4de Use native os.scandir when available 2020-02-09 15:37:11 +01:00
Louis Vézina 95b8aadb23 WIP 2020-01-29 06:53:29 -05:00
Louis Vézina b591918e03 Moved enum to libs2 2019-10-07 21:38:28 -04:00
Louis Vézina 3b4df939d8 Added concurrent.future in libs2 2019-10-07 21:22:01 -04:00
Louis Vézina 59c6a269ab WIP 2019-09-28 00:22:17 -04:00