Auto stash before merge of "master" and "origin/master"

This commit is contained in:
Sagi Frimer
2019-03-23 21:18:30 +02:00
parent 2dd8140350
commit ec0b07db61
5 changed files with 6791 additions and 8 deletions

View File

@@ -12,12 +12,7 @@ define("port", default=8888, help="run on the given port", type=int)
class ChameleonApplication(tornado.web.Application):
def __init__(self):
handlers = [(r"/", MainHandler),
(r"/websocket", ChameleonWebSocket),
(r"/css/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/css")}),
(r"/js/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/js")}),
(r"/templates/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/templates")}),
(r"/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site")}),
(r"/assets/(.*)", tornado.web.StaticFileHandler, {'path': os.path.join(os.path.dirname(__file__), "../../Site/assets")})]
(r"/websocket", ChameleonWebSocket)]
settings = dict(
template_path=os.path.join(os.path.dirname(__file__), "../../Site")