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
Michael Tremer
2b6c5f2579
ipfire theme: Fix default setting for hostname in title.
2014-03-13 15:43:52 +01:00
Alexander Marx
dadffbf738
fwhost.cgi: disable "use warnings"
2014-03-13 15:37:33 +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
03b08c08f0
VPN Checksubnets: Buttons are now Language Strings
2014-03-13 15:27:01 +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
Alexander Marx
c6df357fd4
Firewall: When delting an OpenVPN or IPSec connection, the rules are only colored yellow and the firewallrules are reloaded automatically
2014-03-13 14:51:28 +01:00
Alexander Marx
b3c53248d9
Firewall: When delting an OpenVPN or IPSec connection, the rules are only colored yellow and the firewallrules are reloaded automatically
2014-03-13 13:53:39 +01:00
Michael Tremer
1202ee1539
Merge remote-tracking branch 'ummeegge/openvpn' into beyond-next
2014-03-11 14:19:14 +01:00
Michael Tremer
826c22d66c
Merge remote-tracking branch 'amarx/INDEX' into next
2014-03-10 21:35:15 +01:00
Michael Tremer
cbb88df154
vpnmain.cgi: Remove left-over </td> tag.
2014-03-10 16:11:50 +01:00
Alexander Marx
5ef260ae41
index.cgi: fix colors and tables for vpn connections
2014-03-10 12:22:32 +01:00
Michael Tremer
91dd042b20
gpl.cgi: Fix proper redirection so that the agreement has only to be accepted once.
2014-03-05 23:53:21 +01:00
Michael Tremer
323923d912
firewall: Allow remarks in Unicode.
2014-03-05 13:59:28 +01:00
Alexander Marx
65c9b3a508
Firewall: Remarkcheck should now support old firewallrules from converter
2014-03-05 08:13:04 +01:00
Alexander Marx
2610f3930a
Firewall: When no manual ip is given on rulecreation and rule is added, there's automatically std_networks "ALL" selected
2014-03-05 08:05:52 +01:00
Michael Tremer
b062a11bbe
firewall: Don't colourise MAC addresses.
...
Fixes #10491 .
2014-03-05 08:05:52 +01:00
Alexander Marx
9556a0fb95
Firewall: When no manual ip is given, standard networks "all" is selected
2014-03-04 16:11:35 +01:00
Alexander Marx
5a09c99a89
Firewall: Now it is possible to just change the remark in input and outgoing
2014-03-04 16:00:14 +01:00
Alexander Marx
abb3cfcc9e
Firewall: FIX allowed chars in remark
2014-03-04 15:44:02 +01:00
Alexander Marx
90c2ce0c20
Firewall: get rid of /32 subnetz when using manual ip addresses
2014-03-04 14:51:20 +01:00
Alexander Marx
40962f9760
Firewall: Bugfix - when creating a new hostgroup, the system checked for existing name in servicegroups instead of hostgroups
2014-03-04 14:40:59 +01:00
Alexander Marx
7429ee78b6
Firewall: Fix oversized Textfields
2014-03-04 14:07:04 +01:00
Alexander Marx
f620fa34df
Firewall: Fix Bug 10490 and broken colorization of tables in firewall groups
2014-03-04 11:37:58 +01:00
Alf Høgemark
fff2be22a4
firewalllogcountry.dat: Fix filename for piechart image
2014-03-01 15:00:51 +01:00
Alf Høgemark
06f320318f
firewalllogcountry.dat: Simplify code for table background color
2014-03-01 14:59:19 +01:00
Alf Høgemark
fde47f5aef
firewalllogcountry.dat: Show green0,blue0, and orange0 as countries
...
It makes sense to see how many fire wall logs entries are dropped
from the interfaces green0, blue0, and orange0, so this is
displayed as a country. The showrequestfromcountry.dat also
supports filtering based on the interface.
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
e4aac47370
logs.cgi: Add files for showing firewall blocks by country
...
Add similair functionality as firewalllogip.dat and
firewalllogport.dat, by listing the number of blocks
per country, and provide a details link to show only
the blocked ip addresses from the country.
This is a preliminary prototype.
2014-03-01 14:59:17 +01:00
