aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into flow_editing_v2Maximilian Hils2016-07-2573-741/+933
|\
| * Merge pull request #1426 from mhils/query-encodingMaximilian Hils2016-07-244-21/+94
| |\
| | * add quote/unquote testsMaximilian Hils2016-07-241-2/+42
| | * improve query/path_components getter/setterMaximilian Hils2016-07-243-19/+52
| * | silence test warningsMaximilian Hils2016-07-241-0/+2
| |/
| * Merge pull request #1425 from dufferzafar/clear-hotfixMaximilian Hils2016-07-241-1/+1
| |\
| | * Fix clearing of flowsShadab Zafar2016-07-251-1/+1
| * | console: fix options signalMaximilian Hils2016-07-242-2/+2
| |/
| * Merge pull request #1423 from dufferzafar/fix-searchMaximilian Hils2016-07-241-2/+2
| |\
| | * Fix console search on Python 3Shadab Zafar2016-07-241-2/+2
| * | fix keyboard navigationMaximilian Hils2016-07-241-1/+1
| |/
| * Merge pull request #1421 from mhils/encoding-cacheMaximilian Hils2016-07-234-125/+100
| |\
| | * remove content caching in netlib.http.MessageMaximilian Hils2016-07-232-117/+31
| | * add tests for single-element cacheMaximilian Hils2016-07-231-0/+30
| | * add single-element cache for netlib.encodingMaximilian Hils2016-07-231-8/+39
| |/
| * fix #1373, fix #1154 (#1420)Maximilian Hils2016-07-232-140/+139
| * Merge pull request #1380 from dufferzafar/marked-filterMaximilian Hils2016-07-2310-106/+96
| |\
| | * Remove save marked flows promptShadab Zafar2016-07-232-13/+3
| | * Add marked attribute when converting flow to 0.18Shadab Zafar2016-07-231-0/+1
| | * Test marked property while serialization roundtripShadab Zafar2016-07-231-0/+2
| | * Remove [Marked Flows] status indicatorShadab Zafar2016-07-231-4/+0
| | * Keep focus on same flow when disabling marked viewShadab Zafar2016-07-231-2/+14
| | * Focus nearest matching flow if current flow is unmarkedShadab Zafar2016-07-231-2/+23
| | * Move match function to FlowShadab Zafar2016-07-233-40/+20
| | * Keep focus on same flow when enabling marked viewShadab Zafar2016-07-231-5/+15
| | * Remove flow marking from ConsoleStateShadab Zafar2016-07-231-7/+0
| | * Use marked property in ConsoleState.clearShadab Zafar2016-07-231-6/+2
| | * Use ~marked filter while toggling marked viewShadab Zafar2016-07-231-24/+9
| | * Add a marked filterShadab Zafar2016-07-231-0/+9
| | * Update unmark all flows "U"Shadab Zafar2016-07-231-1/+1
| | * Update save_marked_flows to use the new attributeShadab Zafar2016-07-231-4/+1
| | * Fix display of mark status [m]Shadab Zafar2016-07-232-3/+2
| | * Update toggling of marked attribute on pressing "m"Shadab Zafar2016-07-231-4/+1
| | * Add marked attribute to flowShadab Zafar2016-07-231-1/+3
| * | Merge pull request #1416 from mhils/issue-1396Maximilian Hils2016-07-233-4/+8
| |\ \
| | * | fix #1396, fix #1205, fix #1374Maximilian Hils2016-07-233-4/+8
| * | | make the linter happyMaximilian Hils2016-07-231-1/+1
| * | | add remote debug exampleMaximilian Hils2016-07-231-0/+19
| * | | Merge pull request #1402 from mhils/console-fixesMaximilian Hils2016-07-234-23/+27
| |\ \ \ | | |/ / | |/| |
| | * | fix test_view_urlencodedMaximilian Hils2016-07-233-5/+10
| | * | minor fixesMaximilian Hils2016-07-212-19/+18
| * | | improve dumper addon text alignment (#1415)Maximilian Hils2016-07-234-37/+54
| * | | http2: fix kill (#1413)Thomas Kriechbaumer2016-07-231-0/+2
| * | | http2: cleanup testsThomas Kriechbaumer2016-07-231-37/+38
| | |/ | |/|
| * | re-enable OSX builds on travis (#1411)Maximilian Hils2016-07-221-4/+4
| * | Merge pull request #1412 from cortesi/updatedAldo Cortesi2016-07-2332-134/+154
| |\ \
| | * | Addon iface: .configure(options) -> .configure(options, updated)Aldo Cortesi2016-07-2332-134/+154
| |/ /
| * | Merge pull request #1410 from cortesi/addonsAldo Cortesi2016-07-237-70/+136
| |\ \
| | * | scripts: refactor some examples that keep global stateAldo Cortesi2016-07-233-39/+43
| | * | script: convert test recorder to an addon classAldo Cortesi2016-07-232-19/+19