webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 11:05:54 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,257 Commits 2 Branches 1 Tag
ea4620fc4abefc4e8c06e2f0f01c10cc4e45e554
Commit Graph

177 Commits

Author SHA1 Message Date
Michael Tremer
b429cc66cb captive: Translate times for coupon expiry time 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-11-29 12:11:58 +00:00
Peter Müller
fb6446d292 correct wrong headline at hardwaregraphs.cgi 
The page description (title and headline) should print
"hardware graphs" instead of only mentioning HDDs.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-11-29 12:01:30 +00:00
Michael Tremer
af6c5929b0 captive: Simplify coupon time selection 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-10-17 15:05:53 +02:00
Michael Tremer
4eecd722b7 Update German translation for captive portal 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:56:04 +01:00
Michael Tremer
497b910855 captive: Verify that the user actually accepted the terms and conditions 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:56:04 +01:00
Michael Tremer
792f1a3bdf captive: Drop duplicate function to list active clients 
There was a function with different name but essentially
same functionality which is already existant in &show_clients().

Therefore this patch drops the old function without any functional
changes.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:56:04 +01:00
Michael Tremer
41964aba09 captive: Redesign clients list box 
Mostly code cleanup

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:56:04 +01:00
Michael Tremer
a0b271e474 captive: Redesign generated coupons table 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:56:04 +01:00
Michael Tremer
810198110e captive: Cleanup logo upload 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:56:04 +01:00
Michael Tremer
e2752bfe71 captive: Save logo in /var/ipfire/captive 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:56:04 +01:00
Michael Tremer
278309b9ef captive: Allow selecting the session expiry time for terms 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:56:04 +01:00
Michael Tremer
97b91e8a94 captive: Rename "Voucher" mode to "Coupon" 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:55:27 +01:00
Michael Tremer
9735e1670a captive: Rename "License" mode to "Terms & Conditions" 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:55:27 +01:00
Michael Tremer
f8d35875d8 captive: Allow selecting highlight colour in web interface 
To be able to customise the access page, we now allow the
user to select a brand colour.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:55:27 +01:00
Michael Tremer
48fb1d3b69 captive: Import new design 
This is the new design of the access page of the captive
portal. It is based on the Bootstrap 4 grid system and
reboot but does not use anything else from it.

It is responsive and customisable.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:54:45 +01:00
Michael Tremer
2d92a4eca4 Update translations 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-09-22 18:54:45 +01:00
Gabriel Rolland
a7f7657c4b Italian translations in it.pl after 110 
Missing or incorrect translations.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2017-05-08 12:10:07 +01:00
Michael Tremer
adb11e90df Always enable asynchronous logging 
This patch always enables asynchronous logging which slows
down the system a lot on slow storage and some virtual environments.

It also removes the configuration options in the web
user interface, since this is not configurable any more.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2016-11-29 12:18:41 +00:00
Michael Tremer
350e29c26f Update translations 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2016-10-03 12:13:43 +01:00
Michael Tremer
5edc06b701 Remove IPAC stuff 
This is unused for a very very very long time and serves
no purpose any more.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2016-10-02 15:13:55 +01:00
Michael Tremer
f62bd2742c Update translation 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2016-08-02 12:18:45 +01:00
Michael Tremer
20b27af863 Update translations 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2016-01-22 00:55:46 +00:00
Michael Tremer
e46f7c44ca Update translations 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2015-12-04 22:22:55 +00:00
Michael Tremer
364452506f Merge remote-tracking branch 'ms/dhcp-rfc2136-broken-down' into next 2015-10-21 13:50:31 +01:00
Michael Tremer
49c64a0993 Update translation 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2015-09-10 13:38:43 +01:00
Michael Tremer
f6529a04a3 IPsec: Add option to force using MOBIKE 
Some peers that are behind a NAT router that fails
to properly forward IKE packets on UDP port 500 cannot
establish an IPsec connection. MOBIKE tries to solve that
by sending these packets to UDP port 4500 instead.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2015-09-10 13:35:24 +01:00
Michael Tremer
4b02b4045b ipsec: Allow selection of ESP group type 
If a connection is edited, the IKE group types will be used instead.

Fixes #10860

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Tested-by: Wolfgang Apolinarski <wolfgang.apolinarski@web.de>
 2015-06-15 22:33:28 +02:00
Michael Tremer
1e23f7cf48 Update translations 2015-05-28 14:50:16 +02:00
Michael Tremer
0389942c2b Update translations 2015-04-18 16:16:01 +02:00
Arne Fitzenreiter
30986dbf03 Merge remote-tracking branch 'origin/master' into next 2015-04-14 20:26:21 +02:00
Michael Tremer
c023275154 Update translations 2015-04-14 20:06:19 +02:00
Michael Tremer
ca6be40f92 Update translations 2015-04-04 13:17:34 +02:00
Michael Tremer
97af8b2b85 Update translations 2015-01-13 17:37:41 +01:00
Ersan Yildirim
95a1679c6b Update Turkish translation 2014-10-13 10:19:45 +02:00
Michael Tremer
39f5352fdb Update translations. 2014-07-27 12:02:17 +02:00
Michael Tremer
2deb75c0f3 Merge remote-tracking branch 'ms/squid-ad' into next 2014-07-27 12:01:50 +02:00
Michael Tremer
dc74d0fd94 Update translations. 
Add some missing strings that have been accidentially
been removed when a commit was reverted.
 2014-07-10 11:27:34 +02:00
Michael Tremer
4cb7c9b47f Update translations. 2014-06-17 19:48:34 +02:00
Michael Tremer
0ffbb688d3 samba: Add GUI functionality to join a domain. 2014-06-10 20:15:32 +02:00
Arne Fitzenreiter
6335e4a605 langs: add monitor port text. 2014-06-06 17:20:52 +02:00
Michael Tremer
30b1c1c728 Re-add missing language string "DNS Servers". 2014-05-18 13:35:02 +02:00
Erik Kapfer
f527e53f54 ovpn_fixes: Fixed some typos and strcture. 
Fixes #10462#c21.

Conflicts:
	html/cgi-bin/ovpnmain.cgi
	langs/de/cgi-bin/de.pl
	langs/en/cgi-bin/en.pl
 2014-05-14 21:26:42 +02:00
Michael Tremer
661cd276b6 Merge remote-tracking branch 'ummeegge/openvpn' into next 
Conflicts:
	html/cgi-bin/ovpnmain.cgi
	langs/de/cgi-bin/de.pl
	langs/en/cgi-bin/en.pl
 2014-05-11 18:47:11 +02:00
Michael Tremer
b2e75449a9 Revert "OpenVPN:Add HMAC, cipher 'n2n' and DH key selection. Fixes and new design." 
This reverts commit c2b5d12b34.

Conflicts:
	langs/de/cgi-bin/de.pl
	langs/en/cgi-bin/en.pl
 2014-05-11 18:34:34 +02:00
Michael Tremer
03d0b8c7e8 Merge branch 'master' into next 
Conflicts:
	doc/language_issues.nl
	doc/language_issues.tr
 2014-05-09 01:31:43 +02:00
Michael Tremer
c80303cd45 Merge remote-tracking branch 'ms/modem-status' into next 
Conflicts:
	doc/language_issues.es
	doc/language_issues.fr
	doc/language_issues.nl
	doc/language_issues.pl
	doc/language_issues.ru
	doc/language_issues.tr
	doc/language_missings
 2014-04-21 14:02:17 +02:00
Michael Tremer
96c1f6dea4 Update translations. 2014-04-17 12:40:04 +02:00
Michael Tremer
c5e3d520e9 Add modem status page. 
On this page, much useful information is displayed about
the hardware and the status of an LTE/3G or other kinds
of modems that respond to AT commands.
 2014-04-16 16:05:12 +02:00
Michael Tremer
1d3c37402c Merge remote-tracking branch 'ummeegge/openvpn' into next 2014-04-13 15:45:44 +02:00
Michael Tremer
cc81c43053 firewall: Fix spelling and seperate spelling issues. 2014-04-12 16:01:11 +02:00