Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge branch 'flow_editing_v2' | Maximilian Hils | 2016-07-25 | 19 | -202/+305 | |
|\ \ \ \ | ||||||
| * | | | | add up/download button to ContentTooLarge view | Maximilian Hils | 2016-07-25 | 1 | -4/+14 | |
| | | | | | ||||||
| * | | | | simplify stop edit | Maximilian Hils | 2016-07-25 | 3 | -19/+22 | |
| | | | | | ||||||
| * | | | | fix flow edit | Maximilian Hils | 2016-07-25 | 3 | -16/+26 | |
| | | | | | ||||||
| * | | | | Merge remote-tracking branch 'jason/style' into flow_editing_v2 | Maximilian Hils | 2016-07-25 | 2 | -2/+12 | |
| |\ \ \ \ | ||||||
| | * | | | | [web] style improvement | Jason | 2016-07-24 | 2 | -2/+12 | |
| | | |_|/ | | |/| | | ||||||
| * | | | | make empty buttons editable | Maximilian Hils | 2016-07-25 | 3 | -9/+12 | |
| | | | | | ||||||
| * | | | | web: refactor ContentLoader | Maximilian Hils | 2016-07-25 | 9 | -120/+164 | |
| | | | | | ||||||
| * | | | | Merge remote-tracking branch 'origin/master' into flow_editing_v2 | Maximilian Hils | 2016-07-25 | 73 | -741/+933 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| * | | | | minor fixes | Maximilian Hils | 2016-07-25 | 1 | -8/+7 | |
| | | | | | ||||||
| * | | | | rewrite getDiff | Clemens | 2016-07-25 | 1 | -6/+5 | |
| | | | | | ||||||
| * | | | | remove auto change to raw mode on edit | Clemens | 2016-07-25 | 3 | -4/+3 | |
| | | | | | ||||||
| * | | | | combine content with header updates | Clemens | 2016-07-25 | 2 | -9/+5 | |
| | | | | | ||||||
| * | | | | added contentHash | Clemens | 2016-07-25 | 3 | -6/+10 | |
| | | | | | ||||||
| * | | | | remove lastFileUpload field | Clemens | 2016-07-25 | 5 | -24/+10 | |
| | | | | | ||||||
| * | | | | file upload updates contentview, editable contentloader, diffs on upload | Clemens | 2016-07-22 | 8 | -47/+65 | |
| | | | | | ||||||
| * | | | | moved editor to raw_view mode, add content_file_upload | Clemens | 2016-07-21 | 6 | -25/+50 | |
| | | | | | ||||||
| * | | | | moved editor to raw_view mode | Clemens | 2016-07-21 | 4 | -41/+39 | |
| | | | | | ||||||
* | | | | | make sure to escape errors printed to the console | Maximilian Hils | 2016-07-25 | 1 | -1/+2 | |
| |/ / / |/| | | | ||||||
* | | | | Merge pull request #1426 from mhils/query-encoding | Maximilian Hils | 2016-07-24 | 4 | -21/+94 | |
|\ \ \ \ | | | | | | | | | | | Fix query/path_components encoding | |||||
| * | | | | add quote/unquote tests | Maximilian Hils | 2016-07-24 | 1 | -2/+42 | |
| | | | | | ||||||
| * | | | | improve query/path_components getter/setter | Maximilian Hils | 2016-07-24 | 3 | -19/+52 | |
| | | | | | ||||||
* | | | | | silence test warnings | Maximilian Hils | 2016-07-24 | 1 | -0/+2 | |
|/ / / / | ||||||
* | | | | Merge pull request #1425 from dufferzafar/clear-hotfix | Maximilian Hils | 2016-07-24 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Fix clearing of flows | |||||
| * | | | | Fix clearing of flows | Shadab Zafar | 2016-07-25 | 1 | -1/+1 | |
| | |_|/ | |/| | | | | | | | | | | Fixes #1424 | |||||
* / | | | console: fix options signal | Maximilian Hils | 2016-07-24 | 2 | -2/+2 | |
|/ / / | ||||||
* | | | Merge pull request #1423 from dufferzafar/fix-search | Maximilian Hils | 2016-07-24 | 1 | -2/+2 | |
|\ \ \ | | | | | | | | | Fix console search on Python 3 | |||||
| * | | | Fix console search on Python 3 | Shadab Zafar | 2016-07-24 | 1 | -2/+2 | |
| | |/ | |/| | ||||||
* / | | fix keyboard navigation | Maximilian Hils | 2016-07-24 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #1421 from mhils/encoding-cache | Maximilian Hils | 2016-07-23 | 4 | -125/+100 | |
|\ \ | | | | | | | Add Encoding Cache, Remove HTTP Message Content Cache | |||||
| * | | remove content caching in netlib.http.Message | Maximilian Hils | 2016-07-23 | 2 | -117/+31 | |
| | | | ||||||
| * | | add tests for single-element cache | Maximilian Hils | 2016-07-23 | 1 | -0/+30 | |
| | | | ||||||
| * | | add single-element cache for netlib.encoding | Maximilian Hils | 2016-07-23 | 1 | -8/+39 | |
|/ / | ||||||
* | | fix #1373, fix #1154 (#1420) | Maximilian Hils | 2016-07-23 | 2 | -140/+139 | |
| | | ||||||
* | | Merge pull request #1380 from dufferzafar/marked-filter | Maximilian Hils | 2016-07-23 | 10 | -106/+96 | |
|\ \ | | | | | | | Marked property and filter | |||||
| * | | Remove save marked flows prompt | Shadab Zafar | 2016-07-23 | 2 | -13/+3 | |
| | | | ||||||
| * | | Add marked attribute when converting flow to 0.18 | Shadab Zafar | 2016-07-23 | 1 | -0/+1 | |
| | | | ||||||
| * | | Test marked property while serialization roundtrip | Shadab Zafar | 2016-07-23 | 1 | -0/+2 | |
| | | | ||||||
| * | | Remove [Marked Flows] status indicator | Shadab Zafar | 2016-07-23 | 1 | -4/+0 | |
| | | | ||||||
| * | | Keep focus on same flow when disabling marked view | Shadab Zafar | 2016-07-23 | 1 | -2/+14 | |
| | | | ||||||
| * | | Focus nearest matching flow if current flow is unmarked | Shadab Zafar | 2016-07-23 | 1 | -2/+23 | |
| | | | ||||||
| * | | Move match function to Flow | Shadab Zafar | 2016-07-23 | 3 | -40/+20 | |
| | | | ||||||
| * | | Keep focus on same flow when enabling marked view | Shadab Zafar | 2016-07-23 | 1 | -5/+15 | |
| | | | | | | | | | | | | ...if it is marked. | |||||
| * | | Remove flow marking from ConsoleState | Shadab Zafar | 2016-07-23 | 1 | -7/+0 | |
| | | | ||||||
| * | | Use marked property in ConsoleState.clear | Shadab Zafar | 2016-07-23 | 1 | -6/+2 | |
| | | | ||||||
| * | | Use ~marked filter while toggling marked view | Shadab Zafar | 2016-07-23 | 1 | -24/+9 | |
| | | | ||||||
| * | | Add a marked filter | Shadab Zafar | 2016-07-23 | 1 | -0/+9 | |
| | | | ||||||
| * | | Update unmark all flows "U" | Shadab Zafar | 2016-07-23 | 1 | -1/+1 | |
| | | | ||||||
| * | | Update save_marked_flows to use the new attribute | Shadab Zafar | 2016-07-23 | 1 | -4/+1 | |
| | | | ||||||
| * | | Fix display of mark status [m] | Shadab Zafar | 2016-07-23 | 2 | -3/+2 | |
| | | |