JonnyWong16 8d5bc88fd9 Merge branch 'nightly' into python3 ...

# Conflicts:
#	data/interfaces/default/current_activity_instance.html
#	plexpy/activity_handler.py
#	plexpy/graphs.py
#	plexpy/helpers.py
#	plexpy/pmsconnect.py
#	plexpy/version.py
#	plexpy/webserve.py

2020-02-29 15:26:33 -08:00

..

__init__.py

Merge branch 'nightly' into python3

2020-02-29 15:26:33 -08:00

activity_handler.py

Merge branch 'nightly' into python3

2020-02-29 15:26:33 -08:00

activity_pinger.py

Run futurize --unicode-literals

2019-11-23 19:21:10 -08:00

activity_processor.py

Merge branch 'nightly' into python3

2020-02-29 15:26:33 -08:00

api2.py

Merge branch 'nightly' into python3

2020-02-29 15:26:33 -08:00

classes.py

Run futurize --unicode-literals

2019-11-23 19:21:10 -08:00

common.py

Merge branch 'nightly' into python3

2020-02-29 15:26:33 -08:00

config.py

Merge branch 'nightly' into python3

2020-02-29 15:26:33 -08:00

database.py

Merge branch 'nightly' into python3

2019-12-08 12:20:43 -08:00

datafactory.py

Merge branch 'nightly' into python3

2020-02-29 15:26:33 -08:00

datatables.py

Merge branch 'nightly' into python3

2020-02-29 15:26:33 -08:00

exceptions.py

Run futurize --unicode-literals

2019-11-23 19:21:10 -08:00

graphs.py

Merge branch 'nightly' into python3

2020-02-29 15:26:33 -08:00

helpers.py

Merge branch 'nightly' into python3

2020-02-29 15:26:33 -08:00

http_handler.py

Run futurize --unicode-literals

2019-11-23 19:21:10 -08:00

libraries.py

Merge branch 'nightly' into python3

2020-02-29 15:26:33 -08:00

lock.py

Run futurize --unicode-literals

2019-11-23 19:21:10 -08:00

log_reader.py

Set log files to UTF-8

2019-12-12 08:58:57 -08:00

logger.py

Merge branch 'nightly' into python3

2020-01-19 16:40:19 -08:00

mobile_app.py

Run futurize --unicode-literals

2019-11-23 19:21:10 -08:00

newsletter_handler.py

Run futurize --unicode-literals

2019-11-23 19:21:10 -08:00

newsletters.py

Run futurize --unicode-literals

2019-11-23 19:21:10 -08:00

notification_handler.py

Merge branch 'nightly' into python3

2020-02-29 15:26:33 -08:00

notifiers.py

Merge branch 'nightly' into python3

2020-02-29 15:26:33 -08:00

plexivity_import.py

Run futurize --unicode-literals

2019-11-23 19:21:10 -08:00

plextv.py

Run futurize --unicode-literals

2019-11-23 19:21:10 -08:00

plexwatch_import.py

Run futurize --unicode-literals

2019-11-23 19:21:10 -08:00

pmsconnect.py

Merge branch 'nightly' into python3

2020-02-29 15:26:33 -08:00

request.py

Encode request message to UTF-8

2019-11-24 16:27:26 -08:00

session.py

Run futurize --unicode-literals

2019-11-23 19:21:10 -08:00

users.py

Merge branch 'nightly' into python3

2020-02-29 15:26:33 -08:00

version.py

Merge branch 'nightly' into python3

2020-02-29 15:26:33 -08:00

versioncheck.py

Merge branch 'nightly' into python3

2020-02-29 15:26:33 -08:00

web_socket.py

Run futurize --unicode-literals

2019-11-23 19:21:10 -08:00

webauth.py

Decode jwt_token for login cookie

2019-11-24 15:50:27 -08:00

webserve.py

Merge branch 'nightly' into python3

2020-02-29 15:26:33 -08:00

webstart.py

Fix starting cherrypy server

2019-11-23 19:21:40 -08:00