Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update remaining old docs url with new one. | Fenil Gandhi | 2018-03-05 | 2 | -3/+3 |
* | Merge pull request #2945 from kajojify/shortening | Aldo Cortesi | 2018-03-05 | 2 | -2/+35 |
|\ | |||||
| * | Minor fixes. | Miroslav | 2018-03-03 | 1 | -6/+10 |
| * | Addition to the comment | Miroslav | 2018-03-03 | 1 | -1/+1 |
| * | Finalization of tests. Conditions rewritten again. | Miroslav | 2018-03-02 | 2 | -8/+12 |
| * | Initial tests. New conditions. | Miroslav | 2018-03-01 | 1 | -20/+14 |
| * | Shortening notifications in statusbar | Miroslav | 2018-02-28 | 2 | -2/+33 |
* | | Merge pull request #2868 from kira0204/data-crash | Maximilian Hils | 2018-03-04 | 1 | -5/+2 |
|\ \ | |||||
| * | | Testing | kira0204 | 2018-02-19 | 1 | -4/+1 |
| * | | Fixing getter | kira0204 | 2018-02-19 | 1 | -1/+1 |
| * | | fix 2794 | kira0204 | 2018-02-15 | 1 | -1/+1 |
* | | | Merge pull request #2946 from fenilgandhi/master | Maximilian Hils | 2018-03-04 | 1 | -1/+3 |
|\ \ \ | |||||
| * | | | Fix for wrapping up extra-long urls in flowdetailview | Fenil Gandhi | 2018-03-03 | 1 | -1/+3 |
* | | | | fix display inconsistency for certstore path | Maximilian Hils | 2018-03-03 | 1 | -1/+1 |
|/ / / | |||||
* | | | clean up ProxyConfig | Maximilian Hils | 2018-02-27 | 3 | -32/+19 |
* | | | add missing client_certs directory expansion | Maximilian Hils | 2018-02-27 | 1 | -0/+1 |
| |/ |/| | |||||
* | | Merge pull request #2931 from cortesi/scriptpath | Aldo Cortesi | 2018-02-27 | 1 | -1/+2 |
|\ \ | |||||
| * | | script.run takes a path argument | Aldo Cortesi | 2018-02-27 | 1 | -1/+2 |
* | | | Merge pull request #2875 from fenilgandhi/issue-2872 | Aldo Cortesi | 2018-02-27 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge branch 'master' into issue-2872 | ColdFire | 2018-02-23 | 1 | -3/+19 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into issue-2872 | ColdFire | 2018-02-23 | 23 | -58/+19 |
| |\ \ \ | |||||
| * | | | | Fixed a bug with bytes encoding error | Fenil Gandhi | 2018-02-19 | 1 | -1/+1 |
* | | | | | Merge pull request #2926 from cortesi/coreopts | Aldo Cortesi | 2018-02-27 | 7 | -97/+65 |
|\ \ \ \ \ | |||||
| * | | | | | Start consolidating core options | Aldo Cortesi | 2018-02-26 | 7 | -97/+65 |
* | | | | | | Merge pull request #2925 from mhils/clientcert-from-sni | Aldo Cortesi | 2018-02-26 | 1 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | use sni to select clientcerts | Maximilian Hils | 2018-02-25 | 1 | -1/+2 |
* | | | | | | Split dumper_filter off from view_filter | Aldo Cortesi | 2018-02-26 | 3 | -14/+12 |
* | | | | | | Revamp verbosity options | Aldo Cortesi | 2018-02-26 | 7 | -22/+29 |
* | | | | | | Shift option help styling admonition into the appropriate Loader docstring | Aldo Cortesi | 2018-02-26 | 2 | -7/+8 |
|/ / / / / | |||||
* | | | | | Merge pull request #2919 from fristonio/Fix-2906 | Maximilian Hils | 2018-02-25 | 1 | -2/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Fix --socks option deprecated info in command line args check. | Deepesh Pathak | 2018-02-25 | 1 | -2/+3 |
* | | | | | | Misc. typos | luz.paz | 2018-02-24 | 16 | -22/+22 |
|/ / / / / | |||||
* | | | | | Merge pull request #2907 from cortesi/optionscomp | Aldo Cortesi | 2018-02-25 | 7 | -57/+52 |
|\ \ \ \ \ | |||||
| * | | | | | addon options: proxyauth to /addons | Aldo Cortesi | 2018-02-24 | 2 | -11/+12 |
| * | | | | | Split default_contentview into dumper_* and console_* varieties | Aldo Cortesi | 2018-02-24 | 4 | -11/+14 |
| * | | | | | Move intercept options to addon | Aldo Cortesi | 2018-02-24 | 4 | -22/+14 |
| * | | | | | flow_detail option to /addons/dumper | Aldo Cortesi | 2018-02-24 | 2 | -13/+12 |
* | | | | | | Merge branch 'master' into opts | Aldo Cortesi | 2018-02-24 | 3 | -27/+56 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Merge pull request #2886 from tran-tien-dat/set-cookie | Aldo Cortesi | 2018-02-24 | 1 | -5/+9 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix #2829 | Tran Tien Dat | 2018-02-21 | 1 | -5/+9 |
| * | | | | | | Merge pull request #2904 from cortesi/bump | Aldo Cortesi | 2018-02-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Bump version | Aldo Cortesi | 2018-02-24 | 1 | -1/+1 |
| * | | | | | | | Merge pull request #2903 from cortesi/3.0.2 | Aldo Cortesi | 2018-02-24 | 1 | -1/+1 |
| |\| | | | | | | |||||
| | * | | | | | | Tag 3.0.2 | Aldo Cortesi | 2018-02-24 | 1 | -1/+1 |
| | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #2902 from cortesi/spawnfix | Aldo Cortesi | 2018-02-24 | 1 | -19/+28 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| | * | | | | | Fix loss of keyboard control after spawn | Aldo Cortesi | 2018-02-24 | 1 | -19/+28 |
| | |/ / / / | |||||
| * | | | | | bump version again | Maximilian Hils | 2018-02-23 | 1 | -1/+1 |
| * | | | | | Prep for v3.0.1 | Aldo Cortesi | 2018-02-23 | 1 | -1/+1 |
| * | | | | | Fix an issue with quoting and commands | Aldo Cortesi | 2018-02-23 | 1 | -3/+19 |
| |/ / / / | |||||
* | | | | | addon options: upstream_auth | Aldo Cortesi | 2018-02-24 | 2 | -16/+10 |