summaryrefslogtreecommitdiffstats
path: root/usr
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #1616 from Robert-Nelson/floating-interfacesRenato Botelho2015-05-111-1/+57
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' into floating-interfacesRobert Nelson2015-04-254-64/+37
| |\ \
| * | | Add Interfaces column to Floating RulesRobert Nelson2015-04-161-1/+57
| | | |
* | | | Merge pull request #1645 from phil-davis/wizardRenato Botelho2015-05-111-183/+270
|\ \ \ \
| * | | | Code style WizardPhil Davis2015-05-111-183/+270
| | | | |
* | | | | Merge pull request #1644 from phil-davis/firewall-virtual-ipRenato Botelho2015-05-112-421/+484
|\ \ \ \ \
| * | | | | Code style Firewall VIPPhil Davis2015-05-112-421/+484
| |/ / / /
* | | | | Merge pull request #1643 from phil-davis/firewall-scheduleRenato Botelho2015-05-112-813/+786
|\ \ \ \ \
| * | | | | Code style Firewall SchedulePhil Davis2015-05-112-813/+786
| |/ / / /
* | | | | Merge pull request #1642 from phil-davis/firewall-natRenato Botelho2015-05-118-859/+1095
|\ \ \ \ \
| * | | | | Code style Firewall NATPhil Davis2015-05-118-859/+1095
| |/ / / /
* | | | | Merge pull request #1641 from phil-davis/firewall-aliasesRenato Botelho2015-05-113-117/+162
|\ \ \ \ \
| * | | | | Code style firewall_aliasesPhil Davis2015-05-113-117/+162
| |/ / / /
* | | | | Merge pull request #1640 from phil-davis/patch-2Renato Botelho2015-05-111-7/+3
|\ \ \ \ \
| * | | | | Minor changes to firewall_shaper_layer7Phil Davis2015-05-111-7/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tabbing of this code is not so good, so it is difficult to see what is going on. I will format that in a later pull request. These things look unbalanced but actually were not at run time. These changes make it easier to check the code in an editor that can show the balanced "table" "/table", "selected" "/selected". 1) Take the "table" start declaration out of the output form var that has been built up. Put it in-line in the code so it can be seen to match the "/table" now at line 575. $output var is no longer needed. 2) Remove 3 "/select" that were each inside an "if" statement. Put a single "/select" at the end. This makes it easy to see the matching "select" and "/select" and also ensures there will always be a "/select" written. I thought these things were worth doing separate to code-style, as they are "real" changes. The L7 form still works in my testing.
* | | | | Firewall Rules Edit missing slashPhil Davis2015-05-101-1/+1
|/ / / / | | | | | | | | | | | | This should be the end of a "tr" here. Browsers seem to be forgiving of this stuff - I don't see any difference in rendering in Firefox before or after this change.
* | | | Merge pull request #1635 from Robert-Nelson/staticmap-bugRenato Botelho2015-05-081-1/+3
|\ \ \ \
| * | | | Call clear_subsystem_dirty('staticmaps') if using UnboundRobert Nelson2015-05-051-1/+3
| | |_|/ | |/| |
* | | | Merge pull request #1636 from phil-davis/patch-1Renato Botelho2015-05-081-0/+1
|\ \ \ \
| * | | | Unmatched td in firewall_natPhil Davis2015-05-071-0/+1
| |/ / / | | | | | | | | | | | | | | | | This file seems to have an unmatched "td" ending. Adding the line here matches the "td" at line 320 and this embraces the little table that has the 4 icons in it in a square that comes at the right hand end of each port-forward entry in the main table. I can't see any difference in the rendering of the page, at least on Firefox, with and without this fix. The tabbing of this file is woeful. I am fixing that up with a code-style review. But thought I should do a separate pull request for this kind-of-functional fix.
* | | | Fix syntaxRenato Botelho2015-05-081-0/+1
| | | |
* | | | Remove package_skip_tests(), it won't be necessary anymore with pkgRenato Botelho2015-05-071-6/+1
| | | |
* | | | Use 'interfaces_selection' type to miniupnp fieldsRenato Botelho2015-05-071-11/+4
| | | |
* | | | Remove unused functions get_pkg_sizes() and get_package_install_size()Renato Botelho2015-05-071-1/+0
| | | |
* | | | Rename get_pkg_id() to get_package_id() and get_pkg_internal_name() to ↵Renato Botelho2015-05-072-2/+2
| | | | | | | | | | | | | | | | get_package_internal_name(). Try to use more standard parameter names and simplify logic while here
* | | | Pass correct package name to add_package_tabs()Renato Botelho2015-05-073-3/+6
| | | |
* | | | Read tab information from package xml file instead of config.xmlRenato Botelho2015-05-071-7/+9
|/ / /
* | | Encode server name before displaying back to the user.jim-p2015-05-011-1/+1
| | |
* | | Fixes #4633 Enable carp packets to flow on the first carp interface ↵Ermal LUÇI2015-05-011-0/+6
| | | | | | | | | | | | creation. This is needed only when the system is booted up without any carp vip configured
* | | Ticket #4131 before formatting the mac extract the needed statistics from belowErmal LUÇI2015-05-011-1/+1
| | |
* | | Show correct selection for noshuntlan option. Ticket #4655Chris Buechler2015-04-301-1/+1
| | |
* | | Merge pull request #1631 from phil-davis/patch-5Renato Botelho2015-04-271-0/+11
|\ \ \
| * | | Add static mapping interface not set when IP in a poolPhil Davis2015-04-231-0/+11
| | | | | | | | | | | | | | | | | | | | If the DHCP IP address is in a pool (not in the main DHCP range for the interface) then the interface that corresponds to the IP address is not found. This results in the link to "add static mapping for this MAC address" not having any value for "if=" and thus clicking on the "+" button does not work. Reported in bug 4649 Process any pools when checking for which interface contains the IP address.
* | | | Merge pull request #1630 from phil-davis/patch-4Renato Botelho2015-04-271-1/+1
|\ \ \ \
| * | | | Do not process dhcpd implementation if input errorsPhil Davis2015-04-231-1/+1
| |/ / / | | | | | | | | | | | | | | | | If I go to Service->DHCP Server, make some edits that are invalid (e.g. change range start or end to some invalid string) and press Save then the page comes back displaying the input error(s). But it also says: "The changes have been applied successfully." Actually, the changes (which were invalid) have not been applied to the config - all is well there - but dhcpd has been stopped and started and dnsmasq or unbound has been kicked... which is all unnecessary processing since the user has not yet provided valid values to save.
* | | | Merge pull request #1629 from ExolonDX/masterRenato Botelho2015-04-272-4/+5
|\ \ \ \
| * | | | Tidy up "status_upnp.php" XHTMLColin Fleming2015-04-221-4/+4
| | | | | | | | | | | | | | | | | | | | Remove double line from table
| * | | | Tidy up "services_unbound.php" XHTMLColin Fleming2015-04-221-0/+1
| | | | | | | | | | | | | | | | | | | | Add missing closing TD tag
* | | | | Merge pull request #1625 from phil-davis/www-eRenato Botelho2015-04-277-435/+452
|\ \ \ \ \
| * | | | | More www code style oddmentsPhil Davis2015-04-207-435/+452
| | | | | |
* | | | | | Merge pull request #1623 from phil-davis/code-style-diagRenato Botelho2015-04-2746-1324/+1640
|\ \ \ \ \ \
| * | | | | | Code style usr-local-www diagPhil Davis2015-04-1946-1324/+1640
| |/ / / / /
* | | | | | Merge pull request #1622 from phil-davis/usr-local-wwwRenato Botelho2015-04-2718-902/+1028
|\ \ \ \ \ \
| * | | | | | Code style xmlrpcPhil Davis2015-04-191-70/+84
| | | | | | |
| * | | | | | Code style usr-local-www back-endPhil Davis2015-04-1917-841/+954
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | files that do stuff in mostly in the background.
* | | | | | Merge pull request #1618 from phil-davis/www-widgetsRenato Botelho2015-04-2721-829/+926
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Widgets code stylePhil Davis2015-04-1721-829/+926
| |/ / / /
* | | | | Remove the DHCP static lease overlap cleanup and associated function and ↵jim-p2015-04-241-49/+0
| |_|_|/ |/| | | | | | | | | | | kill, as it can cause problems with failover scenarios.
* | | | Trying to submit a symlink as part of crash reports will cause a failedChris Buechler2015-04-221-10/+12
| |_|/ |/| | | | | | | | | | | submission. Remove symlinks first. Also properly set user agent while here, consistent with others. Fix some style and whitespace too. Ticket
* | | Fix #4640 IPsec Auto-exclude LAN address togglesPhil Davis2015-04-201-1/+1
| |/ |/| | | | | every time save is pressed. Actually the GUI is displaying the opposite setting to what is in the config. When the user pressed save that opposite setting was saved, but then again it displays the opposite of the opposite...
OpenPOWER on IntegriCloud