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
Alexander Marx
7fa1b16e5d
Firewall: Fix slow generation of host table in firewall groups
2014-05-07 12:13:13 +02:00
Alexander Marx
f1dd19724c
Firewall: Add ip addres after alias name in dropdown for source and target
2014-05-07 12:00:49 +02:00
Alexander Marx
1be052f995
Firewall: When using custom hosts and not having BLUE or ORANGE, the Ruletable took very long to display every Line
...
With this commit the page is shown quickly because there's now a check
if ORANGE or BLUE exist before we test if a host might be in that
subnet.
2014-05-06 13:21:32 +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
Alexander Marx
107060da53
Firewall: When using DNAT AUTO, don't display the IP anymore in brackets
2014-04-28 16:18:10 +02:00
Alexander Marx
2ed8330ee5
Firewall: BUG 10526 (missing RED iface in SNAT Dropdown)
2014-04-22 12:35:39 +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
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
Alexander Marx
eae92b2baf
Firewall: Bug 10514 fixed
2014-04-14 23:16:59 +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
28e003e486
firewall.cgi: Sort protocols alphabetically.
2014-04-12 15:23:45 +02:00
Michael Tremer
dd73ef846e
media.cgi: Add missing 'tr'.
2014-04-12 12:18:57 +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
Alexander Marx
712500d0dc
Firewall: Fix 10510 - Show all protocols from servicegroups (GRE,IPIP,IPV6,...)
2014-04-10 08:19:56 +02:00
Michael Tremer
62ff8d9627
Fix missing Connection Scheduler strings.
2014-04-09 15:11:41 +02:00
Michael Tremer
48fde0b6f9
aliases.cgi: Mark name field as mandatory.
2014-04-09 14:19:16 +02:00
Alexander Marx
1ccfb89eab
Firewall: fix coloring of internet hosts
2014-04-07 16:53:01 +02:00
Alexander Marx
6effa000ec
Firewall: Fix source preselection of alias when Firewall is selected
2014-04-07 16:52:55 +02:00
Alexander Marx
747d030a24
Firewall: BUGFIX 10505
2014-04-07 16:52:49 +02:00
Alexander Marx
476b122fa8
Firewall: BUGFIX 10507
2014-04-07 16:52:42 +02:00
Michael Tremer
6cf0f959f0
media.cgi: Fix typo once again.
2014-04-06 17:24:13 +02:00
Michael Tremer
41dfa08d2a
Merge branch 'ppp-update' into beyond-next
2014-03-26 23:43:04 +01:00
Michael Tremer
5240f73d9c
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into beyond-next
2014-03-26 23:42:57 +01:00
Michael Tremer
7add463e51
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
2014-03-26 23:35:18 +01:00
Michael Tremer
36d809efb6
media.cgi: Fix typo 'writen'.
2014-03-26 23:34:58 +01:00
Arne Fitzenreiter
513c321ebe
wlanap.cgi: fix missing line from wlan info.
2014-03-26 08:35:00 +01:00
Arne Fitzenreiter
91eb94ee2f
wlanap: fix typo.
2014-03-25 13:15:43 +01:00
Arne Fitzenreiter
57c209d558
wlanap.cgi: fix detection of not useable channels.
2014-03-25 13:03:56 +01:00
Alexander Marx
896eb2d693
Firewall: Allow DNAT with target firewall
2014-03-21 12:55:34 +01:00
Alexander Marx
fd169d0adc
Firewall: DNAT - Show right DNAT interface in ruletable
...
Now:
When using a hostgroup as source there are all corresponding DNAT
interfaces shown in ruletable depending on the entries in the group.
When in DNAT area "-automatic" is selected, the DNAT interfaces are
shown as IP-Addresses, else they are shown as "ORANGE","GREEN","BLUE"...
BUGFIX: When there is a MAC address used in a sourcegroup, the rules could not be set. Now MAC addresses get allways the public interface as DNAT
2014-03-21 12:51:09 +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
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
Arne Fitzenreiter
0f0d6a5a7d
hostapd: change channellist and status for dfs channels.
2014-03-19 19:00:47 +01:00
Arne Fitzenreiter
f89678de2f
hostapd: update to 2.1.
2014-03-19 07:22:49 +01:00
Alexander Marx
cc77ac2364
Firewall: select right value in DNAT Dropdown
2014-03-18 18:03:52 +01:00
Alexander Marx
1aa5439cf1
Firewall: extend DNAT dropdown with auto,BLUE,ORANGE,GREEN
2014-03-18 18:03:42 +01:00
Michael Tremer
4ebd3831fa
Merge remote-tracking branch 'alfh/feature_firewalllog_centergraph' into next
2014-03-17 22:04:44 +01:00
Michael Tremer
2a07aa9d9c
dialctrl: Remove defunct script.
2014-03-17 14:17:44 +01:00
Alexander Marx
a72ae687c6
Firewall: Bugfix: Remark in hostgroups and servicegroups was not changeable
...
Another Bugfix: Layout of hostgroups was broken when more than 1 vpn
connection is defined. There where dropdownboxes for every vpn
connection instead of only one
2014-03-17 14:09:17 +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
Alexander Marx
dadffbf738
fwhost.cgi: disable "use warnings"
2014-03-13 15:37:33 +01:00