summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1678 from phil-davis/patch-1Renato Botelho2015-05-251-1/+2
|\
| * Consistent clear_subsystem_dirty after unbound restartPhil Davis2015-05-231-1/+2
| | | | | | | | from services_dhcp. This looks like it is wanting curlies to put all clear_subsytem_dirty inside the "if".
* | Merge pull request #1677 from phil-davis/vpn_ipsecRenato Botelho2015-05-257-650/+890
|\ \
| * | Code style VPN IPsecPhil Davis2015-05-237-650/+890
| |/
* | Merge pull request #1676 from phil-davis/www_openvpnRenato Botelho2015-05-253-411/+629
|\ \ | |/ |/|
| * Code style www vpn_openvpnPhil Davis2015-05-233-411/+629
|/
* Update/correct wireless status flags and capabilities list.jim-p2015-05-221-2/+2
| | | | There are many more possible flags, documented on the wiki: https://doc.pfsense.org/index.php/Wireless_Status
* Merge pull request #1673 from phil-davis/patch-2Renato Botelho2015-05-221-10/+21
|\
| * Be smarter about combinations of combinedfields and usecolspan2Phil Davis2015-05-221-10/+21
| | | | | | | | | | | | | | | | | | | | a) When we are doing combined fields and usecolspan2 is in effect, then usecolspan2 is also a signal that we want to spread the combined fields horizontally in a single row. In that case we want the combined fields to all be in a single "tr" tag enclosing them all. That was already working in that way. b) But if usecolspan2 is NOT in effect, then we want the combined fields to still run "together" but vertically under each other. In this case we want each field to be in its own "tr" tag. This change makes (b) happen. If combinedfields is not set, then each of the "if" tests here still follows the same path it did previously, so there should be no effect on the HTML output for any ordinary package fields. These are changes for master that correspond to https://github.com/pfsense/pfsense/pull/1672 on RELENG_2_2.
* | Merge pull request #1674 from phil-davis/vpn_pppoeRenato Botelho2015-05-222-120/+170
|\ \
| * | Code style vpn_pppoePhil Davis2015-05-222-120/+170
| |/
* | Merge pull request #1675 from jlduran/editorconfigRenato Botelho2015-05-221-0/+12
|\ \ | |/ |/|
| * Add .inc files to editorconfigJose Luis Duran2015-05-221-1/+1
| |
| * Add .editorconfig fileJose Luis Duran2015-05-221-0/+12
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To start with just `.php` files. According to the [Developer Style Guide](https://doc.pfsense.org/index.php/Developer_Style_Guide): - Use tabs for indentation (not spaces or a mixture of both) - Use a tab stop of 8, rather than 4 - Ensure there is NO trailing whitespace at the end of a line, for example spaces or tabs when there is no more text afterward - Ensure there is NO whitespace on empty lines. For example, a line must not contain only spaces or only tabs Additionally, I've added: - UTF-8 character encoding - LF line endings - Final newline Proposed `.editorconfig` file (`.php` files for now): ```ini ; This file is for unifying the coding style for different editors and IDEs. ; More information at http://editorconfig.org root = true [*.php] indent_style = tab tab_width = 8 end_of_line = lf charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true ``` GitHub will also read and apply this style to the repo. See #1664.
* Update zoneinfo from FreeBSD 10.1-REL. Ticket #4459Chris Buechler2015-05-211-0/+0
|
* Correct descriptions on Key Rotation and Master Key Regeneration for wireless.jim-p2015-05-211-2/+2
|
* Merge pull request #1671 from phil-davis/patch-2Renato Botelho2015-05-201-4/+12
|\
| * More combinedfields and usecolspan2 fixesPhil Davis2015-05-201-4/+12
|/ | | | | | | Actually the "tr" tag needs to be a single tag-pair that encloses all of the set of fields with combinedfields specified - combinedfields=begin is where the "tr" tag starts and combinedfields=end is where the "tr" tag ends, enclosing a whole set of combined fields. That allows usecolspan2 to work. In the previous change I had made it enclose every field in its own "tr" tag-pair That caused usecolspan2 to be ineffective at spreading the combined fields across the display. Also colspan needs to be initialised each time around the loop - it was getting applied to all fields further down the page after the first one it was used in. This is the version for master.
* Merge pull request #1669 from phil-davis/patch-2Renato Botelho2015-05-201-5/+8
|\
| * Fix tr use for combinedfields in pkg xmlPhil Davis2015-05-201-5/+8
|/ | | | | When specifying combinedfields begin and end in a package XML file, IE reports some unexpected start tag messages. This is because some "td" tags are not enclosed in "tr" tags in these cases, both at the begin and end of the combinedfields table that is generated. Firefox seems to be forgiving of this. This has been investigated because BBscan177 who is developing pfBlockerNG is trying to use the combinedfields feature and it was not working so well. I will ask him to try these changes for RELENG_2_2 and confirm that they work. When combinedfields is not set, then the code path with this change results in the same HTML being output as previously, so it should not change the HTML generated for packages that do not use combinedfields - i.e. I claim not to have broken anything else :)
* Merge pull request #1649 from baxeno/masterErmal LUÇI2015-05-192-4/+25
|\
| * ipsec: psk keyid bugfixBruno Thomsen2015-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | IPsec/IKEv2 PSK currently generates an invalid strongswan ipsec.conf file. The local IKE ID is not inserted correctly and therefore the all client authentication attempts will fail. A typo in the ipsec_find_id() function causes the fault. Generated output example: leftid = keyid: Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
| * ipsec: added ecc brainpool to vpn_ipsec_convert_to_modp()Bruno Thomsen2015-05-131-0/+9
| | | | | | | | Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
| * ipsec: pfs ecc brainpool curve supportBruno Thomsen2015-05-121-1/+4
| | | | | | | | | | | | Use brainpool curves as perfect forward security. Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
| * ipsec: pfs ecc nist curve supportBruno Thomsen2015-05-121-1/+4
| | | | | | | | | | | | Use nist curves as perfect forward security. Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
| * ipsec: IKEv2 Diffie-Hellman ECC Brainpool supportBruno Thomsen2015-05-121-1/+4
| | | | | | | | | | | | Use of ECC Brainpool curves for IKEv2 is define in RFC6954. Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
| * ipsec: IKE phase one AES-GCM supportBruno Thomsen2015-05-121-0/+3
| | | | | | | | | | | | Use of Galois/Counter Mode (GCM) during IKE phase-1 is defined in RFC4106. Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
| * bugfix: ipsec: nist ecp521 elliptic curve supportBruno Thomsen2015-05-121-1/+1
| | | | | | | | | | | | | | | | There was a small typo the vpn_ipsec_convert_to_modp() function. Bug introduced in commit 7a747654e9ef5b4cec7184c770a24bd1e184ea6e Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
* | Merge pull request #1667 from phil-davis/patch-1Renato Botelho2015-05-191-1/+1
|\ \
| * | Too many left curlies in pkg_edit.phpPhil Davis2015-05-191-1/+1
|/ / | | | | I broke the syntax!
* | Merge pull request #1662 from phil-davis/www-pkgRenato Botelho2015-05-196-966/+1151
|\ \
| * | Code style WWW pkgPhil Davis2015-05-156-966/+1151
| | | | | | | | | | | | | | | | | | | | | | | | | | | The syntax of these all seems good. Because the 2.3-DEVELOPMENT master does not currently have get_pkg_info implemented, the available packages tab always says "Unable to retrieve package info...". But I don't think I broke any code. This is integrated with the little changes for startdisplayingat var in pkg.php
* | | Merge pull request #1665 from phil-davis/www-vpn-l2tpRenato Botelho2015-05-183-281/+323
|\ \ \
| * | | Code style vpn_l2tpPhil Davis2015-05-183-281/+323
| | | |
* | | | Merge pull request #1663 from jlduran/utf8-latin1Renato Botelho2015-05-1820-20/+20
|\ \ \ \ | |/ / / |/| | |
| * | | Remove artifacts from latin1 to utf8 conversionsJose Luis Duran2015-05-1620-20/+20
|/ / / | | | | | | | | | | | | | | | String replacement: s/Ermal L.../Ermal Luçi/g
* | | create /var/spool/lock on nano so tip works without hassles. Ticket #4532Chris Buechler2015-05-151-1/+2
| | |
* | | Disable defering in pfsync which is used for active-active deployments not ↵Ermal LUÇI2015-05-151-0/+1
|/ / | | | | | | useble in FreeBSD. This should fix hangs reported on some machines wiht pfsync
* | Merge pull request #1660 from phil-davis/www-status-rrdRenato Botelho2015-05-153-650/+778
|\ \
| * | Remove excess tabs status_rrd_graphPhil Davis2015-05-151-2/+2
| | |
| * | Code style WWW Status RRDPhil Davis2015-05-153-650/+778
| | |
* | | Merge pull request #1659 from phil-davis/www-statusRenato Botelho2015-05-1521-1446/+1774
|\ \ \
| * | | Code style WWW StatusPhil Davis2015-05-1521-1446/+1774
| |/ /
* | | Use correct variable to fix paginationRenato Botelho2015-05-151-3/+2
| | |
* | | Merge pull request #1661 from phil-davis/patch-1Renato Botelho2015-05-151-1/+1
|\ \ \ | |/ / |/| |
| * | Fix startingat var name typo in pkp.phpPhil Davis2015-05-151-1/+1
|/ / | | | | | | | | | | | | | | Even with this fix, the code does not make sense. The first test is: if ($startingat > -1) if it gets into the else, then $startingat must be negative. But the test in the "else" tests for >1 ??? Someone who knows what it really is supposed to do could fix it!
* | Remove the "insert my MAC" feature from interfaces.php. It hasn't worked in ↵Chris Buechler2015-05-141-9/+0
| | | | | | | | a while (credit sbeaver for noticing), and the only thing it tends to accomplish is breaking people's connectivity from the system where they end up duplicating the MAC of their local system.
* | Add some error checking to avoid warning during bootErmal LUÇI2015-05-141-0/+5
| |
* | Move pt_BR translation from ISO to UTF-8Renato Botelho2015-05-143-3391/+3387
| |
* | Move pt_BR directory, it's moving from ISO to UTF-8Renato Botelho2015-05-142-0/+0
| |
OpenPOWER on IntegriCloud