summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Change savings display class.Stephen Beaver2015-08-071-1/+2
* Added panel etcStephen Beaver2015-08-071-182/+190
* Merge branch 'firewall_nat_npt' into bootstrapStephen Beaver2015-08-061-1/+34
|\
| * Save changed rule orderStephen Beaver2015-08-061-1/+34
* | Merge branch 'firewall_nat_1to1' into bootstrapStephen Beaver2015-08-061-0/+19
|\ \
| * | Save re-ordered listStephen Beaver2015-08-061-0/+19
* | | Merge branch 'firewall_nat_out' into bootstrapStephen Beaver2015-08-061-0/+19
|\ \ \
| * | | Added store changesStephen Beaver2015-08-061-0/+19
* | | | Merge branch 'firewall_nat' into bootstrapStephen Beaver2015-08-061-67/+90
|\ \ \ \ | |_|_|/ |/| | |
| * | | Added store changes button and containing panelStephen Beaver2015-08-061-67/+90
* | | | Merge branch 'firewall_nat_1to1' into bootstrapStephen Beaver2015-08-061-14/+17
|\ \ \ \ | | |_|/ | |/| |
| * | | Updated to use jquery drag/moveStephen Beaver2015-08-061-14/+17
* | | | Merge branch 'firewall_nat_out' into bootstrapStephen Beaver2015-08-061-14/+18
|\ \ \ \ | | |_|/ | |/| |
| * | | Updated to use jQuery drag/moveStephen Beaver2015-08-061-14/+18
* | | | Merge branch 'firewall_nat' into bootstrapStephen Beaver2015-08-061-23/+18
|\ \ \ \ | | |_|/ | |/| |
| * | | Updated to use jQuery row drag/moveStephen Beaver2015-08-061-82/+81
| * | | Highlight all cells in the rowStephen Beaver2015-08-051-3/+1
| * | | Add containing panelStephen Beaver2015-08-041-76/+74
* | | | Merge branch 'firewall_aliases_edit.php' into bootstrapStephen Beaver2015-08-061-3/+49
|\ \ \ \
| * | | | Fixed issue when address array contained blank entriesStephen Beaver2015-08-061-3/+49
|/ / / /
* | | | Merge branch 'firewall_nat_out' into bootstrapStephen Beaver2015-08-061-335/+338
|\ \ \ \ | | |/ / | |/| |
| * | | firewall_nat_out Conversion completeStephen Beaver2015-08-061-335/+338
|/ / /
* | | Merge branch 'loadbalancer_monitor' into bootstrapStephen Beaver2015-08-042-207/+229
|\ \ \
| * | | load_balancer_monitir Conversion completeStephen Beaver2015-08-042-207/+229
|/ / /
* | | Merge branch 'firewall_nat_1to1' into bootstrapStephen Beaver2015-08-042-473/+413
|\ \ \ | | |/ | |/|
| * | firewall_nat_1to1 COnversion completeStephen Beaver2015-08-041-74/+69
| * | Initial conversionStephen Beaver2015-08-042-474/+419
|/ /
* | Merge https://github.com/SjonHortensius/pfsense into bootstrapStephen Beaver2015-08-030-0/+0
|\ \
| * \ Merge pull request #335 from sbeaver-netgate/XSSSjonHortensius2015-08-037-1173/+11
| |\ \
* | \ \ Merge branch 'firewall_nat_edit' into bootstrapStephen Beaver2015-08-031-486/+748
|\ \ \ \
| * | | | Fixed error in use of array_merge()Stephen Beaver2015-07-311-1/+1
| * | | | firewall_nat_edit.php COnversion completeStephen Beaver2015-07-301-231/+235
| * | | | firewall_nat_edit Partial conversionStephen Beaver2015-07-301-472/+730
* | | | | Merge branch 'firewall_nat' into bootstrapStephen Beaver2015-08-032-252/+314
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | firewall_nat.php Conversion completeStephen Beaver2015-07-312-252/+314
| |/ / /
* | | | Merge branch 'XSS' into bootstrapStephen Beaver2015-08-037-1173/+11
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | XSS/Security updates from upstreamStephen Beaver2015-08-037-1173/+11
|/ /
* | Merge pull request #331 from sbeaver-netgate/firewall_nat_out_edit.phpSjonHortensius2015-08-021-509/+459
|\ \
| * | firewall_nat_out_edit.php Conversion completeStephen Beaver2015-07-291-509/+459
| |/
* | Merge pull request #329 from sbeaver-netgate/system_crlmanager.phpSjonHortensius2015-08-021-356/+377
|\ \
| * | system_crlmanager.php Conversion completeStephen Beaver2015-07-101-356/+377
| |/
* | fix a few syntax problems #327Sjon Hortensius2015-08-021-2/+2
* | Merge pull request #327 from sbeaver-netgate/diag_ipsec.phpSjonHortensius2015-08-021-382/+335
|\ \
| * | Debug removedStephen Beaver2015-07-091-137/+11
| * | diag_ipsec.phpsbeaver2015-07-091-384/+463
| |/
* | Merge pull request #326 from sbeaver-netgate/diag_gmirror.phpSjonHortensius2015-08-021-172/+199
|\ \
| * | diag_gmirror.phpsbeaver2015-07-091-172/+199
| |/
* | Merge pull request #325 from sbeaver-netgate/services_captiveportal.phpSjonHortensius2015-08-021-679/+798
|\ \
| * | Restore section commented out for testingsbeaver2015-07-081-4/+4
| * | services_captiveportal.php Conversion completesbeaver2015-07-081-683/+802
| |/
OpenPOWER on IntegriCloud