aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #2108 from ayamamori/patch-1Maximilian Hils2017-03-079-11/+11
|\ \ \
| * | | fix other occurences of options shortcutMaximilian Hils2017-03-078-10/+10
| * | | Update tcpproxy.rstYamamori Akihiro2017-03-071-1/+1
* | | | Revert "clearly indentify git-checkout as dev version"Maximilian Hils2017-03-071-1/+1
* | | | Merge pull request #2106 from davidpshaw/python_3_to_masterMaximilian Hils2017-03-073-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Updated for python 3David Shaw2017-03-063-4/+4
* | | | Merge pull request #2101 from s4chin/add-websocket-filter-to-webMaximilian Hils2017-03-062-84/+111
|\ \ \ \
| * | | | web: Add websocket filterSachin Kelkar2017-03-062-84/+111
| |/ / /
* | | | Merge pull request #2104 from lymanZerga11/patch-2Maximilian Hils2017-03-061-1/+1
|\ \ \ \
| * | | | Update flowlist.pylymanZerga112017-03-061-1/+1
| |/ / /
* | | | Merge pull request #2105 from Kriechi/dev-versionMaximilian Hils2017-03-061-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | clearly indentify git-checkout as dev versionThomas Kriechbaumer2017-03-061-1/+1
* | | | Merge pull request #2085 from MatthewShao/devMaximilian Hils2017-03-053-2/+15
|\ \ \ \
| * | | | [web] Retain focus on input field after selecting. (#2085)Matthew Shao2017-03-041-0/+1
| * | | | [web] Simplify the code. (#2085)Matthew Shao2017-03-031-6/+2
| * | | | [web] Add mouse support for FilterInput popover.Matthew Shao2017-03-023-3/+19
| |/ / /
| | | * Carefully re-add a small number of short flagsAldo Cortesi2017-03-076-39/+48
| | | * Change the way proxy authetication is specifiedAldo Cortesi2017-03-075-58/+51
| | | * Add type and choices to options dump commets.Aldo Cortesi2017-03-072-21/+34
| | | * Options tweaksAldo Cortesi2017-03-074-111/+131
| | | * Remove less commonly used command-line optionsAldo Cortesi2017-03-073-74/+5
| | | * Add the --set option to set options directlyAldo Cortesi2017-03-074-6/+100
| | | * Option spacing and coverageAldo Cortesi2017-03-073-15/+37
| | | * Add --options that dumps annotated option defaultsAldo Cortesi2017-03-074-5/+39
| | | * Fix lintAldo Cortesi2017-03-071-1/+1
| | | * Flatten commandline arg structure, extract common run func for toolsAldo Cortesi2017-03-072-100/+51
| | | * Cleanups and test coverageAldo Cortesi2017-03-0710-26/+45
| | | * Automate slurping up command-line optionsAldo Cortesi2017-03-076-124/+23
| | | * Replacements and setheaders are always stringsAldo Cortesi2017-03-064-44/+38
| | | * Unify mode specificationAldo Cortesi2017-03-0614-129/+80
| | | * Options unification: certsAldo Cortesi2017-03-063-30/+23
| | | * Options unification: streamfileAldo Cortesi2017-03-064-30/+11
| | | * Options unification: string choicesAldo Cortesi2017-03-064-46/+66
| | | * Options unification: simple string sequencesAldo Cortesi2017-03-063-76/+73
| | | * Options unification: simple stringsAldo Cortesi2017-03-068-163/+126
| | | * Options unification: sizesAldo Cortesi2017-03-0612-46/+82
| | | * Start unifying options and the command-line: intsAldo Cortesi2017-03-053-33/+37
| | | * Start unifying options and the command-line: booleansAldo Cortesi2017-03-0516-255/+255
| | | * Revamp optionsAldo Cortesi2017-03-0514-381/+266
| |_|/ |/| |
* | | Merge pull request #2095 from MatthewShao/fix-#2083Clemens Brunner2017-03-041-2/+1
|\ \ \
| * | | [web] fix scroll bug in flow detail. (#2083)Matthew Shao2017-03-041-2/+1
* | | | Merge pull request #2082 from tarnacious/masterMaximilian Hils2017-03-041-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Call error handler and mark flow on HTTPExceptiontarnacious2017-03-011-0/+2
| |/ /
* | | update release docsMaximilian Hils2017-03-045-16718/+18855
* | | Merge pull request #2081 from s4chin/add-pretty-hostMaximilian Hils2017-03-042-5/+2
|\ \ \
| * | | web: Fix #1888Sachin Kelkar2017-03-032-5/+2
* | | | Merge pull request #2053 from krsoninikhil/on-issuesMaximilian Hils2017-03-047-13/+35
|\ \ \ \ | |_|_|/ |/| | |
| * | | update docs wordingMaximilian Hils2017-03-041-2/+2
| * | | Merge branch 'master' into on-issuesNikhil Soni2017-03-0356-680/+1674
| |\ \ \ | |/ / / |/| | |
* | | | docs: fix cert install linkMaximilian Hils2017-03-021-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-08 04:38:34 +0000