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

61 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
INAGAKI Hiroshi
e1e5509c92 luci-app-adblock: Fix LuCI i18n-tools detection issues 
LuCI i18n-tools cannot interpret variables, so translations on that are
not applied in po/pot by i18n-tools.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
 2017-09-11 22:08:37 +09:00
Dirk Brenken
f46f3e5124 luci-app-adblock: sync with adblock 3.0.0 
Signed-off-by: Dirk Brenken <dev@brenken.org>
 2017-09-09 21:09:28 +02:00
Dirk Brenken
0f13f7eb81 luci-app-adblock: sync with adblock 2.8.5 
* add preliminary kresd support
* small fixes

Signed-off-by: Dirk Brenken <dev@brenken.org>
 2017-08-04 11:12:03 +02:00
Dirk Brenken
985f0f5118 luci-app-adblock: bugfix 
* fix nil error on overview page

Signed-off-by: Dirk Brenken <dev@brenken.org>
 2017-07-05 21:31:56 +02:00
Dirk Brenken
3c5e41d369 luci-app-adblock: sync with adblock 2.8.1 
* add bind support

Signed-off-by: Dirk Brenken <dev@brenken.org>
 2017-06-29 12:58:33 +02:00
Dirk Brenken
bd482566f4 luci-app-adblock: sync with adblock 2.7.1 
* "Save & Reply" now distinguish between normal and manual/backup mode
  and triggers an appropriate reload or a start action

Signed-off-by: Dirk Brenken <dev@brenken.org>
 2017-06-09 20:18:23 +02:00
Dirk Brenken
22c252e2cd luci-app-adblock: sync with adblock 2.7.0 
* add new 'Manual mode' option

Signed-off-by: Dirk Brenken <dev@brenken.org>
 2017-06-07 19:33:31 +02:00
INAGAKI Hiroshi
bc6e0c217f luci-app-adblock: Fix duplicated text 
Added text "Input file not found. Please check your configuration." by
commit 9b4b1df is duplicated. so I replaced the text with previously
existed.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
 2017-05-09 19:14:24 +09:00
Dirk Brenken
9b4b1dfebd luci-app-adblock: sync with adblock 2.6.3 
* Limit Blacklist/Whitelist Online editing to max. 512 KB, approx.
20.000 domains per list
* Automatically refresh the overview page after button onclick event,
e.g. 'Suspend/Resume' or 'Save & Apply'
* cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
 2017-05-08 11:15:19 +02:00
Dirk Brenken
2dd0bae805 luci-app-adblock: fix markup 
Signed-off-by: Dirk Brenken <dev@brenken.org>
 2017-04-26 23:31:11 +02:00
Dirk Brenken
0e80aba7b1 luci-app-adblock: sync with 2.6.1 
* add two new extra options
* cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
 2017-04-25 23:17:08 +02:00
Dirk Brenken
b234897789 luci-app-adblock: sync with 2.6.0-2 
* made default trigger delay more conservative to fix possible start up
issues
* add luci-lib-jsonc dependency

Signed-off-by: Dirk Brenken <dev@brenken.org>
 2017-04-17 17:52:27 +02:00
Dirk Brenken
3096af833b luci-app-adblock: sync with adblock 2.6.0 
* add new trigger timeout input field
* the download utility plus SSL Library will be listed in runtime
  information and the blocklist source table contains an additional 
  "SSL req." column
* various small fixes
* changed copyright notice

Signed-off-by: Dirk Brenken <dev@brenken.org>
 2017-04-12 11:56:02 +02:00
Dirk Brenken
03ae05549d luci-app-adblock: sync with adblock 2.5.1 
* made buttons translatable
* accept empty values for interface trigger input field
* replace 'url' with 'luci.dispatcher.build_url'

Signed-off-by: Dirk Brenken <dev@brenken.org>
 2017-04-04 14:11:41 +02:00
Dirk Brenken
a9ae300673 luci-app-adblock: fix XHTML/HTML5 markup 
* fix XHTML parsing errors in openwrt theme
* tested with openwrt, bootstrap & material theme

Signed-off-by: Dirk Brenken <dev@brenken.org>
 2017-03-28 20:05:03 +02:00
Hannu Nyman
0ca4e3b883 Merge pull request #1083 from dibdot/luci-app-adblock 
luci-app-adblock: small fixes in overview tab
 2017-03-27 14:25:49 +03:00
Dirk Brenken
f2264da43c luci-app-adblock: small fixes in overview tab 
* mute stderr in syscalls
* better suspend/resume button handling

Signed-off-by: Dirk Brenken <dev@brenken.org>
 2017-03-27 11:36:41 +02:00
INAGAKI Hiroshi
d3fecae59e luci-app-adblock: Fix display issues with translation 
Fixed display issues when applying translation.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
 2017-03-27 14:38:52 +09:00
Dirk Brenken
1bc3833e68 luci-app-adblock: major update 
* multi-tab navigation
  Overview/View Logfile/Advanced
  Advanced: Edit Blacklist/Whitelist/Configuration
  Query domains
* all adblock options are now configurable via LuCI

Signed-off-by: Dirk Brenken <dev@brenken.org>
 2017-03-26 08:49:02 +02:00
Dirk Brenken
d3a74836b7 luci-app-adblock: put backup options to global section 
this PR reflect the changes made in adblock 2.3.0

Signed-off-by: Dirk Brenken <dev@brenken.org>
 2017-02-05 08:02:39 +01:00
Hannu Nyman
0f0d036d02 luci-app-adblock: Adjust to adblock 2.0 
Modify the LuCI app to match the simplified adblock 2.0

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
 2016-12-20 13:44:11 +02:00