Renato Botelho
ea27f3169d
Fix license
2015-11-09 09:08:04 -02:00
Renato Botelho
a9a4c8d122
Merge pull request #2043 from phil-davis/r5
2015-11-09 08:46:59 -02:00
Renato Botelho
44e07e8bc5
Merge pull request #2042 from phil-davis/patch-3
2015-11-09 07:49:12 -02:00
Phil Davis
919d91f973
EOL whitespace and header consistency for www
2015-11-09 14:32:43 +05:45
Phil Davis
faeb9aca25
interfaces_pps_edit use latest GLOB from RELENG_2_2
...
Use the latest cua* glob from the code in RELENG_2_2 that was "recently" modified to get this right.
Remove the debug version that looked for "tty" so that people can use it on real systems now.
Forum thread: https://forum.pfsense.org/index.php?topic=102111.0
2015-11-09 12:13:43 +05:45
Stephen Beaver
d6b8120d1b
Merge pull request #2040 from phil-davis/r3
2015-11-08 11:19:51 -05:00
Phil Davis
0d97632543
Captive Portal code review
...
Make the capitalisation of the various heading pages consistent.
Fix various field var name errors observed.
2015-11-08 21:25:14 +05:45
Stephen Beaver
a6e44b82f4
Merge pull request #2039 from phil-davis/patch-3
2015-11-07 22:48:31 -05:00
Phil Davis
a6d93c69b0
Redmine #5386
...
From Router Advertisements tab, be able to select different interfaces and stay on the Router Advertisements tab.
2015-11-08 09:26:48 +05:45
Stephen Beaver
9b54ac32a3
Restored interface tabs to dhcpv6.php
...
Changes dhcp/advertisements tab format in dhcpv6 and router_advertisements
2015-11-07 22:27:46 -05:00
Stephen Beaver
02e2825a85
Fixed #5385
2015-11-07 21:47:00 -05:00
Stephen Beaver
5d36f3c460
Fixed #5384
2015-11-07 21:18:05 -05:00
Stephen Beaver
57cadb042d
Fixed #5381
2015-11-07 21:09:48 -05:00
Stephen Beaver
3f91d34e5e
Fixed #5382
2015-11-07 14:23:32 -05:00
Matt Smith
7aeae83812
Fix services_unbound.php. The interfaces menus did not display the selected
...
interfaces, they always showed "all" selected. Made it so an "apply changes"
message shows when something changes.
2015-11-06 14:47:17 -06:00
Stephen Beaver
101911ff55
Restored simplepie files
2015-11-06 15:30:20 -05:00
Stephen Beaver
a0fb2268f3
Fix cosmetic infoblock issue when there is more than one info_box on a page
2015-11-06 14:04:45 -05:00
Stephen Beaver
121e5cacd4
Convert networks section to jQuert "repeatable" scheme and remove for($x=0;$x<4999 . ." code
2015-11-06 13:41:40 -05:00
Stephen Beaver
c5b3bb016d
Move "Add P2" button to left side to facilitate use of smaller screens
...
Fix HTML indenting
2015-11-06 11:50:55 -05:00
Stephen Beaver
0164e6d133
Removed simplepie files (and update obsoleted files list)
2015-11-06 11:23:00 -05:00
Stephen Beaver
ba360ed75e
Copyright updates ( 3 of 3)
2015-11-06 11:18:58 -05:00
Stephen Beaver
c9df279d53
Correction per Phil Davis
2015-11-06 11:04:38 -05:00
Stephen Beaver
191cb31df7
Copyright updates Batch 2 of 3
2015-11-06 10:40:02 -05:00
Renato Botelho
4fa256df20
Merge pull request #2035 from phil-davis/patch-3
2015-11-06 13:39:12 -02:00
Renato Botelho
77d69dadc6
Deal with multiple conflicts
2015-11-06 13:17:52 -02:00
Phil Davis
612d0fb365
diag_nanobsd do not show reference count 0
...
When the user has selected "Keep media mounted read/write at all times." then the value of $refcount will be zero even though is_writable() is true. That is a normal condition.
We only want to display the (Reference count n) text when the reference count is abnormal.
This is a "bug" in 2.2.* also, not a regression in 2.3-ALPHA. But it might as well just be changed in master 2.3. Not much point back-porting little crud like this to RELENG_2_2 nowadays.
2015-11-06 09:55:45 +05:45
Stephen Beaver
9da2cf1c6e
First batch of copyright updates
2015-11-05 19:12:25 -05:00
Stephen Beaver
14d364910d
Merge pull request #2034 from phil-davis/r2
2015-11-05 15:28:38 -05:00
heper
7f9a679fa8
proposed fix for Bug #5375
...
value passed by checkbox was "yes" when checked, instead of "Block" / "Pass"
2015-11-05 15:28:10 -05:00
Phil Davis
6aab7f9c8b
services_unbound_acls text stuff
2015-11-06 00:37:16 +05:45
Phil Davis
9f5aa90fee
Various text stuff on the UI
2015-11-06 00:35:33 +05:45
Renato Botelho
d6f92b70c0
Do not consider only meta package, but also other pfSense main packages, also change exit code from -1 to 2
2015-11-05 16:10:01 -02:00
Renato Botelho
e8ef8dd8b2
Add a new option to pfSense-upgrade, -c, it'll return 0 if system firmware is up2date or -1 if there are updates available
2015-11-05 15:28:39 -02:00
Stephen Beaver
7e4b9edd77
Merge pull request #2032 from heper/patch-2
2015-11-05 11:24:45 -05:00
heper
6e27d2fc21
convert system_camanager to fa
2015-11-05 17:23:07 +01:00
Stephen Beaver
ba2e652679
Merge pull request #2031 from phil-davis/patch-3
2015-11-05 11:17:18 -05:00
Phil Davis
e32f02a56d
services_dhcpv6 text
...
and also I made the DNS 1, DNS 2, DNS 3 , DNS 4 show inside the boxes as 'placeholder' the same as NTP 1, NTP 2 is done. That saves a bit of screen real estate and makes it consistent.
2015-11-05 22:01:04 +05:45
Stephen Beaver
846e29bdd7
Merge pull request #2030 from heper/patch-1
2015-11-05 11:15:32 -05:00
heper
586a79d5f3
change onclick delete msg toLowerCase()
2015-11-05 17:09:47 +01:00
Stephen Beaver
fac720f85e
Merge pull request #2029 from phil-davis/patch-3
2015-11-05 10:47:44 -05:00
Stephen Beaver
33f0b0d571
Delete confirmation vi fa-trash automated via pfSense.js
2015-11-05 10:46:09 -05:00
Phil Davis
bf27317d17
service_dhcp.php NTP and TFTP server fields
...
and I used capitals for DHCP Server.
At the moment there is a mix of capitalisation of this sort of stuff - e.g. there is "DNS forwarder" in various places and "DNS Resolver" and... IMHO these can all be made consistent to have capitals on all the "big" words.
2015-11-05 21:21:10 +05:45
Stephen Beaver
0619c9db22
Convert system_certmanager.php to font awesome icons
...
Automatically add confirmation dialog to all fa-trash icons
2015-11-05 09:05:52 -05:00
Stephen Beaver
c10cb19609
Moved action-buttons in-line styling to pfSense.css
2015-11-05 08:11:15 -05:00
Stephen Beaver
d07c919451
Merge pull request #2027 from heper/sed_inline_css
2015-11-05 07:47:19 -05:00
Stephen Beaver
c7250cf7ac
Merge pull request #2028 from phil-davis/patch-3
2015-11-05 07:45:34 -05:00
Phil Davis
36b08f39c6
service_dhcpv6_edit dodgy-looking stuff
...
Noticed when reading the code.
2015-11-05 18:14:10 +05:45
heper
3e1134552b
add icon-embed-btn
2015-11-05 12:43:59 +01:00
heper
9d5a20cf0e
replace and find for icon-embed-btn
2015-11-05 12:38:17 +01:00
Stephen Beaver
85587e7dd2
Fix save/update messages and format
2015-11-04 15:09:41 -05:00
