webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-12 20:16:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

Browse Source
This commit is contained in:
Michael Tremer
2015-10-31 21:44:51 +00:00
parent 673351d8a2 6feea5f778
commit 843ca290e1
2 changed files with 69 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/95/filelists/files
View File

@@ -6,6 +6,7 @@ etc/rc.d/init.d/networking/red.up/99-geoip-database
lib/udev/network-hotplug-vlan
lib/udev/rules.d/60-net.rules
srv/web/ipfire/cgi-bin/connections.cgi
srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/dhcp.cgi
srv/web/ipfire/cgi-bin/firewall.cgi
srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat

101
html/cgi-bin/credits.cgi
View File

@@ -58,40 +58,75 @@ print <<END
</center>
<br><br>
<p><b>Development:</b><br />
Arne Fitzenreiter
(<a href='mailto:arne.fitzenreiter\@ipfire.org'>arne.fitzenreiter\@ipfire.org</a>) - Maintainer IPFire 2.x <br />
Michael Tremer
(<a href='mailto:michael.tremer\@ipfire.org'>michael.tremer\@ipfire.org</a>) - Project Leader <br />
Christian Schmidt
(<a href='mailto:christian.schmidt\@ipfire.org'>christian.schmidt\@ipfire.org</a>) - Vice Project Leader <br />
Stefan Schantl
(<a href='mailto:stefan.schantl\@ipfire.org'>stefan.schantl\@ipfire.org</a>)<br />
Alexander Marx
(<a href='mailto:alexander.marx\@ipfire.org'>alexander.marx\@ipfire.org</a>)<br />
Heiner Schmeling
(<a href='mailto:heiner.schmeling\@ipfire.org'>heiner.schmeling\@ipfire.org</a>)<br />
Ronald Wiesinger
(<a href='mailto:ronald.wiesinger\@ipfire.org'>ronald.wiesinger\@ipfire.org</a>)<br />
Silvio Rechenbach
(<a href='mailto:silvio.rechenbach\@ipfire.org'>silvio.rechenbach\@ipfire.org</a>)<br />
Dirk Wagner
(<a href='mailto:dirk.wagner\@ipfire.org'>dirk.wagner\@ipfire.org</a>)<br />
Erik Kapfer
(<a href='mailto:erik.kapfer\@ipfire.org'>erik.kapfer\@ipfire.org</a>)<br />
Alfred Haas
(<a href='mailto:alfred.haas\@ipfire.org'>alfred.haas\@ipfire.org</a>)<br />
<p><b>Inactive:</b><br />
Peter Pfeiffer
(<a href='mailto:peter.pfeifer\@ipfire.org'>peter.pfeifer\@ipfire.org</a>)<br />
Peter Sch&auml;lchli
(<a href='mailto:peter.schaelchli\@ipfire.org'>peter.schaelchli\@ipfire.org</a>)<br />
Jan Paul T&uuml;cking
(<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking\@ipfire.org</a>)<br />
<p>
<strong>Core Developers:</strong>
</p>
<ul style="list-style: none">
<li>
Michael Tremer
(<a href='mailto:michael.tremer\@ipfire.org'>michael.tremer\@ipfire.org</a>)
</li>
<li>
Arne Fitzenreiter
(<a href='mailto:arne.fitzenreiter\@ipfire.org'>arne.fitzenreiter\@ipfire.org</a>)
</li>
<li>
Stefan Schantl
(<a href='mailto:stefan.schantl\@ipfire.org'>stefan.schantl\@ipfire.org</a>)
</li>
<li>
Alexander Marx
(<a href='mailto:alexander.marx\@ipfire.org'>alexander.marx\@ipfire.org</a>)
</li>
</ul>
<p>
<strong>Community Developers:</strong>
</p>
<ul style="list-style: none">
<li>
Christian Schmidt
(<a href='mailto:christian.schmidt\@ipfire.org'>christian.schmidt\@ipfire.org</a>)
</li>
<li>
Jan Paul T&uuml;cking
(<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking\@ipfire.org</a>)
</li>
<li>
Heiner Schmeling
(<a href='mailto:heiner.schmeling\@ipfire.org'>heiner.schmeling\@ipfire.org</a>)
</li>
<li>
Ronald Wiesinger
(<a href='mailto:ronald.wiesinger\@ipfire.org'>ronald.wiesinger\@ipfire.org</a>)
</li>
<li>
Silvio Rechenbach
(<a href='mailto:silvio.rechenbach\@ipfire.org'>silvio.rechenbach\@ipfire.org</a>)
</li>
<li>
Dirk Wagner
(<a href='mailto:dirk.wagner\@ipfire.org'>dirk.wagner\@ipfire.org</a>)
</li>
<li>
Erik Kapfer
(<a href='mailto:erik.kapfer\@ipfire.org'>erik.kapfer\@ipfire.org</a>)
</li>
<li>
Alfred Haas
(<a href='mailto:alfred.haas\@ipfire.org'>alfred.haas\@ipfire.org</a>)
</li>
<li>
Peter Pfeiffer
(<a href='mailto:peter.pfeifer\@ipfire.org'>peter.pfeifer\@ipfire.org</a>)
</li>
<li>
Peter Sch&auml;lchli
(<a href='mailto:peter.schaelchli\@ipfire.org'>peter.schaelchli\@ipfire.org</a>)
</li>
</ul>
END
;
&Header::closebox();