Thomas NOËL
eda1b56f1c
Merge branch 'RELENG_2_1' into UNIVNAUTES_2_1
2014-09-19 11:59:40 +02:00
Thomas NOËL
9f8bbe95d0
logout view: disconnect from cp
2014-09-19 11:58:02 +02:00
Thomas NOËL
53b801b734
add cp_disconnect command (php)
2014-09-19 11:56:14 +02:00
Thomas NOËL
7f7705db4a
auth.py: fix import django settings
2014-09-19 11:55:48 +02:00
Thomas NOËL
7015ccc521
homepage.html: dont use <button>
2014-09-19 10:34:11 +02:00
Thomas NOËL
2a9ee7e91d
update-whitelists: dont use ipfw_context
2014-09-19 10:08:51 +02:00
Thomas NOËL
d02f08dc04
add manage configxml
2014-09-19 10:05:34 +02:00
e5b3335ad9
Do not call write_config() when click on Apply Changes because it was already done and it causes dhcpd to restart one more time on secondary nodes. It fixes #3797
2014-09-18 15:57:52 -03:00
Thomas NOËL
2e70388a75
www/services_captiveportal_saml_*: use rc.sh actions
2014-09-18 14:28:22 +02:00
Thomas NOËL
feeef1acf4
rc.sh: add syncwl action
2014-09-18 14:26:51 +02:00
Thomas NOËL
844bed1714
update-whitelists: use table 42
2014-09-18 14:00:11 +02:00
Thomas NOËL
e7fae17e43
ipfw_context_list.py (just for the record)
2014-09-18 13:45:08 +02:00
Thomas NOËL
e5c257d1d2
config.xml: no whitelist in firewall
2014-09-18 12:23:29 +02:00
Thomas NOËL
888c4dddec
captiveportal.inc: (re)add table 42 for whitelist
...
whitelist in firewall does not work...
2014-09-18 12:21:43 +02:00
Thomas NOËL
9499ce395b
Merge branch 'RELENG_2_1' into UNIVNAUTES_2_1
2014-09-18 11:50:50 +02:00
Thomas NOËL
7c1d794915
services_captiveportal_zones.php: direct links to saml tabs
2014-09-18 11:50:20 +02:00
Thomas NOËL
11fbb86d3b
Revert "captiveportal.inc: add table 42 for whitelist"
...
This reverts commit 82baf4a83e
2014-09-17 22:54:14 +02:00
Thomas NOËL
1d88bb1bb8
update-whitelists.sh: to php, with love
2014-09-17 22:38:10 +02:00
Thomas NOËL
f74657db04
rc.sh: paralleliez syncdata
2014-09-17 22:35:42 +02:00
Thomas NOËL
347f0edc06
config.xml: whitelists aliases
2014-09-17 22:34:05 +02:00
Thomas NOËL
f5af3d985b
minicron for update whitelists
2014-09-17 22:14:55 +02:00
Thomas NOËL
1d30fbf191
update-whitelists.sh (funny, isn't it ?)
2014-09-17 22:10:34 +02:00
Thomas NOËL
b1b5bb79ac
manage prepare-whitelists
2014-09-17 15:35:36 +02:00
cc265e2e59
Deduplicate <form>, fixes #3864
2014-09-17 10:34:14 -03:00
Thomas NOËL
41fac9b983
captiveportal: dont redirect 443/tcp
2014-09-17 14:32:55 +02:00
e5d2c6605b
Merge pull request #1283 from phil-davis/patch-16
2014-09-16 14:12:41 -03:00
9036e7661e
Fix #3866 Firewall Log Filtering
...
on 2.1 branch
2014-09-16 21:56:51 +05:45
Thomas NOËL
384aa7556d
pfconfigxml: add get_whitelists()
2014-09-16 11:33:55 +02:00
Thomas NOËL
82baf4a83e
captiveportal.inc: add table 42 for whitelist
2014-09-16 10:44:05 +02:00
Thomas NOËL
32513b9035
Merge branch 'RELENG_2_1' into UNIVNAUTES_2_1
2014-09-15 19:33:39 +02:00
Thomas NOËL
326238ce30
use rc.sh with mwexec_bg()
2014-09-15 19:32:49 +02:00
Thomas NOËL
236c9163fc
config.xml: stop lan by default (ooops)
2014-09-15 19:25:32 +02:00
Thomas NOËL
95f1795a82
rc.sh: start/stop crons
2014-09-15 14:42:51 +02:00
Thomas NOËL
a4c835ea62
add clearsessions-pf.sh
2014-09-15 14:22:04 +02:00
Thomas NOËL
55ab408cb0
update settings
2014-09-15 12:41:00 +02:00
Thomas NOËL
8f669cfb68
clearsessions-pf manage command
2014-09-15 12:39:48 +02:00
Thomas NOËL
b1a27b8ab1
add cp_get_sessions script (php)
2014-09-15 11:10:19 +02:00
929dfb4cb9
Add pages missing from the Status > Traffic Graph privilege that are required for the full page to load
2014-09-11 13:23:59 -04:00
ee4da773eb
Merge pull request #1274 from phil-davis/patch-13
2014-09-11 08:26:04 -03:00
ffda0775f6
Standardise size of Duplicate Slice button
...
The Duplicate Slice button currently is displayed in smaller text and in a row of its own, separate from the row above that has the rest of the "Duplicate bootup slice" text and slice selection.
This change puts the button in the same row as the slice selection and text, and makes the button text be the same size as the text in other buttons on this page.
Did this first on a 2.1.5 system, so have submitted this against 2.1 branch. I will make another pull request against master also, because a later xhtml compliance change in master will conflict.
2014-09-11 07:55:06 +05:45
be32a003af
Delete IP Alias on CARP VIP interface on secondary node when it's deleted on primary. It fixes #3855
2014-09-10 15:39:56 -03:00
7397f64315
Fix operator
2014-09-10 15:39:56 -03:00
Thomas NOËL
f86f928d5b
add cp_allow script
2014-09-10 16:49:46 +02:00
Thomas NOËL
30d330747a
auth.py: send cpzone to cp_allow
2014-09-10 16:49:15 +02:00
Thomas NOËL
505cddaec5
system.inc/lighttpd: add X-pfsense-cpzone header
2014-09-10 16:42:40 +02:00
Thomas NOËL
a0ab6dae0c
saml/post_form.html: force Send button
2014-09-10 10:49:59 +02:00
Thomas NOËL
f692f5ed0e
Merge branch 'RELENG_2_1' into UNIVNAUTES_2_1
2014-09-10 10:49:18 +02:00
Thomas NOËL
a695c2aa90
settings.py: TEMPLATE_DIRS disabled by mistake
2014-09-10 10:48:00 +02:00
Thomas NOËL
64a0aa338f
handle user_login_callback (attributes, call cp_allow..)
2014-09-09 17:11:56 +02:00
Thomas NOËL
6c62895c3a
add messages in base.html template
2014-09-09 17:11:22 +02:00
Thomas NOËL
Renato Botelho
Phil Davis
jim-p