summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2473 from phil-davis/gt5Renato Botelho2016-01-195-68/+145
|\
| * Standardize NAT NPtPhil Davis2016-01-195-68/+145
* | Fix browser tab textStephen Beaver2016-01-191-1/+1
* | Restore separator bar delete functionalityStephen Beaver2016-01-191-6/+19
* | Add Javascript htmlchars() equivalent to dynamically created inputsStephen Beaver2016-01-191-2/+14
* | Merge pull request #2450 from hexaclock/masterRenato Botelho2016-01-191-5/+29
|\ \
| * | Update auth.incDan Vinakovsky2016-01-181-1/+1
| * | add note about r284483Daniel Vinakovsky2016-01-181-4/+4
| * | more style fixes. unset old fieldsDaniel Vinakovsky2016-01-181-4/+3
| * | style fixesDaniel Vinakovsky2016-01-181-4/+2
| * | Merge remote-tracking branch 'upstream/master'Daniel Vinakovsky2016-01-1666-934/+2919
| |\ \
| * | | compatibility with freebsdDaniel Vinakovsky2016-01-161-0/+9
| * | | switched to bcrypt as per #4120daniel2016-01-141-5/+23
* | | | Merge pull request #2475 from phil-davis/patch-2Renato Botelho2016-01-191-4/+4
|\ \ \ \
| * | | | Fixup firewall rules schedule status imagesPhil Davis2016-01-191-4/+4
| | |_|/ | |/| |
* | | | Merge pull request #2476 from phil-davis/patch-3Renato Botelho2016-01-191-6/+6
|\ \ \ \
| * | | | Remove obsolete L7 text from messagesPhil Davis2016-01-191-6/+6
| |/ / /
* | | | Update smtp.inc to 2016-01-18Renato Botelho2016-01-191-5/+5
|/ / /
* | | autocapitalize off is deprecated, use none instead. Ticket #5776Chris Buechler2016-01-181-1/+1
* | | Clarify input validation output. Ticket #5778Chris Buechler2016-01-181-1/+1
* | | Merge pull request #2471 from PiBa-NL/textarea_nowrapStephen Beaver2016-01-180-0/+0
|\ \ \
| * | | classes/Form/Textarea.class.php, setNoWrap, make it work properly on FireFox ...PiBa-NL2016-01-191-1/+1
* | | | classes/Form/Textarea.class.php, setNoWrap, make it work properly on FireFox ...PiBa-NL2016-01-181-1/+1
* | | | Include the zone in link for display of login page so it shows up correctly.Chris Buechler2016-01-181-2/+2
|/ / /
* | | Added separator delete iconStephen Beaver2016-01-181-2/+8
* | | Prototype #5373Stephen Beaver2016-01-182-2/+29
* | | add missing space between wordsChris Buechler2016-01-181-1/+1
* | | Merge pull request #2467 from NewEraCracker/widget-tunesStephen Beaver2016-01-181-10/+6
|\ \ \
| * | | Small tunning to all aspects involving widgetsNewEraCracker2016-01-181-10/+6
* | | | Changed var name sine label is an HTML reserved name.Stephen Beaver2016-01-181-2/+2
* | | | Fixed #5779Stephen Beaver2016-01-181-2/+13
* | | | Merge pull request #2469 from phil-davis/gt4Renato Botelho2016-01-185-42/+42
|\ \ \ \
| * | | | Internationalize firewall aliases and NATPhil Davis2016-01-195-42/+42
* | | | | Merge pull request #2466 from phil-davis/patch-5Renato Botelho2016-01-181-1/+11
|\ \ \ \ \
| * | | | | Use current interface description for breadcrumbPhil Davis2016-01-181-1/+1
| * | | | | Fix #5778 do not save changes if interface description matches an alias namePhil Davis2016-01-181-0/+10
| | |/ / / | |/| | |
* | | | | Merge pull request #2468 from phil-davis/patch-6Renato Botelho2016-01-181-4/+4
|\ \ \ \ \
| * | | | | firewall_nat_1to1 fix save button textPhil Davis2016-01-181-2/+2
| * | | | | firewall_nat_1to1 config descr and delete buttonPhil Davis2016-01-181-2/+2
| |/ / / /
* | | | | Merge pull request #2464 from phil-davis/patch-3Renato Botelho2016-01-181-25/+37
|\ \ \ \ \
| * | | | | Remove tab embedded in text - firewall_aliases_editPhil Davis2016-01-181-1/+1
| * | | | | Internationalize firewall_aliases_editPhil Davis2016-01-181-25/+37
* | | | | | Bring text to current realityRenato Botelho2016-01-181-1/+1
* | | | | | Add "GoTo line #" controlStephen Beaver2016-01-181-0/+55
| |/ / / / |/| | | |
* | | | | Merge pull request #2421 from stilez/patch-8Renato Botelho2016-01-181-23/+31
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | should be min($bits1, $bits2) for 'largest subnet'stilez2016-01-181-2/+2
| * | | | 5 or 6stilez2016-01-131-1/+1
| * | | | fix $subnet1 should be $subnet2, thanks rbgarbastilez2016-01-131-2/+2
| * | | | fix 4 should be 6 (thanks, good catch)stilez2016-01-131-3/+3
| * | | | Fix logic for subnet overlap check + canonical for IPv6stilez2016-01-131-24/+32
OpenPOWER on IntegriCloud