Commit Graph

6716 Commits

Author SHA1 Message Date
Alexander Marx
58bda09b68 Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire-2.x into firewall-fifteen 2013-10-07 07:25:42 +02:00
Alexander Marx
95c86656e7 Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen 2013-10-07 07:25:19 +02:00
Arne Fitzenreiter
1a3dbe91b2 Merge remote-tracking branch 'origin/next' into fifteen 2013-10-06 18:42:53 +02:00
Arne Fitzenreiter
1bd3de895b close core73. 2013-10-06 18:39:08 +02:00
Arne Fitzenreiter
cd6c59aac1 wirelessclient.cgi: fix handling of "'" 2nd try. 2013-10-06 18:37:15 +02:00
Arne Fitzenreiter
2e053370ab Merge remote-tracking branch 'origin/next' into fifteen 2013-10-06 17:07:03 +02:00
Arne Fitzenreiter
189cf1270a core73: add urlfilter.cgi. 2013-10-06 17:04:58 +02:00
Arne Fitzenreiter
c74c84bc6c core73: add database updates. 2013-10-06 16:47:39 +02:00
Arne Fitzenreiter
0208b0eb40 GeoIP: update database to 20131001. 2013-10-06 16:44:04 +02:00
Arne Fitzenreiter
b6e4a22dfc hwdata: update pci.ids to 20131006. 2013-10-06 16:43:37 +02:00
Arne Fitzenreiter
3001c4d7c9 hwdate: update usb.ids to 20130821. 2013-10-06 16:42:55 +02:00
Arne Fitzenreiter
929b186c7a Revert "wirelessclient.cgi: fix handling of "'" character in ssid and psk."
This reverts commit be5b660500.
now it cannot handle "space".
2013-10-06 12:36:58 +02:00
Arne Fitzenreiter
b128fe7e69 setup: add nic identify function. 2013-10-06 09:00:17 +02:00
Arne Fitzenreiter
d039a7e99e kernel: update to 3.10.15. 2013-10-05 22:22:17 +02:00
Alexander Marx
e6e9a81176 Firewall: added some more plausichecks and additional errormessages 2013-10-05 13:50:35 +02:00
Alexander Marx
73c39dd4bd Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen 2013-10-05 13:31:22 +02:00
Arne Fitzenreiter
5c86caac7d kernel: build VLAN_8021Q as modul. 2013-10-04 17:00:27 +02:00
Arne Fitzenreiter
6b0d7d6bc3 Merge remote-tracking branch 'origin/next' into fifteen 2013-10-04 16:55:20 +02:00
Arne Fitzenreiter
be5b660500 wirelessclient.cgi: fix handling of "'" character in ssid and psk. 2013-10-04 16:50:30 +02:00
Michael Tremer
4598f16cfd Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen 2013-10-04 14:53:03 +02:00
Michael Tremer
08facb3b22 vim: Update to 7.4. 2013-10-04 14:52:44 +02:00
Michael Tremer
196539512a network-vlans: Remove " from configuration values.
" is an invalid character.
2013-10-04 13:39:26 +02:00
Michael Tremer
ba25f014b2 network-vlans: Use ip link command instead of vconfig.
This patch gets rid of using vconfig for configuring VLAN
devices. ip link is much more suitable for that and creates
the interface with the right name and MAC address in just
one step.
2013-10-04 13:36:48 +02:00
Arne Fitzenreiter
5ae3072a47 remove php from core73.
fifteen branch will not build with this file.
2013-10-04 08:37:49 +02:00
Arne Fitzenreiter
b3cc5fbdb9 samba: bump package version. 2013-10-04 08:36:46 +02:00
Alexander Marx
9f6da934a3 Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire-2.x into firewall-fifteen 2013-10-04 08:09:18 +02:00
Alexander Marx
b4f94285ff Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen 2013-10-04 07:17:15 +02:00
Arne Fitzenreiter
71ed067612 rsync: updated to 3.1.0. 2013-10-03 19:07:17 +02:00
Arne Fitzenreiter
ee1d2d13ee Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen 2013-10-03 14:51:30 +02:00
Arne Fitzenreiter
f7bb003150 wirelessctrl: fix blue access "enabled" checkbox. 2013-10-03 14:50:33 +02:00
Arne Fitzenreiter
7a302dd0fe memtest: disable parallel build. 2013-10-03 14:50:11 +02:00
Michael Tremer
0203401cf5 Merge remote-tracking branch 'origin/next' into fifteen
Conflicts:
	doc/language_issues.es
	doc/language_issues.fr
	doc/language_issues.nl
	doc/language_issues.pl
	doc/language_issues.tr
	doc/language_missings
2013-10-03 14:26:33 +02:00
Michael Tremer
2d685e1d4c core73: Add wirelessclient.cgi. 2013-10-03 14:22:59 +02:00
Michael Tremer
03caa87399 Update language issues. 2013-10-03 14:20:32 +02:00
Michael Tremer
f34844355b wirelessclient.cgi: Add help for priority.
Fixes #10428.
2013-10-03 14:19:38 +02:00
Arne Fitzenreiter
f29eb7ec93 vdr: remove unknown config keys. 2013-10-03 13:44:56 +02:00
Michael Tremer
d48969312e php: Update to 5.3.27. 2013-10-03 12:39:16 +02:00
Michael Tremer
f35740ac44 core73: Add php to update. 2013-10-03 12:33:08 +02:00
Michael Tremer
a761716f03 php: Build sqlite2 support for PDO. 2013-10-03 12:30:07 +02:00
Michael Tremer
64aac4feb5 php: Build in zip module. 2013-10-03 12:29:48 +02:00
Alexander Marx
03dd9a2949 Firewall: fixed JS code for toggeling div areas 2013-10-03 12:01:19 +02:00
Arne Fitzenreiter
a1fdbdac79 configroot: enable log off wireless packet drop. 2013-10-03 11:53:35 +02:00
Arne Fitzenreiter
9b966c6a0b memtest: enable smp as default. 2013-10-03 11:52:59 +02:00
Arne Fitzenreiter
78403883e2 vdr: update to 2.0.3. 2013-10-02 22:43:07 +02:00
Alexander Marx
a4c7bf6b73 Firewall: Reorganized layout of rulecreationpage
Protocol is now an extra area containing protocol, ICMP-Type and
source/target ports
2013-10-02 21:28:50 +02:00
Alexander Marx
40d505ea08 Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen 2013-10-02 21:15:22 +02:00
Arne Fitzenreiter
5b6acb88c6 Fix empty system-release. 2013-10-02 16:24:24 +02:00
Arne Fitzenreiter
ad5338015f stage2: rootfile update. 2013-10-02 14:39:16 +02:00
Arne Fitzenreiter
f93635e375 memtest: update to 5.01. 2013-10-02 14:38:39 +02:00
Arne Fitzenreiter
7f46e14b81 kernel: update to 3.10.14. 2013-10-02 11:00:56 +02:00