Merge branch 'master' of http://git.choozmo.com:3000/ming/AI_Anchor

OpenshotService/openshot_video_generator.py

@@ -544,7 +544,7 @@ class video_service(rpyc.Service):
 
 
 from rpyc.utils.server import ThreadedServer
-t = ThreadedServer(video_service, port=8878)
+t = ThreadedServer(video_service, port=8858)
 print('service started')
 t.start()
 

api/static/script_util.js

@@ -149,7 +149,7 @@ var loaded_data = ''
 function openNav() {
   document.getElementById("mySidenav").style.width = "250px";
   document.querySelector('.loader').style.display = "block";
-  $.get("192.168.1.106:8887/history_input", function (data, status) {
+  $.get("/history_input", function (data, status) {
     console.log(data)
     loaded_data = data
     for (var obj of data) {