Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: douo/luci-app-tinyfecvpn
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.0.0-fix
Choose a base ref
...
head repository: douo/luci-app-tinyfecvpn
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 6 commits
  • 4 files changed
  • 4 contributors

Commits on Dec 30, 2020

  1. move category from vpn to services

    tiou committed Dec 30, 2020
    Copy the full SHA
    cdcfb0d View commit details

Commits on Feb 26, 2021

  1. fix po2lmo not found

    douo authored Feb 26, 2021
    Copy the full SHA
    41a04d0 View commit details

Commits on Apr 20, 2021

  1. Update server-detail.lua

    fix path err
    PikuZheng authored Apr 20, 2021
    Copy the full SHA
    07f7a5c View commit details
  2. Merge pull request #3 from PikuZheng/patch-1

    Update server-detail.lua
    douo authored Apr 20, 2021
    Copy the full SHA
    0edd66e View commit details

Commits on Feb 2, 2023

  1. Update servers.lua

    Path error fixed.
    Olympus-E authored Feb 2, 2023
    Copy the full SHA
    29cbf52 View commit details
  2. Merge pull request #5 from jason2000915/master

    Update servers.lua
    douo authored Feb 2, 2023
    Copy the full SHA
    15e9fcf View commit details
Showing with 9 additions and 7 deletions.
  1. +3 −1 Makefile
  2. +4 −4 files/luci/controller/tinyfecvpn.lua
  3. +1 −1 files/luci/model/cbi/tinyfecvpn/server-detail.lua
  4. +1 −1 files/luci/model/cbi/tinyfecvpn/servers.lua
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2019-2020 Tiou <dourokinga@gmail.com>
# Copyright (C) 2019-2021 Tiou <dourokinga@gmail.com>
#
# This is free software, licensed under the MIT License.
# See /LICENSE for more information.
@@ -17,6 +17,8 @@ PKG_MAINTAINER:=Tiou <dourokinga@gmail.com>

include $(INCLUDE_DIR)/package.mk

PKG_BUILD_DEPENDS:=luci

define Package/$(PKG_NAME)
SECTION:=luci
CATEGORY:=LuCI
8 changes: 4 additions & 4 deletions files/luci/controller/tinyfecvpn.lua
Original file line number Diff line number Diff line change
@@ -11,18 +11,18 @@ function index()
return
end

entry({"admin", "vpn", "tinyfecvpn"},
entry({"admin", "services", "tinyfecvpn"},
firstchild(),
_("tinyFecVPN")).dependent = false

entry({"admin", "vpn", "tinyfecvpn", "settings"},
entry({"admin", "services", "tinyfecvpn", "settings"},
cbi("tinyfecvpn/settings"), _("Settings"), 1)

entry({"admin", "vpn", "tinyfecvpn", "servers"},
entry({"admin", "services", "tinyfecvpn", "servers"},
arcombine(cbi("tinyfecvpn/servers"),cbi("tinyfecvpn/server-detail")), -- Create a combined dispatching target for non argv and argv requests.
_("Server Manager"), 2).leaf = true

entry({"admin", "vpn", "tinyfecvpn", "status"}, call("action_status"))
entry({"admin", "services", "tinyfecvpn", "status"}, call("action_status"))
end


2 changes: 1 addition & 1 deletion files/luci/model/cbi/tinyfecvpn/server-detail.lua
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ local log_level = {
"trace",
}
m = Map("tinyfecvpn", "%s - %s" % { translate("tinyFecVPN"), translate("Edit Server") })
m.redirect = dsp.build_url("admin/vpn/tinyfecvpn/servers")
m.redirect = dsp.build_url("admin/services/tinyfecvpn/servers")

if m.uci:get("tinyfecvpn", sid) ~= "servers" then
luci.http.redirect(m.redirect)
2 changes: 1 addition & 1 deletion files/luci/model/cbi/tinyfecvpn/servers.lua
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ s.anonymous = true
s.addremove = true
s.sortable = true
s.template = "cbi/tblsection"
s.extedit = dsp.build_url("admin/vpn/tinyfecvpn/servers/%s")
s.extedit = dsp.build_url("admin/services/tinyfecvpn/servers/%s")
function s.create(...)
local sid = TypedSection.create(...)
if sid then