Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
10366 commits 13 branches 13 tags 306 MiB
Commit graph

169 commits

Author SHA1 Message Date
Dirk Brenken
8c68756e00
Merge pull request #2291 from dibdot/adblock 
luci-app-adblock: adapt latest css changes
 2018-11-16 09:06:54 +01:00
Dirk Brenken
5dd93edefa luci-app-adblock: adapt latest css changes 
Signed-off-by: Dirk Brenken <dev@brenken.org>
 2018-11-16 08:56:32 +01:00
Jo-Philipp Wich
76bf2ac6ce treewide: resync translation files 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-11-15 19:32:53 +01:00
Dirk Brenken
253f912f17 luci-app-adblock: consolidate css 
* fix IE Edge rendering issues
* merge external styles in central css

Signed-off-by: Dirk Brenken <dev@brenken.org>
 2018-11-14 10:45:18 +01:00
Hannu Nyman
89e26911f1 i18n: cleanup old strings 
also sync translations

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
 2018-11-10 21:26:41 +02:00
Hannu Nyman
40de466475 i18n: sync translations, add location annotatations 
Thanks to a recent commit, the translation files will now
have info about locations where the string is used. That
can help is deciding the correct translation, as all contexts
are more easily found.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
 2018-11-07 18:10:59 +02:00
yangfl
dc1c69ce4e i18n: update Chinese translation 
Signed-off-by: David Yang <mmyangfl@gmail.com>
 2018-10-01 11:39:57 +08:00
Luiz Angelo Daros de Luca
728501dd57 i18n: update pt-br translation 
Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
 2018-09-20 21:58:33 -03:00
Dirk Brenken
fb27334aef
Merge pull request #2136 from aft90/luci-app-adblock-query-box-placeholder 
luci-app-adblock: use placeholder in query tool
 2018-09-08 20:23:15 +02:00
INAGAKI Hiroshi
19fa506eff luci-app-adblock: update Japanese translation 
Updated Japanese translations.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
 2018-09-09 02:40:08 +09:00
Andrei Troie
ddaac101a5 luci-app-adblock: use placeholder in query tool 
Use the placeholder property on the textbox in the query tool so it's more convenient.

Signed-off-by: Andrei Troie <andreitroie90@gmail.com>
 2018-09-07 23:59:20 +01:00
Dirk Brenken
e3b060b3a6
Merge pull request #2125 from dibdot/adblock 
luci-app-adblock: sync with adblock 3.5.5
 2018-09-01 17:10:37 +02:00
Dirk Brenken
4e56083833 luci-app-adblock: sync with adblock 3.5.5 
* fix cornercase issues in runtime information/json parsing

Signed-off-by: Dirk Brenken <dev@brenken.org>
 2018-09-01 08:42:00 +02:00
INAGAKI Hiroshi
7cafad8b31 i18n: sync translations 
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
 2018-09-01 02:23:25 +09:00
yangfl
9711120e06 luci-app: update Chinese translation 
Signed-off-by: David Yang <mmyangfl@gmail.com>
 2018-08-11 15:46:07 +08:00
Dirk Brenken
9217240b04
Merge pull request #2019 from dibdot/adblock 
luci-app-adblock: "final" fixes
 2018-07-31 11:26:43 +02:00
Dirk Brenken
b8f8394681 luci-app-adblock: "final" fixes 
during intense testing with different browsers (Chrome/Firefox/partly IE
in a VM) I found & fixed some more minor things:

* remove needless hook & include from overview page
* fix possible JS error in Runtime Information
* Align CSS color with "LuCI standard"

Signed-off-by: Dirk Brenken <dev@brenken.org>
 2018-07-31 09:21:44 +02:00
Dirk Brenken
4a85973a9a
Merge pull request #2006 from dibdot/adblock 
luci-app-adblock: small fixes
 2018-07-28 18:23:47 +02:00
Dirk Brenken
b7ed444cbb luci-app-adblock: small fixes 
* fix possible controller error during json parsing
* remaining code cleanup

Signed-off-by: Dirk Brenken <dev@brenken.org>
 2018-07-28 17:30:18 +02:00
Dirk Brenken
69257be152
Merge pull request #1997 from dibdot/adblock 
luci-app-adblock: small visual fixes
 2018-07-25 21:46:20 +02:00
Dirk Brenken
771672ff7a luci-app-adblock: small visual fixes 
* made readonly textarea (logview) scrollable again (bootstrap theme)
* align "Query" input button

Signed-off-by: Dirk Brenken <dev@brenken.org>
 2018-07-25 21:39:22 +02:00
Jo-Philipp Wich
1961ce6df3
Merge pull request #1986 from dibdot/adblock 
luci-app-adblock: fix translations
 2018-07-22 22:37:01 +02:00
Dirk Brenken
8d7ebf0572 luci-app-adblock: fix translations 
* fix runtime & button translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
 2018-07-22 22:28:26 +02:00
Jo-Philipp Wich
83c86d2934
Merge pull request #1983 from dibdot/adblock 
luci-app-adblock: sync with adblock 3.5.4
 2018-07-22 17:46:04 +02:00
Dirk Brenken
5db2b76497 luci-app-adblock: sync with adblock 3.5.4 
backend:
* add low priority mode (nice level 10), disabled by default
* enhance 'Force DNS' to redirect ports 53, 853 and 5353

frontend:
* switch to dynamic XHR polling for runtime information and logfile
viewing
* add new 'Refresh' button to reload blocklists
* various cleanups & small fixes

Signed-off-by: Dirk Brenken <dev@brenken.org>
 2018-07-22 08:58:33 +02:00
Olimjon
6a151eb70e
Update Russian translation 2018-07-21 02:10:51 +05:00
INAGAKI Hiroshi
86660f92d1 i18n: sync translations 
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
 2018-07-20 15:33:18 +09:00
Jo-Philipp Wich
994531ea26 luci-app-adblock: align blocklist markup with recent changes 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
 2018-07-09 11:51:43 +02:00
Jo-Philipp Wich
c0de036b31 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>
 2018-07-09 11:51:43 +02:00
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