Eirik Oeverby
94933d561c
Fixed host status bug - how did that get there??
2010-08-13 22:37:36 +02:00
Renato Botelho
ae67b1fbe1
Move : inside gettext
2010-08-13 15:44:54 -03:00
jim-p
fe6d7a5577
Fix typo
2010-08-13 14:20:49 -04:00
jim-p
a22d475f11
Let the user choose the IPsec CA instead of assuming.
2010-08-13 14:15:08 -04:00
jim-p
dc291feb70
Only write out the CA if one exists.
2010-08-13 14:03:23 -04:00
jim-p
812dd35db0
Add a GUI selection for the proposal_check config option. Provide all the choices from racoon.conf(5) plus a "default" which will keep the old behavior.
2010-08-13 13:57:45 -04:00
jim-p
4ccea790e8
Flip this check
2010-08-13 13:57:45 -04:00
jim-p
96ef83a705
When using a certificate for IPsec, also write out and reference the certificate's CA.
2010-08-13 13:57:44 -04:00
jim-p
29a3ac407f
Honor a phase 1 proposal_check if one is set, otherwise use the default.
2010-08-13 13:57:43 -04:00
Renato Botelho
0ac1dafd6f
Merge remote branch 'mainline/master' into js
2010-08-13 14:43:25 -03:00
Vinicius Coque
6c83f22639
Fix some javascripts broken on gettext() implementation
2010-08-13 14:31:49 -03:00
Chris Buechler
7d04e4ac60
fix text
2010-08-13 13:06:24 -04:00
Chris Buechler
1f1fc944bc
fix text
2010-08-13 13:02:18 -04:00
Chris Buechler
f1ca6b86de
should be #777 not *777
2010-08-13 12:58:47 -04:00
Vinicius Coque
d886ebd6d4
Shows source ports when they are already defined
2010-08-13 13:49:16 -03:00
gnhb
df309b3775
If mpd.conf files exists in the /conf directory, link to it instead of
...
generating a new one from config.xml data.
This allows power users to tweak mpd conf to their delight, and gives
devs a way of testing out conf tweaks without needing to alter php code.
2010-08-13 21:54:14 +07:00
gnhb
2f848ab7ae
Merge branch 'master' of rcs.pfsense.org:pfsense/mainline
2010-08-13 21:33:56 +07:00
gnhb
6a30f701e2
Expose MRRU settings in the GUI for PPPoE (MLPPP).
2010-08-13 21:32:06 +07:00
Renato Botelho
bfa790df99
Merge remote branch 'mainline/master' into js
2010-08-13 11:08:58 -03:00
jim-p
5f25bfea6d
Don't allow a user-entered PPTP password to start with !, this will cause mpd to attempt an external auth program.
2010-08-13 09:33:36 -04:00
Vinicius Coque
ec325889dc
Remove unnecessary JS variable
2010-08-13 10:30:58 -03:00
Vinicius Coque
7967131684
Fix the js that hides advanced button on firewall rules
2010-08-13 10:20:21 -03:00
Renato Botelho
7e2ca7b5db
Fix a duplicate line forgotten on a merge
2010-08-13 08:58:52 -03:00
Erik Fonnesbeck
0cd8ee5ce5
This needs to use gettext, since gettext is used on the value of the button.
2010-08-12 16:03:03 -06:00
Erik Fonnesbeck
3b7f0f5367
Fix some printfs and some text.
2010-08-12 16:02:41 -06:00
Erik Fonnesbeck
0153a0b819
Merge branch 'master' from http://gitweb.pfsense.org/pfsense/pfsense-gettext.git
2010-08-12 15:51:13 -06:00
Erik Fonnesbeck
a62ad19344
Fix printf
2010-08-12 14:04:43 -06:00
jim-p
9fad9848c9
Reorder this, otherwise the function doesn't pick up on the config change.
2010-08-12 13:33:19 -04:00
jim-p
1b1c179da7
Use require_once here
2010-08-12 13:20:54 -04:00
Renato Botelho
c0948c6c12
Just fix some space and tab problems
2010-08-12 14:17:28 -03:00
Carlos Eduardo Ramos
8cc2d7a67c
gettext() fixes on interfaces_gif.php
2010-08-12 13:40:30 -03:00
Carlos Eduardo Ramos
8caea9a250
gettext() fixes on interfaces_bridge_edit.php
2010-08-12 13:26:27 -03:00
Vinicius Coque
18fd37b6d5
Merge remote branch 'origin/master'
2010-08-12 13:04:56 -03:00
Vinicius Coque
01b87f4baa
Fix gettext on load_balancer_virtual_server_edit.php
2010-08-12 13:04:35 -03:00
Carlos Eduardo Ramos
aee5ddac8d
gettext() fixes on interfaces_bridge.php
2010-08-12 13:00:51 -03:00
Renato Botelho
e73b001e25
Merge remote branch 'mainline/master'
...
Conflicts:
usr/local/www/diag_smart.php
usr/local/www/firewall_rules_edit.php
usr/local/www/interfaces.php
usr/local/www/load_balancer_pool_edit.php
usr/local/www/pkg_mgr_settings.php
2010-08-12 12:55:32 -03:00
Renato Botelho
3e6ec5dfba
Use <?php instead of <?
2010-08-12 12:34:14 -03:00
Renato Botelho
86aa4cc74e
Small logic fixes, gettext fixes and make php -l happy
2010-08-12 12:34:00 -03:00
Renato Botelho
c47e5d929b
gettext fixes
2010-08-12 11:21:11 -03:00
Renato Botelho
717f87ddfc
Merge branch 'master' of rcs.pfsense.org:pfsense/pfsense-gettext
2010-08-12 11:19:45 -03:00
Renato Botelho
ee9933b6e2
Use <?php instead of the short form
2010-08-12 11:15:26 -03:00
Carlos Eduardo Ramos
eb9116e9b8
gettext() fixes on pkg_mgr_settings.php
2010-08-12 11:11:03 -03:00
Renato Botelho
4d71d68cd5
Make php -l happy renaming local function getHostName to _getHostName
2010-08-12 11:08:57 -03:00
Renato Botelho
8cb8751e21
Use <?php instead of <?
2010-08-12 11:07:04 -03:00
Renato Botelho
b11cdf926a
Use <?php instead of the short form, use <?= and remove spaces and tabs from EOL
2010-08-12 11:04:03 -03:00
Carlos Eduardo Ramos
6f7399279b
gettext() fixes on load_balancer_pool_edit.php
2010-08-12 11:00:57 -03:00
Renato Botelho
e242f36af0
Make php -l happier
2010-08-12 10:58:06 -03:00
Renato Botelho
31c78e5dc0
Add missing )
2010-08-12 10:54:00 -03:00
Renato Botelho
e4b57d2681
Use <?php instead of the short form
2010-08-12 10:52:11 -03:00
Carlos Eduardo Ramos
933ea015a9
gettext() fixes on interfaces.php
2010-08-12 10:49:53 -03:00