summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2749 from phil-davis/patch-5Stephen Beaver2016-03-161-2/+2
|\
| * servise_dhcp include btnadvopts in sectionPhil Davis2016-03-161-2/+2
| | | | | | | | | | | | | | | | Before this change, $section is added to $form before btnadvopts is put into $section. The previous code looked to me like btnadvopts would end up in a $section object that got overwritten by the new Form_Section at line 1165. This change makes sure that the button is added to the section, and then the section is added to the form. But actually the old code is working OK. (And the new code also works just the same) So am I missing something?
* | Merge pull request #2748 from phil-davis/patch-3Stephen Beaver2016-03-161-30/+82
|\ \
| * | Redmine #5994 services_ntpd standardize advanced buttonsPhil Davis2016-03-161-30/+82
| |/
* | services_ntpd_gps fix handling of initcmdPhil Davis2016-03-161-3/+5
|/ | | | | | | 1) When reading the (encoded) initcmd string into Form_Textarea(), decode it. Previously the encoded value was displaying in the text area and when the user presses save, that encode string is itself encoded again in the config and thus stuffs things up. 2) When loading the page, only use set_gps_default() to set initcmd if initcmd is currently empty. Previously the initcmd value would be set to the default string for the GPS type every time the page loaded, which would override any change that the user had made. Note: After this is fixed, then I will also submit changes to make the Advanced button work in the new ways.
* Merge pull request #2746 from phil-davis/patch-3Renato Botelho2016-03-161-2/+2
|\
| * services_ntpd fix leaptext array key namePhil Davis2016-03-161-2/+2
| | | | | | Use leaptext everywhere - some references were to leaptext and some to leaptxt, so it didn't work.
* | HTML Compliance - Firewall / Aliases / Bulk ImportNOYB2016-03-161-2/+2
|/ | | | Error: Element ul not allowed as child of element span in this context. (Suppressing further errors from this subtree.)
* add btn-warning color to dark themeJared Dillard2016-03-151-0/+10
|
* update btn-primary color on dark themeJared Dillard2016-03-151-4/+4
|
* remove troubleshooting codeJared Dillard2016-03-151-2/+2
|
* update colors and rules on dark themeJared Dillard2016-03-151-2/+7
|
* update btn-info color on dark themeJared Dillard2016-03-151-4/+15
|
* Comment typos - firewall_rulesPhil Davis2016-03-161-4/+4
|
* Fixed #5953 Dashboard widget alignment issuesJared Dillard2016-03-151-3/+5
|
* Highlight moved rows to confirm moveStephen Beaver2016-03-151-0/+7
|
* Add color to the CARP status icons so they are more visually distinct. ↵jim-p2016-03-152-6/+6
| | | | Ticket #5965
* remove beta marking for dashboard columns featureJared Dillard2016-03-151-1/+1
|
* fix primary button text colorJared Dillard2016-03-151-2/+0
|
* Fixed #5998 menu bar formatting with 10 digit alertsJared Dillard2016-03-151-0/+4
|
* Merge pull request #2742 from phil-davis/patch-6Stephen Beaver2016-03-151-32/+69
|\
| * Redmine #5994 Standardize gateways edit advanced buttonPhil Davis2016-03-151-32/+69
| |
* | Merge pull request #2741 from phil-davis/patch-5Stephen Beaver2016-03-151-78/+205
|\ \
| * | Redmine #5972 Display Advanced settings on page loadPhil Davis2016-03-151-78/+205
| | | | | | | | | | | | If there are non-default advanced settings, then the relevant fields are displayed on page load. Advanced button behavior is standardized as described in redmine #5994
* | | Merge pull request #2740 from phil-davis/patch-4Stephen Beaver2016-03-151-44/+126
|\ \ \
| * | | Redmine #5994 Make DHCP static edit advanced buttonsPhil Davis2016-03-151-44/+126
| |/ / | | | | | | Make the advanced buttons consistent.
* | | Merge pull request #2739 from phil-davis/patch-3Stephen Beaver2016-03-151-79/+148
|\ \ \ | |_|/ |/| |
| * | Redmine #5994 Make DHCP advanced buttons work consistentlyPhil Davis2016-03-151-79/+148
| |/ | | | | | | This is the first UI page to be changed so that the Advanced buttons work as specified in Redmine #5994 If this seems like a reasonable way to do it, then I will make similar code for the other UI pages with Advanced buttons.
* | Merge pull request #2737 from NOYB/HTML_Compliance_-_InterfacesStephen Beaver2016-03-151-3/+3
|\ \ | |/ |/|
| * HTML Compliance - InterfacesNOYB2016-03-151-3/+3
| | | | | | | | | | Error: Duplicate ID btnadvppp. <a class=btn btn-default btn-info href=interfaces_ppps_edit.php id=btnadvppp>
* | Revert "Merge pull request #2728 from phil-davis/form_button"Renato Botelho2016-03-1558-138/+138
|/ | | | | This reverts commit a32bed49516f3df3d104a5026a5b2c74451f348f, reversing changes made to 9ec9978267a5d1985d6da8ba35d52b7174239d2f.
* Fix population of the wireless parent list. Fixes #5992jim-p2016-03-141-2/+2
|
* Re-commit changeStephen Beaver2016-03-142-2/+32
|
* Revert "Fixed #5983"Stephen Beaver2016-03-142-32/+2
| | | | This reverts commit 9ec9978267a5d1985d6da8ba35d52b7174239d2f.
* Use product name rather than smbios here.Chris Buechler2016-03-141-1/+1
|
* Merge pull request #2736 from phil-davis/patch-2Stephen Beaver2016-03-141-3/+3
|\
| * Translate button textPhil Davis2016-03-141-3/+3
| |
* | Merge pull request #2735 from ↵Stephen Beaver2016-03-141-8/+8
|\ \ | | | | | | | | | NOYB/HTML_Compliance_-_Firewall_/_Schedules_/_Edit_-_Readonly_Attribute
| * | HTML Compliance - Firewall / Schedules / Edit - Readonly AttributeNOYB2016-03-141-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Error: Bad value readonly for attribute type on element input. Readonly is not a valid type attribute value. If the intention here is to prevent the fields from being edited. Use the readonly attribute. Since editing was not actually being prevented by this I did not add the readonly attribute so as to not change existing behavior.
* | | Merge pull request #2732 from ExolonDX/branch_02Stephen Beaver2016-03-141-1/+1
|\ \ \
| * | | Change to 4 spacesColin Fleming2016-03-141-1/+1
| | | |
| * | | Tidy up "system_gateways_edit"Colin Fleming2016-03-121-1/+1
| | | | | | | | | | | | | | | | Tidy up missing semi-colon in non-breaking space
* | | | Merge pull request #2728 from phil-davis/form_buttonStephen Beaver2016-03-1458-138/+138
|\ \ \ \
| * \ \ \ Resolve conflicts with masterPhil Davis2016-03-1110-326/+289
| |\ \ \ \
| * | | | | Internationalize Form_Button textPhil Davis2016-03-1158-138/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The text of a Form_Button is not translated internally. Some Form_Button calls already had the button text enclosed in gettext(), this does it for the remaining ones.
* | | | | | Fixed #5983Stephen Beaver2016-03-142-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | Added the ability to move multiple firewall rules via a "movre to here" icon (anchor)
* | | | | | Icon missing from default pkg.php save button. Ticket #5965jim-p2016-03-141-1/+1
| | | | | |
* | | | | | Fix styling on "Create Phase 1" button. Ticket #5965jim-p2016-03-141-1/+1
| | | | | |
* | | | | | Anchot icon requires icon-pointer classStephen Beaver2016-03-141-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #2734 from ↵Renato Botelho2016-03-141-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | NOYB/System_/_Routing_/_Gateways_/_Edit_-_Punctuation
OpenPOWER on IntegriCloud