project/luci.git
6 years agoluci-mod-admin-full: use incremental background scanning for wireless join
Jo-Philipp Wich [Wed, 18 Jul 2018 12:43:27 +0000 (14:43 +0200)]
luci-mod-admin-full: use incremental background scanning for wireless join

The previous approach of synchroneously scanning while building the result
page was suboptimal since it frequently led to connection resets when
accessing LuCI via wireless.

It also exhibited problems when accessed via SSL on recent Firefox versions
where the page were only loaded partially.

Rework the wireless scanning to gather scan results in a background process
and put them into the ubus session data area where they can be readily
accessed without causing network interruptions.

Subsequently rebuild the wireless join page to use XHR polling to
incrementally fetch updated scan results.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9b4efaefa1b4c94a7d976c8d65169bf056032e09)

6 years agoluci-theme-openwrt: fixes for page action button placement
Jo-Philipp Wich [Wed, 18 Jul 2018 10:04:22 +0000 (12:04 +0200)]
luci-theme-openwrt: fixes for page action button placement

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 68dae07225c44ca43aec7d4826ebc954d0c9ef10)

6 years agoluci-theme-bootstrap: various fixes
Jo-Philipp Wich [Wed, 18 Jul 2018 10:02:35 +0000 (12:02 +0200)]
luci-theme-bootstrap: various fixes

- Styling fixes for table hover rows, striping and title row coloring
- Fixes for page action button placement

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 29f542fa6274337b366ccad9b268aba639936430)

6 years agoluci-mod-admin-full: properly reset internal device form field
Jo-Philipp Wich [Wed, 18 Jul 2018 08:02:07 +0000 (10:02 +0200)]
luci-mod-admin-full: properly reset internal device form field

In some cases the hidden internal device field was not reset, e.g. after
aborting a wifi scan and using the browser back buttons to navigate to the
overview page again.

In such a case, the previous device hidden field was still present and a new
one getting created, causing further wireless scan attempts to get invoked
with multiple radio names as parameter which fails.

Fix this issue by using the new generic cbi_submit() helper any by dropping
the faulty wifi_action() function.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 90f9c59a2d392837bbef39b5acf402531ab2d9be)

6 years agoluci-base: rework CBI footer template
Jo-Philipp Wich [Wed, 18 Jul 2018 09:46:46 +0000 (11:46 +0200)]
luci-base: rework CBI footer template

- Make sure that hitting enter in the form hits the CBI save action and not
  apply or cancel
- Hide action panel if no actions are available
- CLeanup code

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c09e1545608c9db5d9a81f7275528a6fc0a79505)

6 years agoluci-base: rework tblsection template
Jo-Philipp Wich [Wed, 18 Jul 2018 09:38:45 +0000 (11:38 +0200)]
luci-base: rework tblsection template

- Hide empty title and description rows
- Correct row striping offset
- Cleanup code

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f1fb7122e3a29aac2374c189e0fe90ba45f41cd2)

6 years agoluci-base: rework simpleform template
Jo-Philipp Wich [Wed, 18 Jul 2018 09:36:53 +0000 (11:36 +0200)]
luci-base: rework simpleform template

- Ensure that pressing enter in the form triggers the submit action and
  not a cbi skip or cancel
- Hide page actions when empty
- Cleanup code

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit bc562294b9a5a2867b8b6e1cb21d9a2d4a2b8b59)

6 years agoluci-base: cbi.js: add cbi_submit() helper
Jo-Philipp Wich [Wed, 18 Jul 2018 09:23:50 +0000 (11:23 +0200)]
luci-base: cbi.js: add cbi_submit() helper

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 7b43e81c9b88df9623cfa22a79627558787378ea)

6 years agoluci-mod-admin-full: offer "Cancel" button in iface add dialog
Jo-Philipp Wich [Wed, 18 Jul 2018 08:11:45 +0000 (10:11 +0200)]
luci-mod-admin-full: offer "Cancel" button in iface add dialog

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9bdd097f53160a9d7c7ee536ee61f5282eaa7955)

6 years agoluci-base: remove unused icons
Jo-Philipp Wich [Tue, 17 Jul 2018 11:17:38 +0000 (13:17 +0200)]
luci-base: remove unused icons

 - The wifi_big.png / wifi_big_disabled.png icons were used on the wireless
   overview page which now uses badges with normal sized icons
 - The encryption.png / encryption_disabled.png icons were never used at all

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 92360f2d5b8b8ba466eeb27708a62c693f474dc6)

6 years agoluci-base: update and improve Russian translation
Anton Kikin [Tue, 17 Jul 2018 11:38:42 +0000 (14:38 +0300)]
luci-base: update and improve Russian translation

Add missing translations and update existing not quite correct translations.
Replaced hyphens on em dashes where it is required by the Russian rules.

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
(cherry picked from commit de74dcec1b0ff6d17b284757fe9bf32c98e01502)

6 years agoluci-base: fix Russian translation
Anton Kikin [Mon, 16 Jul 2018 22:50:51 +0000 (01:50 +0300)]
luci-base: fix Russian translation

Removed redundant <br> tags from translations.

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
(cherry picked from commit efb38849d9818e6ef42542d4540c8c7b0db66abf)

6 years agoluci-app-simple-adblock: new start/stop button, better integration with simple-adblock
Stan Grishin [Tue, 17 Jul 2018 00:43:16 +0000 (17:43 -0700)]
luci-app-simple-adblock: new start/stop button, better integration with simple-adblock

Signed-off-by: Stan Grishin <stangri@melmac.net>
(cherry picked from commit 768a72597cf8ab6aa48807828e5bc0736fc65be6)

6 years agoluci-app-upnp: update Ukrainian translation
Yurii [Mon, 16 Jul 2018 13:19:27 +0000 (16:19 +0300)]
luci-app-upnp: update Ukrainian translation

Corrections translation.

Signed-off-by: Yurii yuripet@gmail.com
(cherry picked from commit 4f5e1c7da51a6d9395cdb6a7ac3d780bac032b14)

6 years agoluci-base: update Ukrainian translation
Yurii [Mon, 16 Jul 2018 13:16:56 +0000 (16:16 +0300)]
luci-base: update Ukrainian translation

Updated with the latest resync translation, corrections and additions translation.

Signed-off-by: Yurii yuripet@gmail.com
(cherry picked from commit 3859d444dbd70fed01125e6ab2a94467291a1245)

6 years agobase.po: Update chinese translations.
amitabha [Mon, 16 Jul 2018 07:24:17 +0000 (15:24 +0800)]
base.po: Update chinese translations.

Fix some Chinese translations.
Signed-off-by: Angus Ding <angus.ding@gmail.com>
(cherry picked from commit 92404498a17eb4a7d4cf6f67deba66a6f350a055)

6 years agoluci-base: fix Russian translation
Anton Kikin [Sun, 15 Jul 2018 16:35:35 +0000 (19:35 +0300)]
luci-base: fix Russian translation

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
(cherry picked from commit 6f29acdfb7028258c7a58e1cd8fc613760c3ece9)

6 years agoluci-base: Avoid block umount on fstab apply
Daniel Dickinson [Mon, 16 Jan 2017 02:20:44 +0000 (21:20 -0500)]
luci-base: Avoid block umount on fstab apply

Default behaviour of changes to fstab (Mount Points) was
to use /etc/init.d/fstab restart, however this unmounts
filesystems via block umount which can cause the device
to fail, so replace the initscript call with an exec
of 'block mount'.

Signed-off-by: Daniel Dickinson <lede@cshore.thecshore.com>
(cherry picked from commit 33b279c4752ac6df3d911edb6e1fb60b656bc122)

6 years agoluci-base: resync translations
Jo-Philipp Wich [Tue, 17 Jul 2018 18:46:54 +0000 (20:46 +0200)]
luci-base: resync translations

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluco-proto-ipv6: allow multiple prefixes for 6in4 and dhcpv6
Jo-Philipp Wich [Tue, 17 Jul 2018 14:18:25 +0000 (16:18 +0200)]
luco-proto-ipv6: allow multiple prefixes for 6in4 and dhcpv6

Fixes FS#1361.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 60e7ea2fc8363960861a82f1e65ca4a7a1d60bfe)

6 years agoluci-base: fix field section add button/input field names
Jo-Philipp Wich [Mon, 16 Jul 2018 15:28:50 +0000 (17:28 +0200)]
luci-base: fix field section add button/input field names

Some CBI map models, mainly the Network -> VLAN page, expect a valid
previous section ID in their Section:create() callback.

Previous refactoring of the tblsection markup broke this behaviour as
the "section" loop variable was accidentally localized, causing it to
be undefined outside of the loop body which caused the section add
button and name input fields to get rendered with a wrong "name"
attribute.

Fix this by moving the "section" variable declaration out of the loop
and by readding references to it in the non-anonymous section add case.

Fixes FS#1657
Fixes 002c4d1d5 ("luci-base: add "Name" label to autogenerated title column")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit fcc9cd6a9ab0bd7eaff6b3f3b4dd96fa31f79ebb)

6 years agoluci-mod-admin-full: fix changing alias interface ifnames
Jo-Philipp Wich [Sun, 15 Jul 2018 15:21:02 +0000 (17:21 +0200)]
luci-mod-admin-full: fix changing alias interface ifnames

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: fix handling alias interfaces in ifacelist widget
Jo-Philipp Wich [Sun, 15 Jul 2018 15:20:27 +0000 (17:20 +0200)]
luci-base: fix handling alias interfaces in ifacelist widget

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: luci.model.network: recognize alias interfaces
Jo-Philipp Wich [Sun, 15 Jul 2018 15:07:28 +0000 (17:07 +0200)]
luci-base: luci.model.network: recognize alias interfaces

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: improve interface overview display
Jo-Philipp Wich [Sun, 15 Jul 2018 13:18:00 +0000 (15:18 +0200)]
luci-mod-admin-full: improve interface overview display

Remove the guessing of primary interfaces for now as we cannot yet properly
track parent / child interface relations.

Instead, add tooltips to the interface icons displaying detailed physical
layer information per netdev.

For dynamic or true alias interfaces (using "@" notation), skip the
reporting of MAC and traffic stats.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-bootstrap: small style fix for link buttons
Jo-Philipp Wich [Sun, 15 Jul 2018 13:17:32 +0000 (15:17 +0200)]
luci-theme-bootstrap: small style fix for link buttons

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: fix wifi add and scan actions
Jo-Philipp Wich [Sun, 15 Jul 2018 11:14:24 +0000 (13:14 +0200)]
luci-mod-admin-full: fix wifi add and scan actions

Due to conversion to CBI, the inline forms are now nested and thus do not
work anymore.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f6ffc3d739ef48c3186b3313e2480c8787f42fcd)

6 years agoluci-base: update german translation
Jo-Philipp Wich [Sun, 15 Jul 2018 10:25:53 +0000 (12:25 +0200)]
luci-base: update german translation

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit f29b2a2652efeb6c0fb21edbff0b1ea0326d380a)

6 years agoluci-base: update Polish translation
Krystian Kozak [Sat, 14 Jul 2018 19:35:47 +0000 (21:35 +0200)]
luci-base: update Polish translation

Updated Polish translations.

Signed-off-by: Krystian Kozak <krystian.kozak20@gmail.com>
(backported from commit 77b8aa50e0f8e40b743379a46d6ce03ec9cd8f5f)

6 years agoopenwrt-18.06: merge master
Jo-Philipp Wich [Fri, 13 Jul 2018 15:02:22 +0000 (17:02 +0200)]
openwrt-18.06: merge master

Due to a huge number of fixes and diverging development histories, I decided
to completely merge the current LuCI master into the 18.06 release branch to
have a common code base for upcoming maintenance releases.

Some LuCI apps have minor style glitches yet but I do not deem them to be
release critical as non-default components need to be opkg-installed anyway
and the package repositories are continuously refreshed, so we do not need
to fix everything for OpenWrt 18.06.0-rc2.

The most important changes introduced by this merge are:

1) New HTTP handling library in C

  The new library should vastly reduce the required RAM for processing
  large POST bodies while implementing some slightly more strict parsing
  logic.

2) Apply/Rollback workflow

  The ubus rpcd based apply/rollback handling will automatically revert
  config changes if access to the device is lost for a certain period
  of time, this is mainly intended for preventing issues with bad
  config settings and the like.

  The feature is not 100% error-proof yet but it successfully prevents a
  large number of issues already. For final, the handling of the firewall
  conntrack cache needs to be fixed yet as adding "lockout" firewall rules
  is not yet catched due to the open HTTP session allowed by netfilter
  conntrack

3) Template markup and theme style modifications

  A large number of changes have been made to the markup in the various
  templates, mainly to allow for responsive styling of tables.

  The only theme currently making full use of that is the non-default
  OpenWrt theme which will break table rows into disjunct boxes on
  very narrow screens.

  The changes have been tested on IE 11, MS Edge, Firefox, Chrome, an
  iPhone 5s, iPhone 6 and iPad Air.

4) Initial LuCI support for displaying virtual dynamic network interfaces

  Some protocol handlers will spawn purely dynamic sub-interfaces which
  are not present in UCI. Such interfaces have been invisible in LuCI so
  far which caused confusion especialy wrt. missing IP addresses etc.

  LuCI will now display such dynamic interfaces on the interface overview.

5) Initial LuCI support for display interface runtime error information

  LuCI will now expose interface error information stored in the ubus
  runtime information by protocol handlers.

  This is mainly useful to get notified of low level problems like
  bad SIM codes are missing APN information.

6) Various XSS and CSRF bypass fixes

  A number of code places performing inadequate markup escaping have been
  fixed and the dispatcher CSRF token enforcement rules have been reworked
  to actually catch all POST security cases.

7) Initial support for running under nginx

  Various bugs have been fixed to allow LuCI to function under nginx using
  a FastCGI wrapper.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: xhr: increase poll request timeout
Jo-Philipp Wich [Fri, 13 Jul 2018 14:55:47 +0000 (16:55 +0200)]
luci-base: xhr: increase poll request timeout

Some status requests can take quite some time to finish, the LuCI DSL
status information in particular.

Since the polling loop code already takes care of not relaunching
requests which are already running, increase the per iteration timeout
to up to five times the poll interval.

This should be sufficient to let most operations complete.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-bootstrap: margin fix for multiple wifs on status overview
Jo-Philipp Wich [Fri, 13 Jul 2018 14:31:14 +0000 (16:31 +0200)]
luci-theme-bootstrap: margin fix for multiple wifs on status overview

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1933 from Ansuel/hostname_upnp
Jo-Philipp Wich [Fri, 13 Jul 2018 12:50:28 +0000 (14:50 +0200)]
Merge pull request #1933 from Ansuel/hostname_upnp

luci-app-upnp: add hostname info

6 years agoluci-base: resync base translations
Jo-Philipp Wich [Fri, 13 Jul 2018 12:24:27 +0000 (14:24 +0200)]
luci-base: resync base translations

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: differentiate between disabled and not associated wireless
Jo-Philipp Wich [Fri, 13 Jul 2018 12:08:17 +0000 (14:08 +0200)]
luci-mod-admin-full: differentiate between disabled and not associated wireless

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-app-advanced-reboot: fix translation string
Jo-Philipp Wich [Fri, 13 Jul 2018 10:47:59 +0000 (12:47 +0200)]
luci-app-advanced-reboot: fix translation string

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-material: table and button style fixes
Jo-Philipp Wich [Fri, 13 Jul 2018 10:39:07 +0000 (12:39 +0200)]
luci-theme-material: table and button style fixes

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-openwrt: cleanup CSS
Jo-Philipp Wich [Fri, 13 Jul 2018 07:38:31 +0000 (09:38 +0200)]
luci-theme-openwrt: cleanup CSS

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-bootstrap: cleanup CSS
Jo-Philipp Wich [Fri, 13 Jul 2018 07:38:25 +0000 (09:38 +0200)]
luci-theme-bootstrap: cleanup CSS

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: tweak interface and wireless overview markup
Jo-Philipp Wich [Fri, 13 Jul 2018 07:37:53 +0000 (09:37 +0200)]
luci-mod-admin-full: tweak interface and wireless overview markup

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-app-upnp: tweak table markup
Jo-Philipp Wich [Fri, 13 Jul 2018 07:37:28 +0000 (09:37 +0200)]
luci-app-upnp: tweak table markup

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: tweak tblsection markup
Jo-Philipp Wich [Fri, 13 Jul 2018 07:37:08 +0000 (09:37 +0200)]
luci-base: tweak tblsection markup

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: small wifi overview markup fix
Jo-Philipp Wich [Thu, 12 Jul 2018 16:58:11 +0000 (18:58 +0200)]
luci-mod-admin-full: small wifi overview markup fix

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-bootstrap: compress color names, fix table striping
Jo-Philipp Wich [Thu, 12 Jul 2018 16:57:20 +0000 (18:57 +0200)]
luci-theme-bootstrap: compress color names, fix table striping

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: produce valid JSON in status/realtime/connections_status
Jo-Philipp Wich [Thu, 12 Jul 2018 16:55:16 +0000 (18:55 +0200)]
luci-mod-admin-full: produce valid JSON in status/realtime/connections_status

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-proto-qmi: register further network error codes
Jo-Philipp Wich [Thu, 12 Jul 2018 15:00:32 +0000 (17:00 +0200)]
luci-proto-qmi: register further network error codes

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-proto-ncm: register further network error codes
Jo-Philipp Wich [Thu, 12 Jul 2018 15:00:21 +0000 (17:00 +0200)]
luci-proto-ncm: register further network error codes

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-proto-ipv6: register further network error codes
Jo-Philipp Wich [Thu, 12 Jul 2018 15:00:12 +0000 (17:00 +0200)]
luci-proto-ipv6: register further network error codes

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: add icons for alias interfaces
Jo-Philipp Wich [Thu, 12 Jul 2018 11:52:55 +0000 (13:52 +0200)]
luci-base: add icons for alias interfaces

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: rework interface overview page
Jo-Philipp Wich [Thu, 12 Jul 2018 14:50:40 +0000 (16:50 +0200)]
luci-mod-admin-full: rework interface overview page

Convert interface enable, disable and delete actions to proper cbi
operations so that we can benefit from the apply/rollback workflow
when performing critical interface operations.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: expose errors, description and up state in net status
Jo-Philipp Wich [Thu, 12 Jul 2018 14:44:31 +0000 (16:44 +0200)]
luci-mod-admin-full: expose errors, description and up state in net status

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: add error reporting and basic support for dynamic interfaces
Jo-Philipp Wich [Thu, 12 Jul 2018 14:43:23 +0000 (16:43 +0200)]
luci-base: add error reporting and basic support for dynamic interfaces

This allows exposing virtual ubus-based network interfaces in LuCI.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: reimplement wireless overview page as cbi model
Jo-Philipp Wich [Wed, 11 Jul 2018 20:19:50 +0000 (22:19 +0200)]
luci-mod-admin-full: reimplement wireless overview page as cbi model

This will offer apply/rollback workflow for tasks like deleting or shutting
down wireless networks.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: apply_widget: various fixes
Jo-Philipp Wich [Thu, 12 Jul 2018 05:37:49 +0000 (07:37 +0200)]
luci-base: apply_widget: various fixes

 - Fix button styles in failure message
 - Pause XHR polling during apply/rollback sessions
 - Throttle confirm requests to 1 request/second

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: xhr.js: use JSON.parse() and pass request duration to callbacks
Jo-Philipp Wich [Thu, 12 Jul 2018 05:34:04 +0000 (07:34 +0200)]
luci-base: xhr.js: use JSON.parse() and pass request duration to callbacks

JSON.parse() is supported on all modern browsers and a far better
solution than the hakish and potentially dangerous eval().

Also calculate the duration of request and pass it as 3rd argument to the
callback function, this makes it easier to calculate request delays or
poll intervals in code using XHR.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-openwrt: consolidate font sizes and button styles
Jo-Philipp Wich [Wed, 11 Jul 2018 20:20:51 +0000 (22:20 +0200)]
luci-theme-openwrt: consolidate font sizes and button styles

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: improve text contrast in realtime graphs
Jo-Philipp Wich [Wed, 11 Jul 2018 06:04:39 +0000 (08:04 +0200)]
luci-mod-admin-full: improve text contrast in realtime graphs

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1945 from stangri/luci-app-advanced-reboot
Hannu Nyman [Tue, 10 Jul 2018 19:56:57 +0000 (22:56 +0300)]
Merge pull request #1945 from stangri/luci-app-advanced-reboot

luci-app-advanced-reboot: support for Linksys WRT32X

6 years agoluci-app-advanced-reboot: support for Linksys WRT32X
Stan Grishin [Tue, 10 Jul 2018 19:33:23 +0000 (12:33 -0700)]
luci-app-advanced-reboot: support for Linksys WRT32X

Signed-off-by: Stan Grishin <stangri@melmac.net>
6 years agoMerge pull request #1937 from LuKePicci/luci-proto-ppp_pppoe_host-uniq
Dirk Brenken [Mon, 9 Jul 2018 19:55:02 +0000 (21:55 +0200)]
Merge pull request #1937 from LuKePicci/luci-proto-ppp_pppoe_host-uniq

luci-proto-ppp: expose pppoe host_uniq tag setting

6 years agoluci-proto-ppp: expose pppoe host_uniq tag setting
LuKePicci [Mon, 9 Jul 2018 15:53:08 +0000 (17:53 +0200)]
luci-proto-ppp: expose pppoe host_uniq tag setting

Signed-off-by: Luca Piccirillo <luca.piccirillo@gmail.com>
6 years agoluci-base: fix placement of CBI strings
Jo-Philipp Wich [Mon, 9 Jul 2018 15:04:10 +0000 (17:04 +0200)]
luci-base: fix placement of CBI strings

Commit c0de036b3 ("treewide: always include cbi.js") improperly removed the
cbi.js script include from header.htm, leaving behind the string dictionary.

Move the JSON dictionary to the parent <form> element and delete the
leftover </script> element.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-material: table layout fixes and minor CSS corrections
Jo-Philipp Wich [Mon, 9 Jul 2018 09:50:51 +0000 (11:50 +0200)]
luci-theme-material: table layout fixes and minor CSS corrections

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-app-adblock: align blocklist markup with recent changes
Jo-Philipp Wich [Mon, 9 Jul 2018 09:46:11 +0000 (11:46 +0200)]
luci-app-adblock: align blocklist markup with recent changes

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: rework connection status table handling
Jo-Philipp Wich [Mon, 9 Jul 2018 09:13:06 +0000 (11:13 +0200)]
luci-mod-admin-full: rework connection status table handling

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: cbi.js: avoid setting empty cell title attributes
Jo-Philipp Wich [Mon, 9 Jul 2018 09:09:57 +0000 (11:09 +0200)]
luci-base: cbi.js: avoid setting empty cell title attributes

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-bootstrap: add CSS fixes for IE 11
Jo-Philipp Wich [Sat, 7 Jul 2018 13:26:03 +0000 (15:26 +0200)]
luci-theme-bootstrap: add CSS fixes for IE 11

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-openwrt: add CSS fixes for IE 11
Jo-Philipp Wich [Sat, 7 Jul 2018 13:23:39 +0000 (15:23 +0200)]
luci-theme-openwrt: add CSS fixes for IE 11

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: cbi.js: add NodeList.forEach() polyfill for IE 11
Jo-Philipp Wich [Sat, 7 Jul 2018 13:14:43 +0000 (15:14 +0200)]
luci-base: cbi.js: add NodeList.forEach() polyfill for IE 11

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agotreewide: always include cbi.js
Jo-Philipp Wich [Sat, 7 Jul 2018 13:12:47 +0000 (15:12 +0200)]
treewide: always include cbi.js

Include cbi.js in the main header template like it is done for xhr.js and
remove the page specific includes.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: use sans-serif fonts for realtime graph legends
Jo-Philipp Wich [Sat, 7 Jul 2018 13:02:37 +0000 (15:02 +0200)]
luci-mod-admin-full: use sans-serif fonts for realtime graph legends

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: small markup fixes for placeholder texts
Jo-Philipp Wich [Sat, 7 Jul 2018 13:02:16 +0000 (15:02 +0200)]
luci-mod-admin-full: small markup fixes for placeholder texts

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: style and script fixes for realtime bandwidth graph
Jo-Philipp Wich [Sat, 7 Jul 2018 12:59:58 +0000 (14:59 +0200)]
luci-mod-admin-full: style and script fixes for realtime bandwidth graph

 - add Math.log2() polyfill for IE 11
 - use sans-serif font for time axis

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1944 from rwalli/patch-1
Dirk Brenken [Mon, 9 Jul 2018 05:51:20 +0000 (07:51 +0200)]
Merge pull request #1944 from rwalli/patch-1

luci-proto-wireguard: description field

6 years agoAdd description
rwalli [Sun, 8 Jul 2018 17:46:10 +0000 (19:46 +0200)]
Add description

6 years agoMerge pull request #1871 from felixonmars/patch-1
Hannu Nyman [Sat, 7 Jul 2018 17:43:08 +0000 (20:43 +0300)]
Merge pull request #1871 from felixonmars/patch-1

Fix a typo in vizdata.sh

6 years agoMerge pull request #1942 from Rixerx/master
Hannu Nyman [Sat, 7 Jul 2018 13:18:26 +0000 (16:18 +0300)]
Merge pull request #1942 from Rixerx/master

luci-base: update Polish translation

6 years agoluci-base: update Polish translation
Krystian Kozak [Sat, 7 Jul 2018 12:11:17 +0000 (14:11 +0200)]
luci-base: update Polish translation

Updated Polish translations.

Signed-off-by: Krystian Kozak <krystian.kozak20@gmail.com>
6 years agoMerge pull request #1941 from musashino205/l10n/base-upd-ja
Hannu Nyman [Sat, 7 Jul 2018 09:45:17 +0000 (12:45 +0300)]
Merge pull request #1941 from musashino205/l10n/base-upd-ja

luci-base: update Japanese translation

6 years agoluci-base: update Japanese translation
INAGAKI Hiroshi [Sat, 7 Jul 2018 08:56:08 +0000 (17:56 +0900)]
luci-base: update Japanese translation

Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
6 years agoMerge pull request #1939 from Ansuel/luci-nginx
Hannu Nyman [Fri, 6 Jul 2018 15:42:02 +0000 (18:42 +0300)]
Merge pull request #1939 from Ansuel/luci-nginx

luci-nginx: fix nginx dependency

6 years agoluci-nginx: fix nginx dependency
Ansuel Smith [Fri, 6 Jul 2018 15:29:15 +0000 (17:29 +0200)]
luci-nginx: fix nginx dependency

As nginx-ssl is now available, we fix luci-ssl-nginx package dep to use the right package. DRop luci-ssl-openssl-nginx as openssl is needed by nginx anyway.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
6 years agoluci-base: update Ukrainian translation
Yurii [Wed, 4 Jul 2018 14:37:52 +0000 (17:37 +0300)]
luci-base: update Ukrainian translation

Updated with the latest synchronization of the translation, corrections and additions translation.

Signed-off-by: Yurii yuripet@gmail.com
Squashed 2 commits
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
6 years agobase.po: Update chinese translations.
amitabha [Wed, 4 Jul 2018 12:45:51 +0000 (20:45 +0800)]
base.po: Update chinese translations.

Fix some Chinese translations.
Signed-off-by: Angus Ding <angus.ding@gmail.com>
6 years agoluci-theme-bootstrap: minor style fixes
Jo-Philipp Wich [Tue, 3 Jul 2018 16:49:00 +0000 (18:49 +0200)]
luci-theme-bootstrap: minor style fixes

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-base: resync translations
Jo-Philipp Wich [Tue, 3 Jul 2018 16:47:41 +0000 (18:47 +0200)]
luci-base: resync translations

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: rework flashops page markup
Jo-Philipp Wich [Tue, 3 Jul 2018 15:58:00 +0000 (17:58 +0200)]
luci-mod-admin-full: rework flashops page markup

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-app-upnp: add hostname info
Ansuel Smith [Sun, 17 Jun 2018 17:31:43 +0000 (19:31 +0200)]
luci-app-upnp: add hostname info

This adds the hostname info in the index page of luci.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
6 years agoluci-mod-admin-full: fix flashops url generation for config tab
Florian Eckert [Tue, 15 May 2018 13:02:24 +0000 (15:02 +0200)]
luci-mod-admin-full: fix flashops url generation for config tab

If a firmware image is not valid then url generation for the config tab
is wrong. To fix this use the luci.dispatcher.build_url function.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
6 years agoluci-mod-admin-full: check backup.tar.gz on apply
Florian Eckert [Tue, 15 May 2018 09:35:40 +0000 (11:35 +0200)]
luci-mod-admin-full: check backup.tar.gz on apply

If an uploaded backup.tar.gz is not valid we will not get a respond from
LuCI. The system will perform a reboot without applying the "tar.gz"
even though the backup import failed.

To fix this check if the backup archive is valid with the command
"gunzip -t <archive>" and if the validation fails render the flashops page
with a hint. On the other hand apply the backup archive and perform a
reboot as before.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
6 years agoluci-mod-admin-full: improve reboot page
Ansuel Smith [Tue, 5 Jun 2018 20:12:19 +0000 (22:12 +0200)]
luci-mod-admin-full: improve reboot page

This fix problem with empty controller, the check function will never stop to
check if the device finish to reboot and we set more tries to wait the router
for a longer times.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
[reworked markup, simplified logic, removed superfluous alert]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoRevert "luci-lib-json: depend on luci-base"
Jo-Philipp Wich [Tue, 3 Jul 2018 10:30:44 +0000 (12:30 +0200)]
Revert "luci-lib-json: depend on luci-base"

This reverts commit 8ca29efec862350d8d621235999947c329dfaba7.

6 years agoluci-lib-json: depend on luci-base
Jo-Philipp Wich [Tue, 3 Jul 2018 09:07:31 +0000 (11:07 +0200)]
luci-lib-json: depend on luci-base

Fixes #506
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-mod-admin-full: improve Y-axis scaling in bandwidth graph
Jo-Philipp Wich [Tue, 3 Jul 2018 08:56:50 +0000 (10:56 +0200)]
luci-mod-admin-full: improve Y-axis scaling in bandwidth graph

Calculate a peak that causes the vertical scale to use even values.

Fixes #1424.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoMerge pull request #1929 from pleasantone/mwan3_interface_aliases
Jo-Philipp Wich [Tue, 3 Jul 2018 06:07:32 +0000 (08:07 +0200)]
Merge pull request #1929 from pleasantone/mwan3_interface_aliases

luci-app-mwan3: fix aliased interfaces (@wan6)

6 years agoluci-app-mwan3: fix aliased interfaces (@wan6)
Paul Traina [Mon, 2 Jul 2018 23:45:10 +0000 (16:45 -0700)]
luci-app-mwan3: fix aliased interfaces (@wan6)

6 years agoMerge pull request #1925 from YuriPet/master
Hannu Nyman [Mon, 2 Jul 2018 15:35:04 +0000 (18:35 +0300)]
Merge pull request #1925 from YuriPet/master

luci-app-firewall & luci-base: update Ukrainian translation

6 years agoluci-mod-admin-full: fix uci revert success message
Jo-Philipp Wich [Mon, 2 Jul 2018 07:43:05 +0000 (09:43 +0200)]
luci-mod-admin-full: fix uci revert success message

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-openwrt: minor mobile style fixes
Jo-Philipp Wich [Mon, 2 Jul 2018 07:23:56 +0000 (09:23 +0200)]
luci-theme-openwrt: minor mobile style fixes

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
6 years agoluci-theme-openwrt: add further style tweaks
Jo-Philipp Wich [Mon, 2 Jul 2018 06:45:25 +0000 (08:45 +0200)]
luci-theme-openwrt: add further style tweaks

 - slightly increase button color saturation
 - unify margins and paddings

Signed-off-by: Jo-Philipp Wich <jo@mein.io>