Граф коммитов

623 Коммитов

Автор SHA1 Сообщение Дата
Mavis Ou a7e5e5fbf9 Merge branch 'c2_fresh_start' of https://github.com/mozilla/collusion into c2_fresh_start 2013-07-10 16:42:25 -07:00
Mavis Ou 965fbb9c36 [Issue #245] some controls are working now. 2013-07-10 16:41:54 -07:00
dethe df4895cb37 Merge branch 'c2_fresh_start' of https://github.com/mozilla/collusion into c2_fresh_start 2013-07-10 15:07:35 -07:00
dethe 2d99736d57 brought in Azlen's style changes 2013-07-10 15:04:59 -07:00
Mavis Ou e508dc7de7 [Issue #245] added Legend & Controls section to Graph view 2013-07-10 13:42:06 -07:00
dethe a022bc0bb5 Merge branch 'update_list_view' into c2_fresh_start 2013-07-10 12:03:10 -07:00
dethe 4c14c9b62c update sort value for preferences 2013-07-10 11:59:13 -07:00
Dethe Elza 8e80e61d43 Merge pull request #255 from mozilla/update_list_view
Update list view
2013-07-10 10:08:35 -07:00
dethe 4fcdafcdd1 adding external map file 2013-07-10 10:06:05 -07:00
dethe 7d55cbb468 move SVG to external file 2013-07-09 22:22:53 -07:00
Dethe Elza 1f08fbc136 Merge pull request #253 from mozilla/update_list_view
Update list view
2013-07-09 17:40:55 -07:00
dethe 2ddd16e5cd fix event handling for checkboxes 2013-07-09 17:38:54 -07:00
Azlen Elza ca78c5213e fixed up clashes in the merge 2013-07-09 17:16:17 -07:00
dethe 649e482611 buttons trigger state changes for preferences 2013-07-09 17:15:41 -07:00
Azlen Elza f4a5b75028 white bar and styling 2013-07-09 16:49:55 -07:00
Mavis Ou 95b2835623 [Issue #252] styling tweaks 2013-07-09 14:54:18 -07:00
Mavis Ou 83f1f57705 [Issue #252] styling tweaks 2013-07-09 14:02:49 -07:00
Mavis Ou 051554f1c7 Merge branch 'c2_fresh_start' of https://github.com/mozilla/collusion into c2_fresh_start 2013-07-09 12:07:51 -07:00
Mavis Ou b840dec9a1 [Issue #252] new stylings for side bar 2013-07-09 12:07:39 -07:00
Dethe Elza a92c98102c Merge pull request #251 from mozilla/update_list_view
added stage header and stage footer
2013-07-08 19:06:31 -07:00
dethe 6eb2f105a7 added stage header and stage footer 2013-07-08 19:03:20 -07:00
Dethe Elza 4de07bccbc Merge pull request #250 from mozilla/update_list_view
fixes for table sorting and layout
2013-07-08 15:28:20 -07:00
dethe 8c98ddb433 fixes for table sorting and layout 2013-07-08 14:45:27 -07:00
dethe 1c622ffd72 sorting table works in the face of changing data 2013-07-03 22:38:41 -07:00
dethe f1e2a18e88 updated list generation 2013-07-02 16:27:10 -07:00
dethe a3a811f09f fixing merge conflict 2013-06-27 10:34:48 -07:00
dethe 68cebfd906 live handler for disclosure events 2013-06-26 17:24:00 -07:00
dethe b2150954f3 updating list view to support blocking 2013-06-26 17:23:01 -07:00
dethe 36a0c947ce changing mock data in preparation for rewrite 2013-06-26 17:22:13 -07:00
dethe 45f624f3b5 start adding support for user settings 2013-06-26 17:21:18 -07:00
Mavis Ou a68f996b00 Merge branch 'c2_fresh_start' of https://github.com/mozilla/collusion into c2_fresh_start 2013-06-19 10:28:05 -07:00
Mavis Ou c4c0e09d0a token should not be regenerated everytime the addon is initialized 2013-06-19 10:27:51 -07:00
Dethe Elza bd1d116e6b Merge pull request #244 from erikvold/testOpenOrSwitchToOrClose
Testing OpenOrSwitchToOrClose
2013-06-18 21:54:28 -07:00
Erik Vold 287b6a9d31 Adding a tests for OpenOrSwitchToOrClose 2013-06-18 17:55:35 -07:00
Dethe Elza 9e8b322b3a Merge pull request #242 from erikvold/test-getCollusionTab
Updating require paths and adding a simple test for getCollusionTab
2013-06-18 17:30:19 -07:00
Erik Vold ff4c89ee5a Updating require paths and adding a simple test for getCollusionTab 2013-06-18 17:24:55 -07:00
Mavis Ou dd2f0d7c20 simplified function dateAsKey(timestamp) 2013-06-17 14:02:02 -07:00
Mavis Ou bdbd0d6dc1 code cleanup 2013-06-17 13:13:08 -07:00
Mavis Ou 5642889689 code cleanup; do not need localStorage.dates 2013-06-17 13:08:27 -07:00
Mavis Ou d82edaf563 Merge branch 'c2_fresh_start' of https://github.com/mozilla/collusion into c2_fresh_start 2013-06-17 12:38:49 -07:00
Mavis Ou 1d8ec1c345 [ Issue #222 ] Store connections per-day 2013-06-17 12:38:35 -07:00
Mavis Ou a24f4d62a9 [ Issue #222 ] store connections per-day(in progress) 2013-06-17 11:46:59 -07:00
dethe 5781fabf9b fix for #236, downloads data directly now 2013-06-14 15:53:41 -07:00
dethe e2b79ada25 Merge branch 'c2_fresh_start' of https://github.com/mozilla/collusion into c2_fresh_start 2013-06-14 13:21:36 -07:00
dethe f3c7280d95 adding simple UI hooks to the info bar towards #167 re-enable blocking 2013-06-14 13:21:33 -07:00
Mavis Ou 25e2b32d2f changed Private Browsing notification messages 2013-06-14 11:51:19 -07:00
Mavis Ou 94b1597fa4 added Private Browsing Window notification 2013-06-14 11:04:58 -07:00
Mavis Ou bd6bdd45c0 code cleanup for handling connections on the UI layer 2013-06-13 17:49:22 -07:00
Mavis Ou a0ef7bd990 summary block on list view 2013-06-13 16:47:44 -07:00
Mavis Ou 7320b065f7 code cleanup for summary block on list view 2013-06-13 16:25:47 -07:00