Commit Graph

477 Commits

Author SHA1 Message Date
Michael Tremer
6fde3230a8 Merge branch 'master' into next 2014-05-14 21:30:50 +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
c6d9cb76ab openvpn: Update translation.
DH keys are actually called DH parameters.
2014-05-12 12:54:08 +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
Erik Kapfer
49abe7afb1 OpenVPN:Add HMAC, cipher 'n2n' and DH key selection. Fixes and new design.
Added HMAC algorithm selection menu for N2N and RW.
Added cipher selection menu for N2N connections.
Added DH key selection also for existing installations incl. DH key upload possibility.
Adjusted the ovpn main WUI design to IPSec WUI.
Extend key lenght for CA, cert and control channel with faktor 2.
Some code and typo cleanup.
Bugfixes for #10317, #10149, #10462, #10463
V.2 New changes:
Integrated changes in langs and ovpnmain.cgi until 20.03.2014 2.15-Beta3.
ovpn.cnf have now default bits of 2048 instead of 1024.
ovpn.cnf default_md works now with sha256 instead of md5.
Bugfix: By new installation the auth directive for RWs is faded out #10462 Comment 15.
Added error message if the crl should be displayed but no crl is present.
v.3 New changes #10462 Comment 20:
Updated to core version 77.
Deleted manual name award in DH key upload section, name will be given automatically now.
Added sha512WithRSAEncryption instead of sha1WithRSAEncryption for "Root Certificate".
Added tls-auth support for Roadwarriors.
Added crypto engine support for N2N and Roadwarriors.
2014-05-11 09:24:04 +02:00
Ersan Yildirim
03fa5cba13 Update Turkish translation of the installer and setup. 2014-05-09 15:01:17 +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
Ersan Yildirim
b1f6b33992 Update Turkish translation. 2014-05-05 12:00:57 +02:00
Hans Horsten
c2c246b67c Update Dutch translation. 2014-05-03 13:42:27 +02:00
Michael Tremer
91812c575f Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x 2014-04-29 14:37:58 +02:00
Michael Tremer
742c334a5b entropy.cgi: Show status of rngd. 2014-04-29 13:09:42 +02:00
Arne Fitzenreiter
872d5a1e33 pppsetup: add atm device selection. 2014-04-28 23:36:03 +02:00
Ersan Yildirim Ersan
0327e69412 Update Turkish translation. 2014-04-22 18:00:30 +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
39e96de566 Fix spelling of "IPsec". 2014-04-17 12:44:18 +02:00
Michael Tremer
96c1f6dea4 Update translations. 2014-04-17 12:40:04 +02:00
Alexander Marx
bc595f0985 Firewall: Bug10513 2014-04-17 12:38:59 +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
Erik Kapfer
c2b5d12b34 OpenVPN:Add HMAC, cipher 'n2n' and DH key selection. Fixes and new design.
Added HMAC algorithm selection menu for N2N and RW.
Added cipher selection menu for N2N connections.
Added DH key selection also for existing installations incl. DH key upload possibility.
Adjusted the ovpn main WUI design to IPSec WUI.
Extend key lenght for CA, cert and control channel with faktor 2.
Some code and typo cleanup.
Bugfixes for #10317, #10149, #10462, #10463
V.2 New changes:
Integrated changes in langs and ovpnmain.cgi until 20.03.2014 2.15-Beta3.
ovpn.cnf have now default bits of 2048 instead of 1024.
ovpn.cnf default_md works now with sha256 instead of md5.
Bugfix: By new installation the auth directive for RWs is faded out #10462 Comment 15.
Added error message if the crl should be displayed but no crl is present.
2014-04-13 07:14:25 +02:00
Michael Tremer
cc81c43053 firewall: Fix spelling and seperate spelling issues. 2014-04-12 16:01:11 +02:00
Michael Tremer
2dd3aa93f4 firewall: Change headlines for rule sections. 2014-04-12 15:55:44 +02:00
Michael Tremer
b04a34188c Merge branch 'master' into next
Conflicts:
	doc/language_issues.tr
2014-04-11 15:18:50 +02:00
Alexander Marx
0626fac1ac Firewall: When having rules with more than 3 protocols, show "many" and tooltip 2014-04-11 12:07:41 +02:00
Michael Tremer
62ff8d9627 Fix missing Connection Scheduler strings. 2014-04-09 15:11:41 +02:00
Ersan Yildirim
8824d89482 Update Turkish translation. 2014-04-06 17:22:31 +02:00
Michael Tremer
41dfa08d2a Merge branch 'ppp-update' into beyond-next 2014-03-26 23:43:04 +01:00
Michael Tremer
36d809efb6 media.cgi: Fix typo 'writen'. 2014-03-26 23:34:58 +01:00
Michael Tremer
296a73a532 Merge remote-tracking branch 'alfh/feature_firewalllogcountry' into beyond-next
Conflicts:
	langs/de/cgi-bin/de.pl
2014-03-20 23:15:49 +01:00
Michael Tremer
dd29d563a6 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into beyond-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-03-20 23:14:13 +01:00
Michael Tremer
0d0df35ca2 Update translations. 2014-03-20 23:07:26 +01:00
Alexander Marx
95cda25924 Firewall: DNAT - always show right red address in dropdown.
Edited language String in DNAT area: external ip address is now Firewall
Interface
2014-03-20 23:06:50 +01:00
Michael Tremer
4ebd3831fa Merge remote-tracking branch 'alfh/feature_firewalllog_centergraph' into next 2014-03-17 22:04:44 +01:00
Ersan Yildirim
17eabb6587 Update Turkish translation. 2014-03-17 12:39:08 +01:00
Alf Høgemark
3a60bf3483 Merge branch 'next' of https://github.com/ipfire/ipfire-2.x into feature_firewalllog_centergraph 2014-03-15 08:47:56 +01:00
Michael Tremer
fd24071f65 Update translations. 2014-03-13 15:37:05 +01:00
Michael Tremer
7e7788ea0b Merge remote-tracking branch 'amarx/BETA3' into next 2014-03-13 15:32:00 +01:00
Michael Tremer
84004f0538 Add link to entropy page and show if there is hardware support available. 2014-03-13 15:27:14 +01:00
Alexander Marx
4d81e0f381 VPN Checksubnets: Now the remote subnets (OpenVPN/IPSec) are checked. If they are defined elsewhere, there's a warningmessage displayed 2014-03-13 15:09:01 +01:00
Michael Tremer
2d6ac13175 Update translations. 2014-03-11 14:19:55 +01:00
Alf Høgemark
c438fb070e en.pl: Trivial sorting of a key 2014-03-01 14:59:18 +01:00
Alf Høgemark
bde7a7d296 showrequestfromcountry.dat: Use language string, and fix links
Define language key for input field.
Fix links for older and newer links.
Indentation fixes.

The code is a copy from showrequestfromip.dat, ideally
we should have merged all three showrequestfrom*.dat files
into one file, but I do not do that now, because it would
really require a rewrite of most of the logic, and I understand
that one does not want to do such changes in 2.x.
2014-03-01 14:59:18 +01:00
Alf Høgemark
f424897557 firewalllogcountry.dat: Use language strings and add to menu
Add some language strings for the new firewalllogport.dat, and
include html fixes done in firewalllogip.dat, which this file
is based on.

Also try to add the menu item to the sub menu, but that is
currently not working.
2014-03-01 14:59:18 +01:00
Alf Høgemark
326a764de6 firewalllog*.cgi and country.cgi: Use language strings, and align graphs
Put the piechart for firewalllog* in the center of the page horisontally,
this looks visually better. Add language string for count and details
submit button.

Add language strings for country.cgi.
Make html validate for country.cgi.
2014-03-01 14:32:52 +01:00
Erik Kapfer
4c962356a0 OpenVPN: Added auth and cipher menu, changed design, fixed bugs.
Added --auth directive with a flip menu for N2N and RW.
Added cipher menu for N2N.
Added new cipher and digest algorithm.
Adapted OpenVPN WUI design to IPSec design.
Changed key lenght for certificates with factor 2.
Added DH menu to WUI, with DH upload possibility and separated DH generation possibility.
Several Bugfixes, reference can be found under Bug #10463.
Also Fixes for #10317 and #10149.
2014-02-27 10:01:57 +01:00
Alf Høgemark
be7534e3fa qos.cgi: Show class description in listing, and graph description
When listing the defined qos classes when qos.cgi is initially
displayed, include the description of the class.

Add upload heading for red graph and download graph for imq graph,
since it is not obvious what the graphs means.
2014-02-22 07:07:57 +01:00
Michael Tremer
317638e753 index.cgi: Change display of DNS servers.
Add missing colon and put them into one column in the
table.
2014-02-20 10:56:02 +01:00
Ersan Yildirim
b21d47c804 firewall: Import Turkish translation. 2014-02-17 17:24:14 +01:00
Michael Tremer
e670f6250e Update translations. 2014-02-17 16:40:14 +01:00