summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix syntax/quoting error in rc.carpmaster and rc.carpbackupjim-p2015-09-082-2/+2
|
* Use git instead of git-liteRenato Botelho2015-09-031-1/+1
|
* Revert "convert old icons to glyphicons"Jared Dillard2015-09-021-3/+3
| | | | This reverts commit 02274bf8aae1c3641fa413cab99b0f9331359dbe.
* convert old icons to glyphiconsJared Dillard2015-09-021-3/+3
|
* Do not explicit add opcache to zend_extension, just enable or disable itRenato Botelho2015-09-011-4/+5
|
* Merge pull request #1824 from phil-davis/dhcp-pools-rangeRenato Botelho2015-08-281-0/+8
|\
| * Ignore DHCP pools that are out of rangePhil Davis2015-08-261-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user changes the subnet of an interface then applies without adjusting the DHCP pool range/s to be in the new subnet, then an invalid dhcpd.conf is generated. The DHCP server complains about it and exits. If you have only 1 LAN with DHCP then it does not make a difference - you are not going to get DHCP whatever happens because there is no valid pool data. But if there are multiple LAN-style interfaces with DHCP then you can cause no DHCP-service on LAN when you are messing with settings on OPT1/OPT2... I did this to myself last night, and even after rebooting got no DHCP for either my LAN or OPT1, just because the OPT1 pool settings were bad. This change checks that the pool ranges are in the interface subnet. If they are not, then they are excluded from dhcpd.conf and a notice os filed. The user gets the flashing notice stuff on the webGUI to tell them what is wrong. And any other good DHCP interfaces+pools continue to work. This is a resubmit of PR #1783 after integrating to the current master.
* | Merge pull request #1826 from phil-davis/v10-bigger-than-v9Renato Botelho2015-08-281-2/+2
|\ \
| * | Redmine #4925 Fix version comparison to know 10 is bigger than 9Phil Davis2015-08-261-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This rtrim of ".0" is stripping any "0" from the end of the passed-in version strings. That makes "2.3.10" become "2.3.1" which then removes any chance of the following nice comparison logic working. Just removing the "0" seems fine. It keeps the supplied version data untouched, just getting rid of any trailing dots. Apart from fixing the bug here, this change has the side-effect that a version change from "2.3" to "2.3.0" will now be seen as an upgrade. What is the requirement for that? Do you want to have extra logic that checks for "bare" zeroes on the end and make "2.3", "2.3.0", "2.3.0.0"... all be considered the same version? This is a resubmit of PR #1810 after integrating with the current master.
* | Merge pull request #1833 from doktornotor/patch-5Renato Botelho2015-08-281-1/+1
|\ \
| * | mail.php code styledoktornotor2015-08-281-1/+1
| | | | | | | | | Resubmit of #1813 since noone picked it up yet, LOL.
* | | Merge pull request #1821 from phil-davis/upgrade-configRenato Botelho2015-08-281-32/+63
|\ \ \ | |/ / |/| |
| * | Protect unset() with isset() in upgrade_configPhil Davis2015-08-261-32/+63
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forum: https://forum.pfsense.org/index.php?topic=96827.0 Sometimes there can be unexpected stuff in a config. To avoid errors like "PHP Fatal error: Cannot unset string offsets in /etc/inc/upgrade_config.inc on line 291" it seems good to use belts-and-braces checks with any unset() of associative array elements, just in case the thing above is an empty string (instead of an array or non-existent thing). An unnecessary error in processing the upgrade code can mean missing other important upgrade stuff. These are the places I could see in upgrade_config.inc where unset() is not already protected by isset(). A lot of them are "that could not ever go wrong", but IMHO it is worth protecting them all just to be sure. This is a resubmit of PR #1773 after integrating with current master.
* | Merge pull request #1825 from phil-davis/newer-releaseRenato Botelho2015-08-281-1/+4
|\ \
| * | Inform on dashboard when on a later version than the official releasePhil Davis2015-08-261-1/+4
| |/ | | | | | | | | | | | | | | For people that are running a development or RC version that is later than the official release, this will display that on the dashboard version check. This is a resubmit of PR #1785 after integrating with the current master.
* | Merge pull request #1828 from doktornotor/patch-7Renato Botelho2015-08-281-1/+6
|\ \
| * | Indentation fixdoktornotor2015-08-281-1/+1
| | |
| * | make sure that cron is running before reconfiguring itdoktornotor2015-08-281-0/+5
| | | | | | | | | | | | | | | This is a resubmit of #1814. (When cron goes away for whatever reason, you can keep reconfiguring it till blue in face but nothing will happen.)
* | | Merge pull request #1830 from doktornotor/patch-6Renato Botelho2015-08-282-6/+13
|\ \ \
| * | | Declare the harddisks variable only if neededdoktornotor2015-08-281-4/+4
| | | |
| * | | Re-enable hard disk standby (Bug #4569)doktornotor2015-08-281-1/+1
| | | |
| * | | Bug #4569 - system_set_harddisk_standby() rewritte for current CAM-based ATA ↵doktornotor2015-08-281-5/+12
| |/ / | | | | | | | | | | | | stack Resubmit of #1767
* | | remove routed service, is being handled by the packagedoktornotor2015-08-281-7/+0
|/ / | | | | Resubmit of #1817. See pfsense/pfsense-packages#1006
* | Remove ioncube references from php.ini, and set zend_extensions properlyRenato Botelho2015-08-271-42/+3
| |
* | Move opcache to zend_extensionsRenato Botelho2015-08-271-3/+4
| |
* | Update gitsync description for branch master, spotted by @phil-davisRenato Botelho2015-08-271-1/+1
| |
* | Obsolete use of /etc/nano_use_vga.txt, Use enableserial_force flag insteadRenato Botelho2015-08-277-8/+9
| |
* | Make gitsync work with new repo structure, copying files under src/. It ↵Renato Botelho2015-08-271-2/+2
| | | | | | | | should fix #4999
* | Remove duplicate parameterRenato Botelho2015-08-271-1/+1
| |
* | Fix indentRenato Botelho2015-08-271-2/+2
| |
* | Remove old branches, it's not a good idea to gitsync a new system with old ↵Renato Botelho2015-08-271-4/+0
| | | | | | | | branch
* | Fix incorrect variable references for CARP VIPs. Fixes #5016jim-p2015-08-261-1/+1
|/
* update config to rid of nt-hashJim Thompson2015-08-252-1/+10
| | | | credit to: das projekt der goatse
* For captive portal, if a user reloads index.php of the portal while already ↵jim-p2015-08-252-1/+29
| | | | | | logged in, show the logout page instead if it's custom. Must be a custom logout page that does not include a redirect.
* Move main pfSense content to src/Renato Botelho2015-08-252850-0/+464776
OpenPOWER on IntegriCloud