Commit graph

140 commits

Author SHA1 Message Date
Hannu Nyman
fad02ac8d7
Merge pull request #1868 from sotux/master-zh_CN
Update Simplified Chinese translation
2018-06-09 17:53:27 +03:00
Zheng Qian
966e86cd06 luci-app-adblock: update Simplified Chinese translation
Signed-off-by: Zheng Qian <sotux82@gmail.com>
2018-06-09 22:50:49 +08:00
Jo-Philipp Wich
0e0ee2fed5 luci-mod-admin-full: git rid of embedded newlines in translation strings
Also switch one usage of raw '<%_ ... %>' interpolation to '<%: ... %>' in
order to avoid issues with translations using apostrophes.

Globally resnyc translations after the fix.

Fixes #1866.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-06-08 13:50:14 +02:00
Dirk Brenken
45c2059c15 luci-app-adblock: partly revert last commit
* use now CSS for non breaking spaces in div table header

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-06-08 09:34:47 +02:00
Dirk Brenken
a561d3045c luci-app-adblock: sync with adblock 3.5.3
* small fixes & cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-06-07 21:14:06 +02:00
Jo-Philipp Wich
067d7dc9f7 treewide: convert HTML tables to div
Mostly convert HTML tables to div based markup to allow for easier styling
in the future. Also change JS accessor code accordingly.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-05-28 15:18:45 +02:00
INAGAKI Hiroshi
d3c1951cbb luci-app-adblock: update Japanese translation
Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-05-21 23:11:24 +09:00
INAGAKI Hiroshi
b1fd056fa5 i18n: sync translations
Synchronized translations with sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-05-21 01:04:53 +09:00
Dirk Brenken
840f45ecc5 luci-app-adblock: respect SimpleForm size limit
* respect SimpleForm size limit of 100KB for advanced online editing

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-05-18 18:19:41 +02:00
Dirk Brenken
55f251b01f luci-app-adblock: sync with adblock 3.5.2
* archive sub-categories (shalla & ut_capitole) are now configurable
  via LuCI CBI template
* small bugfixes & enhancements

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-05-15 08:00:02 +02:00
Dirk Brenken
3aae6ce82e luci-app-adblock: support new workflow
* adapt Adblock to support the new cbi apply workflow
* tested successfully with old & new workflow

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-05-09 13:35:49 +02:00
Hannu Nyman
b2eceb0bcc i18n: sync translations, cleanup
* sync translations
* clean-up old strings from adblock

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2018-04-10 18:27:07 +03:00
Jo-Philipp Wich
72b973b258 luci-app-adblock: fix SimpleForm page delegation
Invoke the SimpleForm models using the form() action, not the cbi() ones.
This avoids the extraneous rendering of the cbi header template, avoiding
rejected save operations due to duplicated token value.

Fixes #1722.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-04-05 19:21:50 +02:00
Jo-Philipp Wich
c0d9c4f3ce treewide: filter shell arguments through shellquote() where applicable
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-04-05 09:37:43 +02:00
INAGAKI Hiroshi
caf4421603 i18n: sync translations
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-03-29 12:51:13 +09:00
Dirk Brenken
b2fbfedc7e
Merge pull request #1688 from dibdot/adblock
luci-app-adblock: remaining fixes
2018-03-16 13:01:36 +01:00
Dirk Brenken
ab30c8365f luci-app-adblock: remaining fixes
* missed in the last (untested) commit - sorry.

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-03-16 12:59:53 +01:00
Dirk Brenken
d01ddb2928
Merge pull request #1684 from dibdot/adblock
luci-app-adblock: fix function calls
2018-03-16 06:36:31 +01:00
Dirk Brenken
b2cc7bf276 luci-app-adblock: fix function calls
* fix function calls that have an implicit extra parameter self,
  pre-requisite for PR #1681

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-03-15 20:25:30 +01:00
INAGAKI Hiroshi
68bdfc029c luci-app-adblock: fix the msgid to keep the translations
XHTML markup of "&" in the description about "download queue" was fixed
in 71230d2. Since UI text of it no longer matches msgid, I fixed it.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-03-02 02:12:14 +09:00
Dirk Brenken
b1c5a4c075 luci-app-adblock: fix frontend typo
fix trivial 'msmtp' typo & changed .po files as well

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-02-27 10:20:56 +01:00
Hannu Nyman
76f9f5e94d
Merge pull request #1627 from user7887/luci-ru
i18n-ru: fixed russian translation
2018-02-08 18:17:02 +02:00
Vladimir
c21d22c017 i18n-ru: fixed russian translation
Signed-off-by: Vladimir <picfun@ya.ru>
2018-02-07 17:37:34 +03:00
dibdot
e386d76d57
Merge pull request #1623 from dibdot/adblock
luci-app-adblock: fix XHMTL Markup
2018-02-03 11:27:36 +01:00
Dirk Brenken
71230d2b70 luci-app-adblock: fix XHMTL Markup
Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-02-03 11:25:34 +01:00
INAGAKI Hiroshi
69932a9348 luci-app-adblock: update Japanese translation
Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-02-03 00:42:56 +09:00
INAGAKI Hiroshi
7d23262912 luci-app-adblock: sync translations
Synchronized translations with sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-02-03 00:12:59 +09:00
dibdot
518ac523d1
Merge pull request #1614 from dibdot/adblock
luci-app-adblock: sync with adblock 3.5.0
2018-01-31 20:29:05 +01:00
Dirk Brenken
47e0990eac luci-app-adblock: sync with adblock 3.5.0
* Support new 'Download Queue'
* Support new 'Jail' Blocklist Creation
  (replace former 'Whitelist Mode')
* Fix field width in "Runtime Information" section

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-01-31 13:09:55 +01:00
Vladimir
bb87aac852 i18n-ru: Edits on the general pattern of Russian translation
Signed-off-by: Vladimir <picfun@ya.ru>
2018-01-20 14:02:48 +03:00
Vladimir
94f7c302bb i18n-sync change, added project info...
Signed-off-by: Vladimir <picfun@ya.ru>
2018-01-16 21:06:05 +03:00
INAGAKI Hiroshi
f7728794ec luci-app-adblock: update Japanese translation
Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-01-15 15:34:04 +09:00
Vladimir
2162fbcd5a added project info, were reviewed in graphical mode, ready for a stable release
Signed-off-by: Vladimir <picfun@ya.ru>
2018-01-14 11:53:50 +03:00
Vladimir
80181410f2 added project info, were reviewed in graphical mode
Signed-off-by: Vladimir <picfun@ya.ru>
2018-01-13 21:30:52 +03:00
Vladimir
5d48227363 Correction by script i18n-sync.sh with editing of Russian translation
Signed-off-by: Vladimir <picfun@ya.ru>
2018-01-11 19:22:07 +03:00
Vladimir
7e3d52ec08 fixed and updated russian translation
Signed-off-by: Vladimir <picfun@ya.ru>
2018-01-11 01:43:46 +03:00
Hannu Nyman
5d0f0b997d
Merge pull request #1523 from dibdot/adblock
luci-app-adblock: sync with adblock 3.4.3
2018-01-10 23:45:04 +02:00
Dirk Brenken
054935ab7c luci-app-adblock: sync with adblock 3.4.3
* add 'Download Utility' select box
* add new "running" status
* small visual fixes

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-01-10 19:35:39 +01:00
Vladimir
b15fef0b11 fixed russian translation
Signed-off-by: Vladimir <picfun@ya.ru>
2018-01-06 13:39:46 +03:00
Hannu Nyman
bd52bf4625 i18n: sync translations
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2018-01-06 09:40:39 +02:00
Hannu Nyman
7fd4f84aa9
Merge pull request #1502 from dibdot/adblock
luci-app-adblock: sync with adblock 3.4.1
2018-01-05 22:31:09 +02:00
Dirk Brenken
931531310e luci-app-adblock: sync with adblock 3.4.1
* refine logfile search term
* textarea 'autoscroll down' in logfile view
* left-align blocklist source table plus a more compact design

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-01-05 18:56:39 +01:00
Vladimir
e7adf1c1bb fixed and updated russian translation
Signed-off-by: Vladimir <picfun@ya.ru>
2018-01-05 18:08:00 +03:00
Vladimir
76b12b242a fixed and updated russian translation
Signed-off-by: Vladimir <picfun@ya.ru>
[renamed swedish advanced-reboot.po as well, fixed a syntax error,
 filtered updated files through ./build/i18n-sync.sh]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-01-03 21:44:55 +01:00
Dirk Brenken
033e903097 luci-app-adblock: sync with adblock 3.4.0
* add new extra options (disabled by default):
  - Flush DNS Cache
  - Email Notification
  - Email Notification Count

Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-12-27 17:41:28 +01:00
Dirk Brenken
dce8ae85ff luci-app-adblock: fix minor visual issue
* fix visual issue in runtime section (originally provided by @ansuel)

Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-12-04 22:26:18 +01:00
INAGAKI Hiroshi
61cd750363 luci-app-adblock: Update Japanese translation
Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-11-05 13:33:52 +09:00
INAGAKI Hiroshi
47f4469b29 luci-app-adblock: Sync translations
Synchronized translations with sources.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2017-11-05 11:49:53 +09:00
Hannu Nyman
9e325a5162
Merge pull request #1426 from dibdot/app-adblock
luci-app-adblock: sync with adblock 3.1.0
2017-11-04 15:51:41 +02:00
Dirk Brenken
b02a13ea77 luci-app-adblock: sync with adblock 3.1.0
* add support for new 'whitelist mode'
* fix a small css issue in advanced edit tabs

Signed-off-by: Dirk Brenken <dev@brenken.org>
2017-11-04 14:13:22 +01:00