Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge remote-tracking branch 'legend/master' | Maximilian Hils | 2015-03-06 | 3 | -5/+17 | |
|\ | | | | | | | | | Conflicts: libmproxy/web/static/app.js | |||||
| * | another clean up for #503 #504 | Legend Tang | 2015-03-06 | 2 | -2/+5 | |
| | | ||||||
| * | clean up for #503 #504 | Legend Tang | 2015-03-06 | 1 | -4/+4 | |
| | | ||||||
| * | Replace `addListener` method with multiple bindings, fix for #503 504 | Legend Tang | 2015-03-06 | 1 | -3/+12 | |
| | | ||||||
| * | Revert "revert to custom EventEmitter, workaround for #504" | Legend Tang | 2015-03-06 | 2 | -32/+5 | |
| | | | | | | | | This reverts commit fa8fc64ce0170b029410600af20b25c8160fe5c6. | |||||
| * | revert to custom EventEmitter, workaround for #504 | Legend Tang | 2015-03-06 | 2 | -5/+32 | |
| | | | | | | | | It's an EventEmitter issue. | |||||
* | | fix #506 | Legend Tang | 2015-03-06 | 2 | -8/+10 | |
|/ | ||||||
* | Add PEG support to gulpfile | Aldo Cortesi | 2015-01-03 | 4 | -28/+32 | |
| | | | | | - Extract conf - all project specific conf outside gulpfile - Generalize filt.js exports, add required imports | |||||
* | Unit test framework for web client-side code | Aldo Cortesi | 2015-01-02 | 3 | -10/+28 | |
| | | | | | | - Also make formatSize nicer and test it. Now there's no excuse! ;) | |||||
* | components/utils.js -> common.js | Aldo Cortesi | 2015-01-01 | 7 | -18/+16 | |
| | | | | | Too many utils modules makes things confusing. These are more "common components" or "common mixins" than utils anyway. | |||||
* | Make header more compact | Aldo Cortesi | 2015-01-01 | 2 | -11/+2 | |
| | | | | | - Remove title bar - File -> mitmproxy - ultimately our logo can go here | |||||
* | Use Facebook's dispatcher | Aldo Cortesi | 2015-01-01 | 1 | -21/+4 | |
| | ||||||
* | Replace custom EventEmitter with one from browserify | Aldo Cortesi | 2015-01-01 | 4 | -40/+10 | |
| | ||||||
* | Remove unused files | Aldo Cortesi | 2015-01-01 | 3 | -57/+0 | |
| | ||||||
* | All files and only files in in js/components are jsx | Aldo Cortesi | 2015-01-01 | 11 | -16/+16 | |
| | | | | So remove the redundant naming | |||||
* | More browesrification. | Aldo Cortesi | 2014-12-31 | 5 | -33/+45 | |
| | ||||||
* | More conversions to browserify | Aldo Cortesi | 2014-12-30 | 5 | -18/+36 | |
| | ||||||
* | Fix fonts, stylesheets, add much more flexible bootstrap over-rides. | Aldo Cortesi | 2014-12-30 | 31 | -80325/+83 | |
| | ||||||
* | Basic conversion: browserified web app now works. | Aldo Cortesi | 2014-12-30 | 23 | -53/+710 | |
| | ||||||
* | Start moving to new gulpfile, browerify, etc. | Aldo Cortesi | 2014-12-30 | 1 | -0/+14 | |
| | ||||||
* | web: integrate filter docs | Maximilian Hils | 2014-12-26 | 2 | -21/+75 | |
| | ||||||
* | web: CSP, revert functionality, serve content | Maximilian Hils | 2014-12-25 | 4 | -58/+29 | |
| | ||||||
* | web: much ui work, such christmas | Maximilian Hils | 2014-12-25 | 6 | -125/+235 | |
| | ||||||
* | web: duplicate, delete, replay flows | Maximilian Hils | 2014-12-24 | 6 | -103/+147 | |
| | ||||||
* | web: move eventlog state out of settings | Maximilian Hils | 2014-12-23 | 6 | -15/+47 | |
| | ||||||
* | web: intercept feature | Maximilian Hils | 2014-12-23 | 9 | -50/+91 | |
| | ||||||
* | web: squash bugs | Maximilian Hils | 2014-12-23 | 3 | -16/+12 | |
| | ||||||
* | web: simpler filter ui | Maximilian Hils | 2014-12-23 | 5 | -85/+45 | |
| | ||||||
* | highlight ui: complicated version | Maximilian Hils | 2014-12-22 | 4 | -17/+58 | |
| | ||||||
* | web: filter/highlight ui, many fixes | Maximilian Hils | 2014-12-13 | 8 | -120/+382 | |
| | ||||||
* | add filter descriptions | Maximilian Hils | 2014-12-12 | 2 | -30/+100 | |
| | ||||||
* | web: disable autoscroll at top | Maximilian Hils | 2014-12-12 | 1 | -1/+5 | |
| | ||||||
* | web: filtering | Maximilian Hils | 2014-12-12 | 6 | -234/+253 | |
| | ||||||
* | web: fight against react-router | Maximilian Hils | 2014-12-12 | 6 | -9/+83 | |
| | ||||||
* | web: implement filters | Maximilian Hils | 2014-12-12 | 4 | -25/+1799 | |
| | ||||||
* | web: add filter grammar | Maximilian Hils | 2014-12-11 | 1 | -0/+93 | |
| | ||||||
* | web: add file menu stub | Maximilian Hils | 2014-12-10 | 1 | -9/+83 | |
| | ||||||
* | web: implement settings store, modularize store | Maximilian Hils | 2014-12-10 | 7 | -104/+147 | |
| | ||||||
* | web: take viewport resize into account | Maximilian Hils | 2014-12-10 | 3 | -6/+28 | |
| | ||||||
* | web: add event store, fix all those bugs | Maximilian Hils | 2014-12-10 | 13 | -272/+182 | |
| | ||||||
* | generalize store | Maximilian Hils | 2014-12-09 | 2 | -110/+114 | |
| | ||||||
* | always use the app dispatcher | Maximilian Hils | 2014-12-09 | 14 | -8413/+1865 | |
| | ||||||
* | web: various improvements | Maximilian Hils | 2014-11-29 | 6 | -29/+84 | |
| | ||||||
* | event log: virtual scrolling | Maximilian Hils | 2014-11-28 | 4 | -37/+68 | |
| | ||||||
* | web: add virtualscroll mixin | Maximilian Hils | 2014-11-28 | 2 | -48/+71 | |
| | ||||||
* | web: various fixes, add clear button | Maximilian Hils | 2014-11-28 | 6 | -33/+72 | |
| | ||||||
* | web: virtual scrolling | Maximilian Hils | 2014-11-28 | 3 | -48/+95 | |
| | ||||||
* | web: fixes | Maximilian Hils | 2014-11-27 | 2 | -13/+21 | |
| | ||||||
* | format code | Maximilian Hils | 2014-11-27 | 12 | -148/+153 | |
| | ||||||
* | web++ | Maximilian Hils | 2014-11-27 | 11 | -166/+193 | |
| |