diff --git a/.gitignore b/.gitignore index eb61fdcb..770a2983 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,4 @@ __pycache__/ # Data dir data/* -.db \ No newline at end of file +*.db \ No newline at end of file diff --git a/plugins/Trayicon/TrayiconPlugin.py b/plugins/Trayicon/TrayiconPlugin.py index 2d71c55a..c3ca6e20 100644 --- a/plugins/Trayicon/TrayiconPlugin.py +++ b/plugins/Trayicon/TrayiconPlugin.py @@ -51,13 +51,13 @@ class ActionsPlugin(object): ("ZeroNet Github", lambda: self.opensite("https://github.com/HelloZeroNet/ZeroNet")), ("Report bug/request feature", lambda: self.opensite("https://github.com/HelloZeroNet/ZeroNet/issues")), "--", - ("!Open ZeroNet", lambda: self.opensite("http://%s:%s" % (ui_ip, config.ui_port))), + ("!Open ZeroNet", lambda: self.opensite("http://%s:%s/%s" % (ui_ip, config.ui_port, config.homepage) )), "--", ("Quit", self.quit), ) - icon.clicked = lambda: self.opensite("http://%s:%s" % (ui_ip, config.ui_port)) + icon.clicked = lambda: self.opensite("http://%s:%s/%s" % (ui_ip, config.ui_port, config.homepage) ) gevent.threadpool.start_new_thread(icon._run, ()) # Start in real thread (not gevent compatible) super(ActionsPlugin, self).main() icon._die = True diff --git a/src/Config.py b/src/Config.py index 86d62e3d..89571f20 100644 --- a/src/Config.py +++ b/src/Config.py @@ -8,7 +8,7 @@ class Config(object): def __init__(self, argv): self.version = "0.3.6" - self.rev = 879 + self.rev = 881 self.argv = argv self.action = None self.config_file = "zeronet.conf" diff --git a/src/Ui/UiWebsocket.py b/src/Ui/UiWebsocket.py index 0de2ee27..05d49023 100644 --- a/src/Ui/UiWebsocket.py +++ b/src/Ui/UiWebsocket.py @@ -154,7 +154,7 @@ class UiWebsocket(object): admin_commands = ( "sitePause", "siteResume", "siteDelete", "siteList", "siteSetLimit", "siteClone", - "channelJoinAllsite", "serverUpdate", "serverPortcheck", "certSet", "configSet" + "channelJoinAllsite", "serverUpdate", "serverPortcheck", "serverShutdown", "certSet", "configSet" ) if cmd == "response": # It's a response to a command