Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change savings display class. | Stephen Beaver | 2015-08-07 | 1 | -1/+2 |
* | Added panel etc | Stephen Beaver | 2015-08-07 | 1 | -182/+190 |
* | Merge branch 'firewall_nat_npt' into bootstrap | Stephen Beaver | 2015-08-06 | 1 | -1/+34 |
|\ | |||||
| * | Save changed rule order | Stephen Beaver | 2015-08-06 | 1 | -1/+34 |
* | | Merge branch 'firewall_nat_1to1' into bootstrap | Stephen Beaver | 2015-08-06 | 1 | -0/+19 |
|\ \ | |||||
| * | | Save re-ordered list | Stephen Beaver | 2015-08-06 | 1 | -0/+19 |
* | | | Merge branch 'firewall_nat_out' into bootstrap | Stephen Beaver | 2015-08-06 | 1 | -0/+19 |
|\ \ \ | |||||
| * | | | Added store changes | Stephen Beaver | 2015-08-06 | 1 | -0/+19 |
* | | | | Merge branch 'firewall_nat' into bootstrap | Stephen Beaver | 2015-08-06 | 1 | -67/+90 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Added store changes button and containing panel | Stephen Beaver | 2015-08-06 | 1 | -67/+90 |
* | | | | Merge branch 'firewall_nat_1to1' into bootstrap | Stephen Beaver | 2015-08-06 | 1 | -14/+17 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Updated to use jquery drag/move | Stephen Beaver | 2015-08-06 | 1 | -14/+17 |
* | | | | Merge branch 'firewall_nat_out' into bootstrap | Stephen Beaver | 2015-08-06 | 1 | -14/+18 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Updated to use jQuery drag/move | Stephen Beaver | 2015-08-06 | 1 | -14/+18 |
* | | | | Merge branch 'firewall_nat' into bootstrap | Stephen Beaver | 2015-08-06 | 1 | -23/+18 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Updated to use jQuery row drag/move | Stephen Beaver | 2015-08-06 | 1 | -82/+81 |
| * | | | Highlight all cells in the row | Stephen Beaver | 2015-08-05 | 1 | -3/+1 |
| * | | | Add containing panel | Stephen Beaver | 2015-08-04 | 1 | -76/+74 |
* | | | | Merge branch 'firewall_aliases_edit.php' into bootstrap | Stephen Beaver | 2015-08-06 | 1 | -3/+49 |
|\ \ \ \ | |||||
| * | | | | Fixed issue when address array contained blank entries | Stephen Beaver | 2015-08-06 | 1 | -3/+49 |
|/ / / / | |||||
* | | | | Merge branch 'firewall_nat_out' into bootstrap | Stephen Beaver | 2015-08-06 | 1 | -335/+338 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | firewall_nat_out Conversion complete | Stephen Beaver | 2015-08-06 | 1 | -335/+338 |
|/ / / | |||||
* | | | Merge branch 'loadbalancer_monitor' into bootstrap | Stephen Beaver | 2015-08-04 | 2 | -207/+229 |
|\ \ \ | |||||
| * | | | load_balancer_monitir Conversion complete | Stephen Beaver | 2015-08-04 | 2 | -207/+229 |
|/ / / | |||||
* | | | Merge branch 'firewall_nat_1to1' into bootstrap | Stephen Beaver | 2015-08-04 | 2 | -473/+413 |
|\ \ \ | | |/ | |/| | |||||
| * | | firewall_nat_1to1 COnversion complete | Stephen Beaver | 2015-08-04 | 1 | -74/+69 |
| * | | Initial conversion | Stephen Beaver | 2015-08-04 | 2 | -474/+419 |
|/ / | |||||
* | | Merge https://github.com/SjonHortensius/pfsense into bootstrap | Stephen Beaver | 2015-08-03 | 0 | -0/+0 |
|\ \ | |||||
| * \ | Merge pull request #335 from sbeaver-netgate/XSS | SjonHortensius | 2015-08-03 | 7 | -1173/+11 |
| |\ \ | |||||
* | \ \ | Merge branch 'firewall_nat_edit' into bootstrap | Stephen Beaver | 2015-08-03 | 1 | -486/+748 |
|\ \ \ \ | |||||
| * | | | | Fixed error in use of array_merge() | Stephen Beaver | 2015-07-31 | 1 | -1/+1 |
| * | | | | firewall_nat_edit.php COnversion complete | Stephen Beaver | 2015-07-30 | 1 | -231/+235 |
| * | | | | firewall_nat_edit Partial conversion | Stephen Beaver | 2015-07-30 | 1 | -472/+730 |
* | | | | | Merge branch 'firewall_nat' into bootstrap | Stephen Beaver | 2015-08-03 | 2 | -252/+314 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | firewall_nat.php Conversion complete | Stephen Beaver | 2015-07-31 | 2 | -252/+314 |
| |/ / / | |||||
* | | | | Merge branch 'XSS' into bootstrap | Stephen Beaver | 2015-08-03 | 7 | -1173/+11 |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | |||||
| * | | XSS/Security updates from upstream | Stephen Beaver | 2015-08-03 | 7 | -1173/+11 |
|/ / | |||||
* | | Merge pull request #331 from sbeaver-netgate/firewall_nat_out_edit.php | SjonHortensius | 2015-08-02 | 1 | -509/+459 |
|\ \ | |||||
| * | | firewall_nat_out_edit.php Conversion complete | Stephen Beaver | 2015-07-29 | 1 | -509/+459 |
| |/ | |||||
* | | Merge pull request #329 from sbeaver-netgate/system_crlmanager.php | SjonHortensius | 2015-08-02 | 1 | -356/+377 |
|\ \ | |||||
| * | | system_crlmanager.php Conversion complete | Stephen Beaver | 2015-07-10 | 1 | -356/+377 |
| |/ | |||||
* | | fix a few syntax problems #327 | Sjon Hortensius | 2015-08-02 | 1 | -2/+2 |
* | | Merge pull request #327 from sbeaver-netgate/diag_ipsec.php | SjonHortensius | 2015-08-02 | 1 | -382/+335 |
|\ \ | |||||
| * | | Debug removed | Stephen Beaver | 2015-07-09 | 1 | -137/+11 |
| * | | diag_ipsec.php | sbeaver | 2015-07-09 | 1 | -384/+463 |
| |/ | |||||
* | | Merge pull request #326 from sbeaver-netgate/diag_gmirror.php | SjonHortensius | 2015-08-02 | 1 | -172/+199 |
|\ \ | |||||
| * | | diag_gmirror.php | sbeaver | 2015-07-09 | 1 | -172/+199 |
| |/ | |||||
* | | Merge pull request #325 from sbeaver-netgate/services_captiveportal.php | SjonHortensius | 2015-08-02 | 1 | -679/+798 |
|\ \ | |||||
| * | | Restore section commented out for testing | sbeaver | 2015-07-08 | 1 | -4/+4 |
| * | | services_captiveportal.php Conversion complete | sbeaver | 2015-07-08 | 1 | -683/+802 |
| |/ |