summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-adblock
AgeCommit message (Collapse)Author
2018-09-20i18n: update pt-br translationLuiz Angelo Daros de Luca
Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2018-09-08Merge pull request #2136 from aft90/luci-app-adblock-query-box-placeholderDirk Brenken
luci-app-adblock: use placeholder in query tool
2018-09-09luci-app-adblock: update Japanese translationINAGAKI Hiroshi
Updated Japanese translations. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-09-07luci-app-adblock: use placeholder in query toolAndrei Troie
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-01Merge pull request #2125 from dibdot/adblockDirk Brenken
luci-app-adblock: sync with adblock 3.5.5
2018-09-01luci-app-adblock: sync with adblock 3.5.5Dirk Brenken
* fix cornercase issues in runtime information/json parsing Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-09-01i18n: sync translationsINAGAKI Hiroshi
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-08-11luci-app: update Chinese translationyangfl
Signed-off-by: David Yang <mmyangfl@gmail.com>
2018-07-31Merge pull request #2019 from dibdot/adblockDirk Brenken
luci-app-adblock: "final" fixes
2018-07-31luci-app-adblock: "final" fixesDirk Brenken
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-28Merge pull request #2006 from dibdot/adblockDirk Brenken
luci-app-adblock: small fixes
2018-07-28luci-app-adblock: small fixesDirk Brenken
* fix possible controller error during json parsing * remaining code cleanup Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-07-25Merge pull request #1997 from dibdot/adblockDirk Brenken
luci-app-adblock: small visual fixes
2018-07-25luci-app-adblock: small visual fixesDirk Brenken
* made readonly textarea (logview) scrollable again (bootstrap theme) * align "Query" input button Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-07-22Merge pull request #1986 from dibdot/adblockJo-Philipp Wich
luci-app-adblock: fix translations
2018-07-22luci-app-adblock: fix translationsDirk Brenken
* fix runtime & button translations Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-07-22Merge pull request #1983 from dibdot/adblockJo-Philipp Wich
luci-app-adblock: sync with adblock 3.5.4
2018-07-22luci-app-adblock: sync with adblock 3.5.4Dirk Brenken
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-21Update Russian translationOlimjon
2018-07-20i18n: sync translationsINAGAKI Hiroshi
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-07-09luci-app-adblock: align blocklist markup with recent changesJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-07-09treewide: always include cbi.jsJo-Philipp Wich
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-06-09Merge pull request #1868 from sotux/master-zh_CNHannu Nyman
Update Simplified Chinese translation
2018-06-09luci-app-adblock: update Simplified Chinese translationZheng Qian
Signed-off-by: Zheng Qian <sotux82@gmail.com>
2018-06-08luci-mod-admin-full: git rid of embedded newlines in translation stringsJo-Philipp Wich
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-08luci-app-adblock: partly revert last commitDirk Brenken
* use now CSS for non breaking spaces in div table header Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-06-07luci-app-adblock: sync with adblock 3.5.3Dirk Brenken
* small fixes & cosmetics Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-05-28treewide: convert HTML tables to divJo-Philipp Wich
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-21luci-app-adblock: update Japanese translationINAGAKI Hiroshi
Updated Japanese translations. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-05-21i18n: sync translationsINAGAKI Hiroshi
Synchronized translations with sources. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-05-18luci-app-adblock: respect SimpleForm size limitDirk Brenken
* respect SimpleForm size limit of 100KB for advanced online editing Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-05-15luci-app-adblock: sync with adblock 3.5.2Dirk Brenken
* 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-09luci-app-adblock: support new workflowDirk Brenken
* adapt Adblock to support the new cbi apply workflow * tested successfully with old & new workflow Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-04-10i18n: sync translations, cleanupHannu Nyman
* sync translations * clean-up old strings from adblock Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2018-04-05luci-app-adblock: fix SimpleForm page delegationJo-Philipp Wich
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-05treewide: filter shell arguments through shellquote() where applicableJo-Philipp Wich
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-03-29i18n: sync translationsINAGAKI Hiroshi
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-03-16Merge pull request #1688 from dibdot/adblockDirk Brenken
luci-app-adblock: remaining fixes
2018-03-16luci-app-adblock: remaining fixesDirk Brenken
* missed in the last (untested) commit - sorry. Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-03-16Merge pull request #1684 from dibdot/adblockDirk Brenken
luci-app-adblock: fix function calls
2018-03-15luci-app-adblock: fix function callsDirk Brenken
* 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-02luci-app-adblock: fix the msgid to keep the translationsINAGAKI Hiroshi
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-02-27luci-app-adblock: fix frontend typoDirk Brenken
fix trivial 'msmtp' typo & changed .po files as well Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-02-08Merge pull request #1627 from user7887/luci-ruHannu Nyman
i18n-ru: fixed russian translation
2018-02-07i18n-ru: fixed russian translationVladimir
Signed-off-by: Vladimir <picfun@ya.ru>
2018-02-03Merge pull request #1623 from dibdot/adblockdibdot
luci-app-adblock: fix XHMTL Markup
2018-02-03luci-app-adblock: fix XHMTL MarkupDirk Brenken
Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-02-03luci-app-adblock: update Japanese translationINAGAKI Hiroshi
Updated Japanese translations. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-02-03luci-app-adblock: sync translationsINAGAKI Hiroshi
Synchronized translations with sources. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
2018-01-31Merge pull request #1614 from dibdot/adblockdibdot
luci-app-adblock: sync with adblock 3.5.0