Hsing-Wang Liao [Sun, 9 Apr 2017 06:54:32 +0000 (14:54 +0800)]
luci-base: Update Simplified Chinese translation
Signed-off-by: Hsing-Wang Liao <kuoruan@gmail.com>
Hannu Nyman [Thu, 6 Apr 2017 20:01:48 +0000 (23:01 +0300)]
Merge pull request #1071 from TDT-GmbH/add-force-link-option
luci-mod-admin-full: Add force link option in interfaces advanced settings section
Hannu Nyman [Thu, 6 Apr 2017 19:00:23 +0000 (22:00 +0300)]
Merge pull request #1099 from musashino205/mwan3-upd-ja
luci-app-mwan3: Update Japanese translation
INAGAKI Hiroshi [Thu, 6 Apr 2017 18:53:13 +0000 (03:53 +0900)]
luci-app-mwan3: Update Japanese translation
Synchronized translations with sources and updated japanese
translations.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Hannu Nyman [Thu, 6 Apr 2017 08:11:37 +0000 (11:11 +0300)]
Merge pull request #1094 from TDT-GmbH/luci-app-mwan3-update
luci-app-mwan3: update interfaceconfig page with new params
Hannu Nyman [Tue, 4 Apr 2017 15:06:19 +0000 (18:06 +0300)]
Merge pull request #1098 from musashino205/mwan3-add-ja
luci-app-mwan3: Add Japanese translation
Hannu Nyman [Tue, 4 Apr 2017 15:05:35 +0000 (18:05 +0300)]
Merge pull request #1097 from musashino205/adblk-upd-ja
luci-app-adblock: Update Japanese translation
INAGAKI Hiroshi [Tue, 4 Apr 2017 14:33:16 +0000 (23:33 +0900)]
luci-app-adblock: Update Japanese translation
Added and Modified some Japanese translations.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
INAGAKI Hiroshi [Tue, 4 Apr 2017 14:28:50 +0000 (23:28 +0900)]
luci-app-adblock: Sync translations
Synchronized translations with sources.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
INAGAKI Hiroshi [Tue, 4 Apr 2017 13:49:38 +0000 (22:49 +0900)]
luci-app-mwan3: Add Japanese translation
Added po templates and Japanese translations.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Hannu Nyman [Tue, 4 Apr 2017 12:28:44 +0000 (15:28 +0300)]
Merge pull request #1096 from dibdot/app-adblock
luci-app-adblock: sync with adblock 2.5.1
Dirk Brenken [Tue, 4 Apr 2017 12:11:41 +0000 (14:11 +0200)]
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>
Hannu Nyman [Tue, 4 Apr 2017 11:10:07 +0000 (14:10 +0300)]
Merge pull request #1095 from musashino205/adblk-upd-ja
luci-app-adblock: Update Japanese translation
INAGAKI Hiroshi [Tue, 4 Apr 2017 11:04:51 +0000 (20:04 +0900)]
luci-app-adblock: Update Japanese translation
Updated Japanese translation.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Florian Eckert [Mon, 3 Apr 2017 09:19:56 +0000 (11:19 +0200)]
luci-app-mwan3: add me as co maintainer
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Florian Eckert [Mon, 3 Apr 2017 09:16:42 +0000 (11:16 +0200)]
luci-app-mwan3: add failure and recovery interval
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Florian Eckert [Mon, 3 Apr 2017 09:04:34 +0000 (11:04 +0200)]
luci-app-mwan3: call translatef funktion if reasonable
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Hannu Nyman [Sun, 2 Apr 2017 20:56:34 +0000 (23:56 +0300)]
Merge pull request #1093 from musashino205/base-upd-ja
luci-base: Update Japanese translation
INAGAKI Hiroshi [Sun, 2 Apr 2017 17:32:28 +0000 (02:32 +0900)]
luci-base: Update Japanese translation
Updated Japanese translations.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Hannu Nyman [Fri, 31 Mar 2017 13:09:33 +0000 (16:09 +0300)]
Merge pull request #1091 from TDT-GmbH/mwan3-add-params
Mwan3 add params
Florian Eckert [Fri, 31 Mar 2017 12:57:27 +0000 (14:57 +0200)]
luci-app-mwan3: add new ip family param
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Florian Eckert [Fri, 31 Mar 2017 12:56:06 +0000 (14:56 +0200)]
luci-app-mwan3: add new conntrack flash param
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Florian Eckert [Fri, 31 Mar 2017 12:52:45 +0000 (14:52 +0200)]
luci-app-mwan3: add new ping size param
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Hannu Nyman [Thu, 30 Mar 2017 16:46:27 +0000 (19:46 +0300)]
Merge pull request #1090 from musashino205/i18n-sync
i18n: Sync translations
INAGAKI Hiroshi [Thu, 30 Mar 2017 15:50:22 +0000 (00:50 +0900)]
i18n: Sync translations
Synchronized all translations.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Hannu Nyman [Tue, 28 Mar 2017 18:12:27 +0000 (21:12 +0300)]
Merge pull request #1088 from dibdot/luci-app-adblock
luci-app-adblock: fix XHTML/HTML5 markup
Dirk Brenken [Tue, 28 Mar 2017 18:05:03 +0000 (20:05 +0200)]
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>
Hannu Nyman [Mon, 27 Mar 2017 14:22:07 +0000 (17:22 +0300)]
Merge pull request #1085 from musashino205/adblk-upd-ja
luci-app-adblock: Update Japanese translation
INAGAKI Hiroshi [Mon, 27 Mar 2017 13:20:46 +0000 (22:20 +0900)]
luci-app-adblock: Update Japanese translation
Added Japanese translations of recently added strings.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
INAGAKI Hiroshi [Mon, 27 Mar 2017 13:04:31 +0000 (22:04 +0900)]
luci-app-adblock: Sync translations
Synchronized translations with Lua sources.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Hannu Nyman [Mon, 27 Mar 2017 11:25:49 +0000 (14:25 +0300)]
Merge pull request #1083 from dibdot/luci-app-adblock
luci-app-adblock: small fixes in overview tab
Hannu Nyman [Mon, 27 Mar 2017 10:33:45 +0000 (13:33 +0300)]
Merge pull request #1084 from musashino205/adblk-fix-translation
luci-app-adblock: Fix display issues with translation
Dirk Brenken [Mon, 27 Mar 2017 09:36:41 +0000 (11:36 +0200)]
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>
INAGAKI Hiroshi [Mon, 27 Mar 2017 05:38:52 +0000 (14:38 +0900)]
luci-app-adblock: Fix display issues with translation
Fixed display issues when applying translation.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Hannu Nyman [Sun, 26 Mar 2017 14:40:55 +0000 (17:40 +0300)]
Merge pull request #1082 from musashino205/adblock-fix-call
luci-app-adblock: Fix package call from buildroot
INAGAKI Hiroshi [Sun, 26 Mar 2017 14:15:03 +0000 (23:15 +0900)]
luci-app-adblock: Fix package call from buildroot
Cannot load this package in buildroot, so I fixed package call from
buildroot in the Makefile.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Hannu Nyman [Sun, 26 Mar 2017 11:15:07 +0000 (14:15 +0300)]
Merge pull request #1080 from dibdot/luci-app-adblock
luci-app-adblock: major update
Hannu Nyman [Sun, 26 Mar 2017 11:13:39 +0000 (14:13 +0300)]
Merge pull request #1081 from musashino205/clamav-add-ja
luci-app-clamav: Add Japanese translation
Dirk Brenken [Sat, 25 Mar 2017 20:58:51 +0000 (21:58 +0100)]
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>
INAGAKI Hiroshi [Sun, 26 Mar 2017 06:24:16 +0000 (15:24 +0900)]
luci-app-clamav: Add Japanese translation
Added po templates and Japanese translations.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Hannu Nyman [Tue, 21 Mar 2017 19:12:53 +0000 (21:12 +0200)]
Merge pull request #1076 from musashino205/sadb-add-ja
luci-app-simple-adblock: Add Japanese translation
INAGAKI Hiroshi [Tue, 21 Mar 2017 19:00:26 +0000 (04:00 +0900)]
luci-app-simple-adblock: Add Japanese translation
Added Japanese translations.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Hannu Nyman [Sun, 19 Mar 2017 14:55:45 +0000 (16:55 +0200)]
Merge pull request #956 from lucize/master
Add luci-proto-ncm for comgt-ncm
Hannu Nyman [Sat, 18 Mar 2017 14:56:41 +0000 (16:56 +0200)]
Merge pull request #1063 from stangri/luci-app-simple-adblock
luci-app-simple-adblock: initial commit
Hannu Nyman [Wed, 15 Mar 2017 16:14:33 +0000 (18:14 +0200)]
Merge pull request #1026 from danrl/mwan
luci-app-mwan3: initial commit
Hannu Nyman [Wed, 15 Mar 2017 14:11:29 +0000 (16:11 +0200)]
Merge pull request #1025 from danrl/cshark
luci-app-cshark: initial commit
Florian Eckert [Tue, 14 Mar 2017 13:22:01 +0000 (14:22 +0100)]
luci-base: update i18n
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Florian Eckert [Tue, 14 Mar 2017 13:11:10 +0000 (14:11 +0100)]
luci-mod-admin-full: add advanced force_link option
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Jo-Philipp Wich [Tue, 14 Mar 2017 11:52:22 +0000 (12:52 +0100)]
luci-app-firewall: adjust drop_invalid default (#1068)
Since firewall3 commit
b33f78371e7c7b6a131c2b6c01673cbd4b3c13d1 the
drop_invalid option is off by default.
Adjust LuCI view to properly handle the changed semantics.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Hannu Nyman [Tue, 14 Mar 2017 08:17:34 +0000 (10:17 +0200)]
Merge pull request #1066 from TDT-GmbH/openvpn-fix-refactoring
luci-app-openvpn: fix prettify refactoring
Florian Eckert [Tue, 14 Mar 2017 08:11:45 +0000 (09:11 +0100)]
luci-app-openvpn: fix prettify refactoring
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Hannu Nyman [Mon, 13 Mar 2017 08:21:02 +0000 (10:21 +0200)]
Merge pull request #1065 from stangri/luci-app-vpnbypass
luci-app-vpnbypass: updated service start/enable logic.
Stan Grishin [Sun, 5 Mar 2017 18:25:00 +0000 (10:25 -0800)]
luci-app-vpnbypass: updated service start/enable logic.
Stan Grishin [Thu, 26 Jan 2017 22:47:53 +0000 (14:47 -0800)]
luci-app-simple-adblock: initial commit of companion package to simple-adblock
luci-app-simple-adblock: bumped version number to match main package
Signed-off-by: Stan Grishin <stangri@melmac.net>
Hannu Nyman [Thu, 9 Mar 2017 20:25:16 +0000 (22:25 +0200)]
Merge pull request #1059 from TDT-GmbH/openvpn_prettify
luci-app-openvpn: prettify openvpn-advanced parameter set
Florian Eckert [Thu, 9 Mar 2017 15:15:36 +0000 (16:15 +0100)]
luci-app-openvpn: prettify openvpn-advanced parameter set
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Jo-Philipp Wich [Tue, 7 Mar 2017 15:40:04 +0000 (16:40 +0100)]
Merge pull request #1057 from TDT-GmbH/base-dhcp-de
luci-base: update german translation
Florian Eckert [Tue, 7 Mar 2017 10:33:36 +0000 (11:33 +0100)]
luci-base: update german translation
Added some missing german translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Hannu Nyman [Sun, 5 Mar 2017 14:38:01 +0000 (16:38 +0200)]
Merge pull request #1054 from stangri/luci-app-vpnbypass
luci-app-vpnbypass: directly enable service from Web UI.
Stan Grishin [Sun, 5 Mar 2017 13:42:31 +0000 (05:42 -0800)]
luci-app-vpnbypass: directly enable service from Web UI.
Signed-off-by: Stan Grishin <stangri@melmac.net>
Hannu Nyman [Sat, 4 Mar 2017 20:10:54 +0000 (22:10 +0200)]
Merge pull request #1047 from hafu/ffp-profile
community-profiles: update Potsdam
Hannu Nyman [Sat, 4 Mar 2017 10:26:30 +0000 (12:26 +0200)]
i18n: sync translations
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Hannu Nyman [Fri, 3 Mar 2017 20:05:34 +0000 (22:05 +0200)]
Merge pull request #1051 from luizluca/pt-br-update
luci-app-wireguard: Add pt-br translation
Luiz Angelo Daros de Luca [Fri, 3 Mar 2017 18:27:03 +0000 (15:27 -0300)]
luci-app-wireguard: Add pt-br translation
Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
Hannes Fuchs [Wed, 1 Mar 2017 10:05:52 +0000 (11:05 +0100)]
updated community-profile for potsdam
- fixed ssid
- disable IPv6
- added more interface settings
- added settings for 5GHz wifi
- added ssidscheme
- added dhcp leasetime setting
- added LinkQualityAlgorithm for olsrd
Signed-off-by: Hannes Fuchs <hannes.fuchs@gmx.org>
Hannu Nyman [Wed, 1 Mar 2017 07:50:58 +0000 (09:50 +0200)]
Merge pull request #997 from hnyman/madwifi-cleanup
treewide: cleanup references to madwifi
Hannu Nyman [Tue, 28 Feb 2017 16:57:31 +0000 (18:57 +0200)]
meshwizard: cleanup references to madwifi
Remove the code related to the deprecated madwifi driver.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Hannu Nyman [Tue, 28 Feb 2017 16:56:52 +0000 (18:56 +0200)]
freifunk-common: cleanup references to madwifi
Remove the code related to the deprecated madwifi driver.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Hannu Nyman [Tue, 28 Feb 2017 16:55:11 +0000 (18:55 +0200)]
treewide: cleanup references to madwifi from LuCI
Remove the code related to the deprecated madwifi driver.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Hannu Nyman [Tue, 28 Feb 2017 12:24:20 +0000 (14:24 +0200)]
Merge pull request #1043 from hnyman/ieee80211
luci-mod-admin-full: new hostapd functionality for 80211w/r detection
Hannu Nyman [Tue, 28 Feb 2017 12:16:19 +0000 (14:16 +0200)]
luci-mod-admin-full: new hostapd functionality for 80211w/r detection
Use the new hostapd functionality (in LEDE) to detect 802.11r and 802.11w
more properly. Leave the old logic in place for Openwrt.
Adjust 802.11w default value from "0" to "" in order to avoid unnecessary
"option ieee80211w 0" lines in /etc/config/wireless
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Hannu Nyman [Mon, 27 Feb 2017 21:05:46 +0000 (23:05 +0200)]
Merge pull request #1042 from musashino205/wg-add-ja
luci-app-wireguard: Add Japanese translation
INAGAKI Hiroshi [Mon, 27 Feb 2017 20:37:11 +0000 (05:37 +0900)]
luci-app-wireguard: Add Japanese translation
Added po templates file and Japanese translations.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Hannu Nyman [Mon, 27 Feb 2017 19:50:52 +0000 (21:50 +0200)]
Merge pull request #1039 from danrl/luci-proto-wireguard
luci-proto-wireguard: add support for fwmark option
danrl [Fri, 24 Feb 2017 14:03:11 +0000 (15:03 +0100)]
luci-proto-wireguard: add support for fwmark option
Adds support for the fwmark option.
FwMark is a 32-bit fwmark for outgoing packets.
If set to 0 or "off", this option is disabled.
Signed-off-by: Dan Luedtke <mail@danrl.com>
Hannu Nyman [Mon, 27 Feb 2017 14:50:52 +0000 (16:50 +0200)]
Merge pull request #1038 from danrl/luci-app-wireguard
luci-app-wireguard: performance+ (no more sys.exec calls)
danrl [Fri, 24 Feb 2017 08:26:03 +0000 (09:26 +0100)]
luci-app-wireguard: performance+ (less sys.exec calls)
Thanks to latest developments in wireguard-tools, we can now
fetch all data we need for display using a single sys.exec()
call instead of multiple ones. This application is now
significantly smaller and runs much faster.
Added Firewall Mark feature.
Signed-off-by: Dan Luedtke <mail@danrl.com>
Hannu Nyman [Sun, 26 Feb 2017 18:25:33 +0000 (20:25 +0200)]
Merge pull request #1005 from kdarbyshirebryant/miniupnpenable
luci-minuupnpd: use enable flag
Hannu Nyman [Sun, 26 Feb 2017 17:58:18 +0000 (19:58 +0200)]
Merge pull request #1037 from musashino205/adblock-upd-ja
luci-app-adblock: Update Japanese translation
Hannu Nyman [Sun, 26 Feb 2017 17:50:25 +0000 (19:50 +0200)]
Merge pull request #1034 from feckert/bootstrap_javascript_warning
luci-theme-boostrap: add javascript warning if disabled
Christian Schoenebeck [Sat, 25 Feb 2017 20:32:21 +0000 (21:32 +0100)]
Merge pull request #1036 from luizluca/pt-br-update
i18n: complete pt-br translation
Kevin Darbyshire-Bryant [Sat, 11 Feb 2017 20:31:58 +0000 (20:31 +0000)]
luci-minuupnpd: use enable flag
Add a 'master' miniupnpd service enable flag rather than just relying on
rcS.d script existence. This allows the service to be disabled
across sysupgrade, similar to minidlna.
Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
INAGAKI Hiroshi [Thu, 23 Feb 2017 06:11:41 +0000 (15:11 +0900)]
luci-app-adblock: Update Japanese translation
Improved existing translations.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Luiz Angelo Daros de Luca [Mon, 20 Feb 2017 21:15:47 +0000 (18:15 -0300)]
i18n: complete pt-br translation
Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
Florian Eckert [Tue, 21 Feb 2017 14:16:49 +0000 (15:16 +0100)]
luci-theme-boostrap: add JavaScript warning if disabled
Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com>
Florian Eckert [Wed, 22 Feb 2017 09:09:46 +0000 (10:09 +0100)]
luci-base/po: update JavaScript nameing
Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com>
Florian Eckert [Wed, 22 Feb 2017 09:09:04 +0000 (10:09 +0100)]
luci-theme-openwrt: fix JavaScript nameing
Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com>
Florian Eckert [Wed, 22 Feb 2017 09:08:08 +0000 (10:08 +0100)]
luci-theme-freifunk-generic: fix JavaScript naming
Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com>
Hannu Nyman [Tue, 21 Feb 2017 12:32:32 +0000 (14:32 +0200)]
Merge pull request #1032 from feckert/update_base_po
luci-base: sync translations
Florian Eckert [Tue, 21 Feb 2017 12:06:02 +0000 (13:06 +0100)]
luci-base: sync translations
Signed-off-by: Florian Eckert <Eckert.Florian@googlemail.com>
Hannu Nyman [Tue, 21 Feb 2017 09:00:16 +0000 (11:00 +0200)]
Merge pull request #1027 from danrl/lxc
luci-app-lxc: initial commit
danrl [Fri, 17 Feb 2017 10:07:34 +0000 (11:07 +0100)]
luci-app-lxc: initial commit
Moved over here from the packages repository.
Signed-off-by: Dan Luedtke <mail@danrl.com>
Hannu Nyman [Tue, 21 Feb 2017 08:17:07 +0000 (10:17 +0200)]
Merge pull request #1030 from danrl/luci-app-wireguard
luci-app-wireguard: resolve meta package in depdencies
danrl [Tue, 21 Feb 2017 07:59:32 +0000 (08:59 +0100)]
luci-app-wireguard: resolve meta package in depdencies
Signed-off-by: Dan Luedtke <mail@danrl.com>
Jo-Philipp Wich [Mon, 20 Feb 2017 13:34:16 +0000 (14:34 +0100)]
luci.mk: only use remote branch detection
LEDE's scripts/feeds script creates local branches named after the checked
out commit hash, confusing local branch detection.
Solely use remote branch detection to avoid misidentifying such cases.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Mon, 20 Feb 2017 13:14:49 +0000 (14:14 +0100)]
luci.mk: fix branch detection in detached HEAD state
When LuCI is checked out via pinned feeds configuration, its source tree will
end up in detached head state, requiring some more magic to figure out the
proper branch.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Hannu Nyman [Sun, 19 Feb 2017 14:13:19 +0000 (16:13 +0200)]
Merge pull request #1022 from danrl/luci-app-wireguard
luci-app-wireguard: initial commit
danrl [Fri, 17 Feb 2017 10:22:01 +0000 (11:22 +0100)]
luci-app-mwan3: initial commit
Moved over here from the packages repository.
Signed-off-by: Dan Luedtke <mail@danrl.com>
danrl [Fri, 17 Feb 2017 10:08:46 +0000 (11:08 +0100)]
luci-app-cshark: initial commit
Moved over here from the packages repository.
Signed-off-by: Dan Luedtke <mail@danrl.com>
Hannu Nyman [Fri, 17 Feb 2017 07:07:47 +0000 (09:07 +0200)]
Merge pull request #1024 from stangri/luci-app-vpnbypass
luci-app-vpnbypass: add datatypes and placeholders to fields