summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update translation filesRenato Botelho2017-03-2154-65833/+77274
* Regenerate potRenato Botelho2017-03-211-2315/+2697
* Merge pull request #3652 from phil-davis/allow-empty-widgetsSteve Beaver2017-03-200-0/+0
|\
| * Merge branch 'master' into allow-empty-widgetsPhil Davis2017-03-2045-392/+505
| |\
* | \ Merge pull request #3653 from phil-davis/widget-filter-none2Steve Beaver2017-03-200-0/+0
|\ \ \
| * \ \ Merge branch 'master' into widget-filter-none2Phil Davis2017-03-2045-392/+505
| |\ \ \ | | | |/ | | |/|
* | | | Merge pull request #3658 from phil-davis/multiple-copies-of-widgets-1Steve Beaver2017-03-2020-866/+1103
|\ \ \ \ | |_|/ / |/| | |
| * | | Integrate new interfaces widget AJAXPhil Davis2017-03-211-12/+21
| * | | Merge branch 'master' into multiple-copies-of-widgets-1Phil Davis2017-03-2045-392/+505
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #3639 from doktornotor/patch-26Steve Beaver2017-03-202-4/+5
|\ \ \ \
| * | | | Add unknown service for Bug #4287doktornotor2017-03-101-0/+1
| * | | | Do not report misleading 3G service status (Bug #4287)doktornotor2017-03-101-4/+4
* | | | | Merge pull request #3642 from phil-davis/icmp-type-skip-redmine-7372Steve Beaver2017-03-202-1/+20
|\ \ \ \ \
| * | | | | Fix #7372 Cannot filter ICMP Type SKIPPhil Davis2017-03-122-1/+20
| |/ / / /
* | | | | Merge pull request #3650 from phil-davis/nat-descriptionSteve Beaver2017-03-203-0/+12
|\ \ \ \ \
| * | | | | No need to check for HTML in NAT 1to1 or NAT Out descrPhil Davis2017-03-172-0/+8
| * | | | | No need to check for HTML in NAT descrPhil Davis2017-03-171-0/+4
* | | | | | Merge pull request #3657 from phil-davis/traffic-graph-widget-filter-none-buttonSteve Beaver2017-03-201-5/+1
|\ \ \ \ \ \
| * | | | | | Redmine #7318 None button for Traffic Graphs Widget filterPhil Davis2017-03-191-5/+1
* | | | | | | Merge pull request #3656 from phil-davis/traffic-graph-widget-filter-handle-n...Steve Beaver2017-03-201-4/+14
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Traffic Graphs Widget handle no items selected for displayPhil Davis2017-03-191-4/+14
* | | | | | | Merge pull request #3655 from phil-davis/traffic-graph-widget-filter-checkboxesSteve Beaver2017-03-203-314/+218
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Upgrade code to convert old Traffic Graphs Widget settingsPhil Davis2017-03-192-1/+37
| * | | | | | Convert Traffic Graph Widget to use checkboxes for display selectionPhil Davis2017-03-191-309/+176
| * | | | | | Traffic Graphs Widget whitespacePhil Davis2017-03-191-42/+43
* | | | | | | Merge pull request #3649 from doktornotor/patch-31Steve Beaver2017-03-201-2/+7
|\ \ \ \ \ \ \
| * | | | | | | Make sure that array exists before using foreach() (Bug #7399)doktornotor2017-03-161-2/+7
* | | | | | | | Merge pull request #3648 from doktornotor/patch-30Steve Beaver2017-03-201-4/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove input validation since there is no user input here.doktornotor2017-03-161-4/+0
| |/ / / / / / /
* | | | | | | | Merge pull request #3645 from phil-davis/patch-5Steve Beaver2017-03-201-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix comment typo in firewall_rules.phpPhil Davis2017-03-131-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #3643 from phil-davis/disable-alias-popup-in-rules-7381Steve Beaver2017-03-206-6/+51
|\ \ \ \ \ \ \ \
| * | | | | | | | Redmine #7381 Disable detail in alias popupPhil Davis2017-03-136-6/+51
| |/ / / / / / /
* | | | | | | | Merge pull request #3634 from doktornotor/patch-23Steve Beaver2017-03-204-6/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Add missing includesdoktornotor2017-03-131-0/+3
| * | | | | | | | Fix missing includesdoktornotor2017-03-131-0/+4
| * | | | | | | | Fix broken includesdoktornotor2017-03-131-0/+4
| * | | | | | | | Add reason to write_config() calldoktornotor2017-03-091-1/+1
| * | | | | | | | Add reason to write_config() calldoktornotor2017-03-091-1/+1
| * | | | | | | | Add reason to write_config() callsdoktornotor2017-03-091-3/+3
| * | | | | | | | Add reason to write_config() calldoktornotor2017-03-091-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #3633 from doktornotor/patch-22Steve Beaver2017-03-205-7/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Add reason to write_config() calldoktornotor2017-03-091-1/+1
| * | | | | | | | Add reason to write_config() calldoktornotor2017-03-091-1/+1
| * | | | | | | | Add reason to write_config() calldoktornotor2017-03-091-1/+1
| * | | | | | | | Add reason to write_config() calldoktornotor2017-03-091-1/+1
| * | | | | | | | Add reason to write_config() callsdoktornotor2017-03-091-3/+3
| |/ / / / / / /
* | | | | | | | Merge pull request #3563 from NOYB/GitSync_-_Remove_PersonalizationsSteve Beaver2017-03-201-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | GitSync - Remove your personalizationsNOYB2017-02-211-2/+2
* | | | | | | | | Merge pull request #3605 from doktornotor/patch-7Steve Beaver2017-03-201-2/+16
|\ \ \ \ \ \ \ \ \
OpenPOWER on IntegriCloud