summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2352 from phil-davis/status_graphStephen Beaver2016-01-041-0/+1
|\
| * Add back display description option for status_graphPhil Davis2016-01-041-0/+1
| | | | | | | | | | | | | | | | | | The code that provides the data for this is already in bandwidth_by_ip.php in both 2.2.* and master 2.3. The description option is in the Display dropdown list in 2.2.*, but it got missed in the bootstrap conversion and integration process. With just this 1-line addition the Display Description option can be selected and works.
* | Fixed #5733Stephen Beaver2016-01-042-73/+10
|/
* Correct "noWrap" in text areas. (Function is not actually used by anyone, ↵Stephen Beaver2016-01-041-1/+1
| | | | but it might as well work just in case.
* Merge pull request #2351 from NOYB/HTML_Compliance_-_Firewall_/_NAT/_1_1_/_EditStephen Beaver2016-01-041-2/+2
|\
| * HTML Compliance - Firewall / NAT/ 1:1 / EditNOYB2016-01-041-2/+2
| | | | | | | | | | | | Bad value [0-9, a-z, A-Z and . for attribute pattern on element input: Unterminated character class <input class="form-control" name="src" id="src" type="text" pattern="[0-9, a-z, A-Z and ."> <input class="form-control" name="dst" id="dst" type="text" pattern="[0-9, a-z, A-Z and .">
* | Merge pull request #2350 from phil-davis/status_logsStephen Beaver2016-01-040-0/+0
|\ \
| * | Redmine #5731 Error when setting various system log settings from factory ↵Phil Davis2016-01-042-2/+6
| |/ | | | | | | | | | | default config Forum https://forum.pfsense.org/index.php?topic=104762.0
* | Redmine #5731 Error when setting various system log settings from factory ↵Phil Davis2016-01-042-2/+6
| | | | | | | | | | | | default config Forum https://forum.pfsense.org/index.php?topic=104762.0
* | Adjust dpinger default values to match recent changes in dpinger projectRenato Botelho2016-01-041-2/+2
|/
* Merge pull request #2348 from phil-davis/patch-4Stephen Beaver2016-01-031-3/+3
|\
| * Redmine #5728 Fix delete row button in Firewall Schedule EditPhil Davis2016-01-031-3/+3
|/ | | | The calls to delete_row() were going off to some other delete_row() function and not doing what was needed. Give delete_row() here a unique name and it all works again.
* Merge pull request #2347 from ↵Stephen Beaver2016-01-031-10/+10
|\ | | | | | | NOYB/HTML_Compliance_-_Firewall_/_NAT_/_Port_Forward_/_Edit
| * HTML Compliance - Firewall / NAT / Port Forward / EditNOYB2016-01-031-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | Attribute min/max not allowed on element input at this point. <input class="form-control" name="srcbeginport_cust" id="srcbeginport_cust" type="text" value="any" min="1" max="65536"> <input class="form-control" name="srcendport_cust" id="srcendport_cust" type="text" value="any" min="1" max="65536"> Attribute min/max not allowed on element input at this point. <input class="form-control" name="dstbeginport_cust" id="dstbeginport_cust" type="text" value="any" min="1" max="65536"> <input class="form-control" name="dstendport_cust" id="dstendport_cust" type="text" value="any" min="1" max="65536"> Attribute min/max not allowed on element input at this point. <input class="form-control" name="localbeginport_cust" id="localbeginport_cust" type="text" min="1" max="65536">
* | Merge pull request #2346 from NOYB/HTML_Compliance_-_Firewall_/_Aliases_/_EditStephen Beaver2016-01-031-1/+1
|\ \
| * | HTML Compliance - Firewall / Aliases / EditNOYB2016-01-021-1/+1
| |/ | | | | | | | | Bad value [0-9, a-z, A-Z and . for attribute pattern on element input: Unterminated character class <input class="form-control" name="address0" id="address0" type="text" value="" pattern="[0-9, a-z, A-Z and ." placeholder="Address">
* | Merge pull request #2345 from NOYB/HTML_Compliance_-_Services_Status_WidgetStephen Beaver2016-01-031-2/+8
|\ \
| * | HTML Compliance - Services Status WidgetNOYB2016-01-011-2/+8
| |/ | | | | | | | | Element option without attribute label must not be empty. <option selected></option>
* | Fix reading of server list on page loadStephen Beaver2016-01-022-4/+8
| |
* | Fixed #5724Stephen Beaver2016-01-021-4/+4
|/
* Merge pull request #2344 from phil-davis/patch-4Renato Botelho2016-01-011-1/+1
|\
| * Remove extra spaces on welcome textPhil Davis2016-01-011-1/+1
|/ | | | Must be feeling OCD today. The console output had 2 spaces between "2.3-ALPHA" and "on the". I also removed the space before "..." because all the subsequent lines of console output have no space before the "...'. Actually this is a title line, so maybe the "..." could be deleted here also :)
* Revert "Build pecl-rrd"Renato Botelho2015-12-311-1/+0
| | | | This reverts commit 51c8a5dad94270e3a3d52175ffdc57ada34eb61a.
* Build pecl-rrdRenato Botelho2015-12-311-0/+1
|
* Enable build of rrdtool 1.4Renato Botelho2015-12-311-0/+1
|
* Add options to build rrdtool 1.4Renato Botelho2015-12-311-0/+2
|
* Merge pull request #2341 from NOYB/HTML_Compliance_-_Interfaces_/_VLANStephen Beaver2015-12-311-0/+1
|\
| * HTML Compliance - Interfaces / VLANNOYB2015-12-311-0/+1
| | | | | | | | A table row was 5 columns wide and exceeded the column count established by the first row (4).
* | Merge pull request #2339 from BBcan177/patch-2Stephen Beaver2015-12-311-3/+2
|\ \
| * | pkg_mgr_installed - Fix disablepackagehistoryBBcan1772015-12-311-3/+2
| |/ | | | | * Improve if/else/endif
* | Merge pull request #2338 from BBcan177/patch-1Stephen Beaver2015-12-311-6/+6
|\ \ | |/ |/|
| * pkg_mgr - Fix disablepackagehistoryBBcan1772015-12-301-6/+6
|/ | | | * Version title should always print * $g['disablepackagehistory'] only disables the changelog hyperlink
* Fixed #5717Stephen Beaver2015-12-302-28/+27
|
* Merge pull request #2325 from stilez/patch-7Renato Botelho2015-12-301-5/+4
|\
| * Redundant logic tests in a range checkstilez2015-12-251-5/+4
| | | | | | | | | | | | | | The logic here is redundant. It tests IP1<START || IP2<START || IP1>END || IP2>END. *Then* it tests if IP1<IP2 unsigned. If the latter test succeeds (ie test that first) then IP1>=START *must imply* IP2>=START and IP2<=END *must imply* IP1<=END. In other words we only need to test: START <= IP1 <= IP2 <= END, ie 3 logic tests (IP1<=IP2 && IP1>=START && IP2<=END) not 5 logic tests.
* | Merge pull request #2337 from BBcan177/patch-1Stephen Beaver2015-12-301-54/+38
|\ \
| * | Update pkg_mgr.phpBBcan1772015-12-301-1/+1
| | | | | | | | | Update syntax to 4 space indent
| * | Update pkg_mgr.phpBBcan1772015-12-301-54/+38
| | | | | | | | | | | | | | | | | | | | | | | | * Note - There are two lines previously commented out at Lines! (L127-128) * Mods to if/else/elseif/endif statements for consistency. * Change package dependency href link icon from "paper-clip" to "globe". * Put package dependency links into a < ul > for a cleaner output when dependencies span over two lines. * Add missing gettext()
* | | Add password confirmation and change to Form_* frameworkStephen Beaver2015-12-301-53/+45
|/ /
* | Fixed #5714Stephen Beaver2015-12-303-2/+27
| |
* | Merge pull request #2335 from ↵Stephen Beaver2015-12-301-0/+1
|\ \ | | | | | | | | | NOYB/HTML_Compliance_-_Interfaces_/_Assign_network_ports
| * | HTML Compliance - Interfaces / Assign network portsNOYB2015-12-301-0/+1
| | | | | | | | | | | | A table row was 3 columns wide and exceeded the column count established by the first row (2).
* | | Merge pull request #2334 from BBcan177/patch-2Stephen Beaver2015-12-301-21/+22
|\ \ \
| * | | Update pkg_mgr_installed.phpBBcan1772015-12-291-21/+22
| |/ / | | | | | | | | | | | | | | | | | | | | | * Mods to if/else/elseif/endif statements for consistency. * Change font red to span class. * Change package dependency href link icon from "paper-clip" to "globe". * Remove redundant <i> in package dependency href link * Put package dependency links into a <ul> for a cleaner output when dependencies span over two lines. * Add <div> to "Action" column as the "!" icon was previously printing on the next line.
* | | Merge pull request #2336 from heper/patch-1Renato Botelho2015-12-301-1/+1
|\ \ \
| * | | Fix typo password confirmheper2015-12-301-1/+1
|/ / / | | | | | | https://forum.pfsense.org/index.php?topic=104629.0
* | | Remove workaround to get dpinger running when interface is in tentative stateRenato Botelho2015-12-301-20/+2
|/ /
* | Add output validation here too. Ticket #5351Chris Buechler2015-12-291-2/+2
| |
* | complete breadcrumbs for each tabJared Dillard2015-12-292-2/+2
| |
* | Do not start dpinger processes due to rrdRenato Botelho2015-12-291-4/+0
| |
OpenPOWER on IntegriCloud