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

645 Коммитов

Автор SHA1 Сообщение Дата
Mavis Ou ce1f96a1e6 bug fix for previous commit 2013-08-28 14:23:37 -07:00
Mavis Ou bb151b9c47 Optimization: significantly reduces the # of read/write operations to localStorage 2013-08-28 14:06:44 -07:00
Mavis Ou b7397230e0 [Closed #396] applied filter to Site Profile in Info Panel 2013-08-27 11:27:30 -07:00
Mavis Ou d3258da083 radius of the glow should not be a fixed value for every node. it should change with the radius of the node 2013-08-26 14:15:35 -07:00
Mavis Ou c8ec24071e sytling changes 2013-08-22 15:10:27 -07:00
Mavis Ou a22545ea1b [#394] renamed the sharing toggle button to 'contributing'. 2013-08-22 14:51:07 -07:00
Mavis Ou f7092aa114 [Closed #380] added 'Prompt to Share Data' dialog 2013-08-22 13:10:55 -07:00
Mavis Ou 1bf5b0c1b5 Merge branch 'master' of https://github.com/mozilla/collusion 2013-08-22 09:52:33 -07:00
Mavis Ou 5620a68d68 [Closed #294] moved session filter from sidebar to Graph view's legend and control section 2013-08-22 09:52:07 -07:00
Erik Vold cc2e9d26e7 Using JS 1.8 (let rules!) 2013-08-21 17:44:22 -07:00
Mavis Ou 7efaa1da1f [Closed #288] clicking on Collusion logo reloads the page 2013-08-21 16:50:41 -07:00
Mavis Ou 9c9f0a175f [Closed #328] reload collusion page after we clear/reset all the data 2013-08-21 16:38:27 -07:00
Mavis Ou 8d4b7574ff Merge branch 'master' of https://github.com/mozilla/collusion 2013-08-21 16:13:14 -07:00
Mavis Ou 5144d1b53c [Closed #373] added glowing effect to selected nodes 2013-08-21 16:12:57 -07:00
dethe 5d42a7149e remove debugging messages 2013-08-19 17:06:49 -07:00
Mavis Ou af136b0a10 bug fix - removed update event handler when leaving list view 2013-08-19 15:22:18 -07:00
Mavis Ou 65d45c341b fixed List view updating breadcrumb issue 2013-08-19 11:20:29 -07:00
Mavis Ou 04e2804123 fixed typo 2013-08-16 16:59:31 -07:00
dethe 5b12a932cf Merge branch 'master' of https://github.com/mozilla/collusion 2013-08-16 16:53:12 -07:00
dethe 5d100c0a9e update table when new nodes are added 2013-08-16 16:53:07 -07:00
Mavis Ou ce1535280a fixed visited sites counter & trackers counter 2013-08-16 16:51:30 -07:00
Mavis Ou cc11531ff8 [Issue #376] clock views now shows visited sites and third party sites 2013-08-16 15:39:28 -07:00
dethe 688e92d385 add aggregate.isDomainVisited method 2013-08-16 12:52:13 -07:00
dethe 911f10cf1c Merge branch 'master' of https://github.com/mozilla/collusion 2013-08-16 12:45:19 -07:00
Mavis Ou d07c6e4dc1 [Fixed #317] text changed 2013-08-15 14:07:49 -07:00
Mavis Ou a4055c4972 fixed typo 2013-08-14 11:29:43 -07:00
Mavis Ou 3fae04d051 [Fixed #350] zoom factor is dependant on the scrolling offset 2013-08-13 15:48:32 -07:00
Mavis Ou 124b1d81be [Issue #362]List View: sort by the actual timestamp, not just by the date 2013-08-13 12:26:04 -07:00
Mavis Ou 3252fcb2e3 styling tweaks 2013-08-13 12:03:45 -07:00
Mavis Ou 4446dcca9f [Issue #361] added Hide description 2013-08-13 11:53:31 -07:00
Mavis Ou d093adafd7 tweaks for accessiblity 2013-08-12 18:00:38 -07:00
dethe a14e3b81c2 removed debugging messages 2013-08-12 17:53:11 -07:00
Mavis Ou 1b41ff1e0e fixed merge conflict 2013-08-12 17:43:30 -07:00
Mavis Ou 4a2343cc7a [Issue #352] fixed broken toggle buttons on Graph View; other minor bug fixes 2013-08-12 17:40:24 -07:00
dethe ef75715887 fix merge conflicts 2013-08-12 17:35:20 -07:00
dethe 8bf46da1ad fixed off-by-one error in daily and weekly, improved detection of visited sites 2013-08-12 17:31:14 -07:00
Mavis Ou 3196b2dc32 added image files 2013-08-12 16:27:27 -07:00
Mavis Ou e75af7c47a [Issue #353] added icon images 2013-08-12 16:26:30 -07:00
Mavis Ou 7426f7ab7f fixed stats bar updating issues 2013-08-12 16:13:51 -07:00
Mavis Ou 155b3c69ac [Issue #328] unified how visualization should response to reset and remove events. Bug fixes. 2013-08-12 16:02:21 -07:00
dethe b3faff23e7 incomplete progress towards getting filtering right 2013-08-12 07:20:11 -07:00
Mavis Ou 0aefd50311 dialog - code cleanup 2013-08-09 15:53:50 -07:00
Mavis Ou d5eaa98a5f fixes and tweaks for dialogs: keypress handling, private browsing notification 2013-08-09 13:27:29 -07:00
Erik Vold d1b8a33b15 Adding a private browsing dialog for the collusion page 2013-08-08 16:15:05 -07:00
Mavis Ou ea56d5bee8 [Issue #336] added keypress handlers to restrict Tab/focus 2013-08-08 15:22:36 -07:00
Mavis Ou 7a872c8d90 changed wording of 'anonymized' to 'de-identified' 2013-08-07 17:15:06 -07:00
Mavis Ou b0831ebd5f [Issue #282] removed History API and re-implemented breadcrumb 2013-08-07 16:58:50 -07:00
Mavis Ou 1fd6e2d0dc adding basic accessibility support to List view 2013-08-07 10:36:32 -07:00
Mavis Ou d79d99232a [Issue #339] Making the default zoom for Graph 1.25x bigger 2013-08-02 17:30:17 -07:00
Mavis Ou 06bad8166d Merge branch 'master' of https://github.com/mozilla/collusion 2013-08-02 15:30:00 -07:00
Mavis Ou 2e8d024cd2 code cleanup 2013-08-02 15:29:53 -07:00
dethe acd80f1d28 Merge branch 'master' of https://github.com/mozilla/collusion 2013-08-02 15:27:11 -07:00
dethe e3908a99c3 fixed recent sites implementation 2013-08-02 15:26:38 -07:00
Mavis Ou 59abce62d6 [Issue #330] applied unified colour scheme 2013-08-01 16:30:01 -07:00
Mavis Ou 2a196035bf [Issue #295] typography/styling changes 2013-08-01 16:11:33 -07:00
Mavis Ou aed0139422 [Issue #336] added images to dialog 2013-08-01 15:02:21 -07:00
Mavis Ou ef84e3f661 [Issue #336] code cleanup and bug fixes 2013-08-01 12:33:02 -07:00
Mavis Ou c40a9e98b2 removed unused code 2013-08-01 10:55:54 -07:00
Mavis Ou ffbf27e4aa [Issue #336] modified content of some popup dialogs 2013-08-01 10:42:21 -07:00
Mavis Ou d90c05e5df [Issue #293] diasble/enable the Hide/Show Hidden button accordingly 2013-07-31 17:33:17 -07:00
Mavis Ou 502a605de1 changed the zoom in factor for Graph to be 4x 2013-07-31 17:05:25 -07:00
dethe c52d2d865b bring reset event back to aggregate and visualizations 2013-07-31 17:04:33 -07:00
dethe a3c8ff1dcc bring reset event back to aggregate and visualizations 2013-07-31 17:00:56 -07:00
Mavis Ou ef9a2d70b3 [Issue #328] Reset button handler (in progress) 2013-07-31 16:51:36 -07:00
Mavis Ou 72d8b221fc Merge branch 'c2_fresh_start' of https://github.com/mozilla/collusion into c2_fresh_start 2013-07-31 15:09:24 -07:00
Mavis Ou b0af4b8c4f [Issue #273] changed date format on List View 2013-07-31 15:09:04 -07:00
Dethe Elza bb83b26833 Merge pull request #333 from erikvold/download-pretty-print
Download data in a human readable format (aka pretty print)
2013-07-31 15:04:36 -07:00
Dethe Elza d637d7b50a Merge pull request #331 from erikvold/white-links
minor: making the links in the left nav white (on black) instead of dark blue
2013-07-31 15:02:37 -07:00
Mavis Ou 41007dd6e9 styling tweaks 2013-07-31 14:34:05 -07:00
Mavis Ou 3dbd1d7a14 fixed typo in variable names 2013-07-31 13:57:33 -07:00
Mavis Ou a3ad1d61fc Merge branch 'c2_fresh_start' of https://github.com/mozilla/collusion into c2_fresh_start 2013-07-31 13:24:31 -07:00
Mavis Ou 522fb6ed49 [Issue #293] List View: disable buttons when nothing is selected 2013-07-31 13:24:07 -07:00
dethe 542ef43f92 Merge branch 'c2_fresh_start' of https://github.com/mozilla/collusion into 261_implement_filtering 2013-07-30 21:13:30 -07:00
dethe 2e3f63c2d0 fixes for filtering, better algorithm for getting recent sites in order 2013-07-30 21:13:01 -07:00
Erik Vold 24e1187208 Download data in a human readable format (aka pretty print) 2013-07-30 18:25:00 -07:00
Erik Vold 63857c3406 minor: making the links in the left nav white (on black) instead of dark blue 2013-07-30 18:17:10 -07:00
Mavis Ou befedaace0 bug fix for including the same js file twice 2013-07-30 17:36:25 -07:00
Mavis Ou 9d90288e44 [Issue #301][Issue #302] styling changes for buttons 2013-07-30 17:15:07 -07:00
Mavis Ou 830d04024f [Issue #272] applied new menu control panel design 2013-07-30 15:25:15 -07:00
dethe ed057e06b8 fix minor bugs in filtering 2013-07-30 14:56:18 -07:00
Mavis Ou 52f42d8d27 [Issue #273] Unify Date/Time formats 2013-07-30 13:56:22 -07:00
Mavis Ou 4ff181085e [Issue #312] added 'Do Not Show Again' option for block sites and hide sites dialogs 2013-07-30 11:51:29 -07:00
dethe d6bff04962 fix merge conflict 2013-07-29 17:18:31 -07:00
dethe d360051e41 fixed merge issues and some bugs 2013-07-29 17:16:51 -07:00
Mavis Ou 857f0489d5 [Issue #312] converted all built-in alert/confirm dialogs into our customized one 2013-07-29 16:49:42 -07:00
Mavis Ou e60844e540 [Issue #275] added confirmation dialog for blocking sites 2013-07-29 15:37:18 -07:00
Mavis Ou 4db163e767 [Issue #264] added confirmation dialog for reset button 2013-07-29 15:18:12 -07:00
Mavis Ou ec8eb41828 [Issue #268] Implemented popup dialogs 2013-07-29 15:05:33 -07:00
Mavis Ou eebf34967a [Issue #268] Implemented popup dialogs 2013-07-29 15:05:24 -07:00
dethe ce9cd767c5 update d3 library 2013-07-29 12:29:52 -07:00
dethe cacc0cfa6a clock view is now working too 2013-07-29 12:24:42 -07:00
dethe 2794a5f227 list view is working again 2013-07-29 12:19:41 -07:00
dethe d9d8d84923 list view is working again 2013-07-29 12:09:48 -07:00
dethe 1ba992bdef small speedups for graph view 2013-07-28 15:28:42 -07:00
dethe 3dc5d76982 small speedups for graph view 2013-07-28 15:26:26 -07:00
dethe fb38abf75c refactored filters to include filtered nodes + all connected nodes 2013-07-28 11:47:04 -07:00
Mavis Ou fd79286aa7 [Issue #300] Fixed mismatched sorting attr 2013-07-26 16:52:40 -07:00
Mavis Ou aad18069ab [Issue #300] List View: replaced Connections column with Site Connected 2013-07-26 14:42:48 -07:00
Mavis Ou f00de1849e [Issue #265] styling tweaks 2013-07-26 12:00:58 -07:00
Mavis Ou f02ad28134 [Issue #276] Round off timestamps when uploading user data 2013-07-26 11:43:09 -07:00
Mavis Ou cd475c9012 styling tweaks 2013-07-25 17:41:02 -07:00
Mavis Ou bfd61296da [Issue #309] changes layout of the elements 2013-07-25 17:38:36 -07:00
Mavis Ou 0858c3f7ca [Issue #285] Added user feedback form link 2013-07-25 16:50:32 -07:00
Mavis Ou 2b4add736a fixed broken image path 2013-07-25 16:34:28 -07:00
Mavis Ou 2bc044bfc1 [Issue #282] Added breadcrumb in List view. History API used. 2013-07-25 16:24:50 -07:00
dethe bcf2ea7c89 resolving merge issues 2013-07-24 14:54:56 -07:00
dethe 5d2cd74333 move filters to aggregate.js 2013-07-24 10:09:43 -07:00
Mavis Ou ad10d64c7b typeface changes; replaced icon for Download 2013-07-23 14:04:30 -07:00
Mavis Ou e291f2851a [Issue #281] List: always highlight selected rows. Tweaks to map SVG. 2013-07-23 10:59:22 -07:00
Mavis Ou 23b05313e0 [Issue #307] merged site profile, help, about all into Info Panel(shown as tabs) 2013-07-22 17:44:06 -07:00
Mavis Ou 3c8fff8956 [Issue #271] implemented About Panel 2013-07-22 14:41:28 -07:00
Mavis Ou 9874a813c2 [Issue #284] add functionality for watched/blocked highlighting toggles 2013-07-22 13:05:27 -07:00
Mavis Ou 9ca3990337 [Issue #269] tooltip tweaks 2013-07-22 10:16:54 -07:00
Mavis Ou 797b4c7d28 [Issue #263] reset data refreshes view 2013-07-19 16:14:01 -07:00
Mavis Ou fc417e6abd [Issue #279] 'BETA' to the Collusion wordmark shown in the upper left corner 2013-07-19 15:39:45 -07:00
Mavis Ou 2228e376c3 Help sections have been implemented. UI interaction and content might need some tweaks 2013-07-19 14:52:09 -07:00
Mavis Ou 931826a869 [Issue #270] tweaks to tooltip behaviours; made dots more clickable 2013-07-18 15:33:55 -07:00
Mavis Ou 66b5724d3e [Issue #262] removed settings button and other unused code 2013-07-18 11:37:34 -07:00
dethe 4e296120da Merge branch 'c2_fresh_start' of https://github.com/mozilla/collusion into 261_implement_filtering 2013-07-18 11:31:37 -07:00
Mavis Ou 917c5e245e bug fixes for node clicking handler(should bring up info panel upon clicking) 2013-07-17 10:49:28 -07:00
Mavis Ou f39dc0280b fixed zooming in/out functions 2013-07-17 10:34:40 -07:00
dethe 79bd4915a3 first steps towards filtering 2013-07-17 10:18:14 -07:00
Mavis Ou dec5c302ad removed stage-header 2013-07-16 16:08:57 -07:00
Mavis Ou 26d24e5b25 removed help bubble related functions 2013-07-16 15:53:45 -07:00
Mavis Ou 53f15c00e6 placed HELP button in visualization; removed help bubbles; new help sections to be added 2013-07-16 15:51:14 -07:00
Mavis Ou 29d4d6d623 update stats bar content and styling 2013-07-16 14:33:28 -07:00
Mavis Ou e60fd3b0a2 replaced the current share button with a toggle on/off switch 2013-07-16 13:43:14 -07:00
dethe 7a8fe032a0 Merge branch 'c2_fresh_start' of https://github.com/mozilla/collusion into c2_fresh_start 2013-07-15 16:26:13 -07:00
dethe c7b02bc80f replace map with new map 1/5 of the size 2013-07-15 16:26:00 -07:00
Mavis Ou 91cabbc6c0 changed default behaviors for dropdown menus 2013-07-15 15:54:28 -07:00
Mavis Ou 7fbd574633 fixed merge conflict 2013-07-15 15:16:20 -07:00
Mavis Ou b11b12a906 Merge branch 'c2_fresh_start' of https://github.com/mozilla/collusion into c2_fresh_start 2013-07-15 15:01:40 -07:00
Mavis Ou 466ed23190 clock view - new styling 2013-07-15 15:01:10 -07:00
dethe b0008befee revise from earlier merge conflict 2013-07-15 14:31:38 -07:00
Mavis Ou 946be601a8 Merge branch 'c2_fresh_start' of https://github.com/mozilla/collusion into c2_fresh_start 2013-07-12 17:58:28 -07:00
Mavis Ou 165b7aed98 replaced the temp toggle button 2013-07-12 17:58:03 -07:00
dethe 40e5259b6a revise from earlier merge conflict 2013-07-12 16:50:35 -07:00
Azlen Elza 485df823af made info panel also display the day of the week on first access and last access 2013-07-12 15:34:07 -07:00
dethe 04690b3aae resolving merge conflict 2013-07-12 15:15:06 -07:00
Mavis Ou fe1b69e2c8 site bar, stats bar, info panel: replaced hard coded data with real number 2013-07-12 13:34:32 -07:00
Azlen Elza a21cc71077 fixed the date in the info bar 2013-07-12 12:51:25 -07:00
Mavis Ou 90bc5c78a5 group connections based on user's local time 2013-07-12 10:18:03 -07:00
Azlen Elza 45522e0c22 fixed some things and worked on the info panel 2013-07-11 17:31:13 -07:00
Mavis Ou e54ac12164 added localStorage quota limitation handling 2013-07-11 17:30:22 -07:00
dethe f6990697d9 persisting prefs and passing blocking info to add-on, still need to finish blocking implementation 2013-07-11 17:03:58 -07:00
Azlen Elza 543de1f6d0 fixed conflicts 2013-07-11 16:17:59 -07:00
Azlen Elza 61a66b3593 added functionality on the hide button in list preferences 2013-07-11 16:06:13 -07:00
Azlen Elza f198c9dd43 made site preferences look like Legend & Controls; Fixed a few things 2013-07-11 15:58:44 -07:00
Mavis Ou 742b4f7acf fixed the broken hide/show toggle for legend sections 2013-07-11 14:35:16 -07:00
Mavis Ou 49552e0918 some toggle buttons for Clock view are working 2013-07-11 14:15:29 -07:00
Azlen Elza 8e13dcdd9c adding icons to certain buttons 2013-07-11 13:13:02 -07:00
Mavis Ou c4daa07b21 changed class names 2013-07-11 11:40:23 -07:00
Mavis Ou 8c13bea4fe fixed merge conflicts 2013-07-11 11:34:10 -07:00
Mavis Ou 52bf3d3af3 added UI for Legend and Controls section for Clock view 2013-07-11 11:22:02 -07:00
dethe 0fed02cdc2 Merge branch 'c2_fresh_start' of https://github.com/azlen/collusion into azlen-c2_fresh_start 2013-07-11 09:47:26 -07:00
dethe b65b53ea08 Merge branch 'c2_fresh_start' of https://github.com/mozilla/collusion into c2_fresh_start 2013-07-11 09:41:33 -07:00
dethe 8ad84db5d4 update sort key when changing preferences 2013-07-11 09:41:20 -07:00
Azlen Elza 2e33d943bf fix conflicts 2013-07-10 17:04:07 -07:00
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
Azlen Elza 8457fe6a8b changed some colors and worked on info bar 2013-07-10 13:52:33 -07:00
Mavis Ou e508dc7de7 [Issue #245] added Legend & Controls section to Graph view 2013-07-10 13:42:06 -07:00
dethe 4c14c9b62c update sort value for preferences 2013-07-10 11:59:13 -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 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 6eb2f105a7 added stage header and stage footer 2013-07-08 19:03: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 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
Mavis Ou 0622a5dbb2 Issue #217. Connections collected in Private Mode will not be stored in storage or uploaded to the database 2013-06-13 15:40:22 -07:00
dethe 5b107d2811 fixing merge conflicts 2013-06-13 12:45:10 -07:00