Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
d348940
Initial work on "Resource page" design update
tomasko126 Jan 20, 2017
5dab6fe
Code cleanup, remove tab-select
tomasko126 Jan 20, 2017
0da8135
Show a note, when a frame has not made any request
tomasko126 Jan 20, 2017
4146feb
Support timestamps in resource page
tomasko126 Jan 20, 2017
344ae46
Code cleanup
tomasko126 Jan 20, 2017
003bffd
Design updates
tomasko126 Jan 21, 2017
74236ad
Implement resource search
tomasko126 Jan 21, 2017
a6c8f83
Match request's name with filter option names
tomasko126 Jan 25, 2017
b271e7c
Fix filter option detection
tomasko126 Jan 30, 2017
a4ebca3
Drop support for "background" filter option
tomasko126 Jan 30, 2017
2e903a4
Move Safari-specific functions from ab_start_common.js to ab_start_sa…
tomasko126 Jan 30, 2017
49ec7de
Remove frame selection in order to see every request in the main table
tomasko126 Jan 31, 2017
ed6bdf8
Include timeStamp for hidden ads
tomasko126 Jan 31, 2017
873bfd3
Initial work on dynamic resource view page
tomasko126 Jan 31, 2017
f946401
Detect the name of a filter list
tomasko126 Jan 31, 2017
b546b7b
Re-implement tab selector
tomasko126 Jan 31, 2017
72ef945
Fixed getting a filter in some scenarios
tomasko126 Jan 31, 2017
287f5f3
Implement button for tab reload
tomasko126 Jan 31, 2017
f40c2ae
Updated UX, tab selector improvements
tomasko126 Jan 31, 2017
844b380
Code clean-up
tomasko126 Jan 31, 2017
d385e94
Compatibility change for Ad report page
tomasko126 Jan 31, 2017
3ed6fe7
Performance improvements and further fixes
tomasko126 Feb 8, 2017
f3dab6b
Open resources viewer page without tabId parameter
tomasko126 Feb 8, 2017
e59fb66
Performance improvements, while Resource viewer page is not opened
tomasko126 Feb 11, 2017
0d5a156
Turn text into translatable messages
tomasko126 Feb 12, 2017
d06b573
Update i18n
tomasko126 Feb 12, 2017
92ab037
Update i18n #2
tomasko126 Feb 12, 2017
10f05bd
Update i18n #3
tomasko126 Feb 12, 2017
700394c
Fix showing up the name of a filter origin filter list
tomasko126 Feb 13, 2017
5f40697
Fix Codacy issues
tomasko126 Feb 13, 2017
4de0ac7
Add support for WebSocket connections
tomasko126 Mar 8, 2017
3a62a82
Merge branch 'master' into resource-page-design-update
tomasko126 May 20, 2017
9e87bfc
Header styling
tomasko126 May 20, 2017
f725ebe
Add a note, telling the difference between the older and the new requ…
tomasko126 May 20, 2017
451b684
Add support for "font" requests
tomasko126 May 21, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,6 @@
<key>Update From Gallery</key>
<true/>
<key>Website</key>
<string>http://catblock.tk</string>
<string>https://getcatblock.com</string>
</dict>
</plist>
2,218 changes: 1,119 additions & 1,099 deletions _locales/ar/messages.json

Large diffs are not rendered by default.

2,366 changes: 1,193 additions & 1,173 deletions _locales/bg/messages.json

Large diffs are not rendered by default.

2,366 changes: 1,193 additions & 1,173 deletions _locales/ca/messages.json

Large diffs are not rendered by default.

1,880 changes: 950 additions & 930 deletions _locales/cs/messages.json

Large diffs are not rendered by default.

1,802 changes: 911 additions & 891 deletions _locales/da/messages.json

Large diffs are not rendered by default.

2,310 changes: 1,165 additions & 1,145 deletions _locales/de/messages.json

Large diffs are not rendered by default.

2,366 changes: 1,193 additions & 1,173 deletions _locales/el/messages.json

Large diffs are not rendered by default.

2,366 changes: 1,193 additions & 1,173 deletions _locales/en/messages.json

Large diffs are not rendered by default.

2,366 changes: 1,193 additions & 1,173 deletions _locales/es/messages.json

Large diffs are not rendered by default.

2,296 changes: 1,158 additions & 1,138 deletions _locales/fi/messages.json

Large diffs are not rendered by default.

2,362 changes: 1,191 additions & 1,171 deletions _locales/fr/messages.json

Large diffs are not rendered by default.

1,832 changes: 926 additions & 906 deletions _locales/gu/messages.json

Large diffs are not rendered by default.

2,356 changes: 1,188 additions & 1,168 deletions _locales/hr/messages.json

Large diffs are not rendered by default.

2,366 changes: 1,193 additions & 1,173 deletions _locales/hu/messages.json

Large diffs are not rendered by default.

2,034 changes: 1,027 additions & 1,007 deletions _locales/id/messages.json

Large diffs are not rendered by default.

2,332 changes: 1,176 additions & 1,156 deletions _locales/it/messages.json

Large diffs are not rendered by default.

1,728 changes: 874 additions & 854 deletions _locales/ja/messages.json

Large diffs are not rendered by default.

1,728 changes: 874 additions & 854 deletions _locales/ko/messages.json

Large diffs are not rendered by default.

1,876 changes: 948 additions & 928 deletions _locales/nb/messages.json

Large diffs are not rendered by default.

2,356 changes: 1,188 additions & 1,168 deletions _locales/nl/messages.json

Large diffs are not rendered by default.

2,028 changes: 1,024 additions & 1,004 deletions _locales/pl/messages.json

Large diffs are not rendered by default.

2,366 changes: 1,193 additions & 1,173 deletions _locales/pt_BR/messages.json

Large diffs are not rendered by default.

2,366 changes: 1,193 additions & 1,173 deletions _locales/pt_PT/messages.json

Large diffs are not rendered by default.

1,904 changes: 962 additions & 942 deletions _locales/ro/messages.json

Large diffs are not rendered by default.

2,356 changes: 1,188 additions & 1,168 deletions _locales/ru/messages.json

Large diffs are not rendered by default.

1,904 changes: 962 additions & 942 deletions _locales/sk/messages.json

Large diffs are not rendered by default.

2,226 changes: 1,123 additions & 1,103 deletions _locales/sl/messages.json

Large diffs are not rendered by default.

2,146 changes: 1,083 additions & 1,063 deletions _locales/sr/messages.json

Large diffs are not rendered by default.

1,904 changes: 962 additions & 942 deletions _locales/sv/messages.json

Large diffs are not rendered by default.

2,356 changes: 1,188 additions & 1,168 deletions _locales/tr/messages.json

Large diffs are not rendered by default.

2,356 changes: 1,188 additions & 1,168 deletions _locales/uk/messages.json

Large diffs are not rendered by default.

2,366 changes: 1,193 additions & 1,173 deletions _locales/vi/messages.json

Large diffs are not rendered by default.

2,366 changes: 1,193 additions & 1,173 deletions _locales/zh_CN/messages.json

Large diffs are not rendered by default.

1,802 changes: 911 additions & 891 deletions _locales/zh_TW/messages.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion button/popup.js
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ $(function() {
});

$("#div_show_resourcelist").click(function() {
BG.launch_resourceblocker("?tabId=" + tab.id);
BG.launch_resourceblocker();
closeAndReloadPopup();
});

Expand Down
20 changes: 20 additions & 0 deletions catblock/_locales/af/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,5 +190,25 @@
"catblock_safaricontentblockingpausemessage":{
"description":"Alert displayed after clicking 'Pause AdBlock' in the AdBlock menu while Safari Content blocking is enabled",
"message":"To pause CatBlock with Content Blocking enabled, please select Safari (in the menu bar) > Preferences > Extensions > CatBlock, and uncheck 'Enable CatBlock'."
},
"catblock_allrequests":{
"message":"All requests",
"description":"A message in dropdown selection on Resource viewer page"
},
"catblock_time":{
"message":"Time",
"description":"Name of the table header on Resources viewer page"
},
"catblock_reloadtab":{
"message":"Reload tab",
"description":"Button on Resources viewer page, which reloads selected tab from dropdown menu"
},
"catblock_searchresources":{
"message":"Search resources by URL:",
"description":"A text shown on Resources viewer page"
},
"catblock_customfilters":{
"message":"User's custom filter",
"description":"Text used on Resource Viewer page telling, where the particular filter comes from"
}
}
20 changes: 20 additions & 0 deletions catblock/_locales/ar/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,5 +190,25 @@
"catblock_safaricontentblockingpausemessage":{
"description":"Alert displayed after clicking 'Pause AdBlock' in the AdBlock menu while Safari Content blocking is enabled",
"message":"To pause CatBlock with Content Blocking enabled, please select Safari (in the menu bar) > Preferences > Extensions > CatBlock, and uncheck 'Enable CatBlock'."
},
"catblock_allrequests":{
"message":"All requests",
"description":"A message in dropdown selection on Resource viewer page"
},
"catblock_time":{
"message":"Time",
"description":"Name of the table header on Resources viewer page"
},
"catblock_reloadtab":{
"message":"Reload tab",
"description":"Button on Resources viewer page, which reloads selected tab from dropdown menu"
},
"catblock_searchresources":{
"message":"Search resources by URL:",
"description":"A text shown on Resources viewer page"
},
"catblock_customfilters":{
"message":"User's custom filter",
"description":"Text used on Resource Viewer page telling, where the particular filter comes from"
}
}
20 changes: 20 additions & 0 deletions catblock/_locales/ca/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,5 +190,25 @@
"catblock_safaricontentblockingpausemessage":{
"description":"Alert displayed after clicking 'Pause AdBlock' in the AdBlock menu while Safari Content blocking is enabled",
"message":"To pause CatBlock with Content Blocking enabled, please select Safari (in the menu bar) > Preferences > Extensions > CatBlock, and uncheck 'Enable CatBlock'."
},
"catblock_allrequests":{
"message":"All requests",
"description":"A message in dropdown selection on Resource viewer page"
},
"catblock_time":{
"message":"Time",
"description":"Name of the table header on Resources viewer page"
},
"catblock_reloadtab":{
"message":"Reload tab",
"description":"Button on Resources viewer page, which reloads selected tab from dropdown menu"
},
"catblock_searchresources":{
"message":"Search resources by URL:",
"description":"A text shown on Resources viewer page"
},
"catblock_customfilters":{
"message":"User's custom filter",
"description":"Text used on Resource Viewer page telling, where the particular filter comes from"
}
}
20 changes: 20 additions & 0 deletions catblock/_locales/cs/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,5 +190,25 @@
"catblock_safaricontentblockingpausemessage":{
"description":"Alert displayed after clicking 'Pause AdBlock' in the AdBlock menu while Safari Content blocking is enabled",
"message":"To pause CatBlock with Content Blocking enabled, please select Safari (in the menu bar) > Preferences > Extensions > CatBlock, and uncheck 'Enable CatBlock'."
},
"catblock_allrequests":{
"message":"All requests",
"description":"A message in dropdown selection on Resource viewer page"
},
"catblock_time":{
"message":"Time",
"description":"Name of the table header on Resources viewer page"
},
"catblock_reloadtab":{
"message":"Reload tab",
"description":"Button on Resources viewer page, which reloads selected tab from dropdown menu"
},
"catblock_searchresources":{
"message":"Search resources by URL:",
"description":"A text shown on Resources viewer page"
},
"catblock_customfilters":{
"message":"User's custom filter",
"description":"Text used on Resource Viewer page telling, where the particular filter comes from"
}
}
20 changes: 20 additions & 0 deletions catblock/_locales/da/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,5 +190,25 @@
"catblock_safaricontentblockingpausemessage":{
"description":"Alert displayed after clicking 'Pause AdBlock' in the AdBlock menu while Safari Content blocking is enabled",
"message":"To pause CatBlock with Content Blocking enabled, please select Safari (in the menu bar) > Preferences > Extensions > CatBlock, and uncheck 'Enable CatBlock'."
},
"catblock_allrequests":{
"message":"All requests",
"description":"A message in dropdown selection on Resource viewer page"
},
"catblock_time":{
"message":"Time",
"description":"Name of the table header on Resources viewer page"
},
"catblock_reloadtab":{
"message":"Reload tab",
"description":"Button on Resources viewer page, which reloads selected tab from dropdown menu"
},
"catblock_searchresources":{
"message":"Search resources by URL:",
"description":"A text shown on Resources viewer page"
},
"catblock_customfilters":{
"message":"User's custom filter",
"description":"Text used on Resource Viewer page telling, where the particular filter comes from"
}
}
20 changes: 20 additions & 0 deletions catblock/_locales/de/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,5 +190,25 @@
"catblock_safaricontentblockingpausemessage":{
"description":"Alert displayed after clicking 'Pause AdBlock' in the AdBlock menu while Safari Content blocking is enabled",
"message":"To pause CatBlock with Content Blocking enabled, please select Safari (in the menu bar) > Preferences > Extensions > CatBlock, and uncheck 'Enable CatBlock'."
},
"catblock_allrequests":{
"message":"All requests",
"description":"A message in dropdown selection on Resource viewer page"
},
"catblock_time":{
"message":"Time",
"description":"Name of the table header on Resources viewer page"
},
"catblock_reloadtab":{
"message":"Reload tab",
"description":"Button on Resources viewer page, which reloads selected tab from dropdown menu"
},
"catblock_searchresources":{
"message":"Search resources by URL:",
"description":"A text shown on Resources viewer page"
},
"catblock_customfilters":{
"message":"User's custom filter",
"description":"Text used on Resource Viewer page telling, where the particular filter comes from"
}
}
20 changes: 20 additions & 0 deletions catblock/_locales/el/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,5 +190,25 @@
"catblock_safaricontentblockingpausemessage":{
"description":"Alert displayed after clicking 'Pause AdBlock' in the AdBlock menu while Safari Content blocking is enabled",
"message":"To pause CatBlock with Content Blocking enabled, please select Safari (in the menu bar) > Preferences > Extensions > CatBlock, and uncheck 'Enable CatBlock'."
},
"catblock_allrequests":{
"message":"All requests",
"description":"A message in dropdown selection on Resource viewer page"
},
"catblock_time":{
"message":"Time",
"description":"Name of the table header on Resources viewer page"
},
"catblock_reloadtab":{
"message":"Reload tab",
"description":"Button on Resources viewer page, which reloads selected tab from dropdown menu"
},
"catblock_searchresources":{
"message":"Search resources by URL:",
"description":"A text shown on Resources viewer page"
},
"catblock_customfilters":{
"message":"User's custom filter",
"description":"Text used on Resource Viewer page telling, where the particular filter comes from"
}
}
24 changes: 24 additions & 0 deletions catblock/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,5 +190,29 @@
"catblock_safaricontentblockingpausemessage":{
"description":"Alert displayed after clicking 'Pause AdBlock' in the AdBlock menu while Safari Content blocking is enabled",
"message":"To pause CatBlock with Content Blocking enabled, please select Safari (in the menu bar) > Preferences > Extensions > CatBlock, and uncheck 'Enable CatBlock'."
},
"catblock_allrequests":{
"message":"All requests",
"description":"A message in dropdown selection on Resource viewer page"
},
"catblock_time":{
"message":"Time",
"description":"Name of the table header on Resources viewer page"
},
"catblock_reloadtab":{
"message":"Reload tab",
"description":"Button on Resources viewer page, which reloads selected tab from dropdown menu"
},
"catblock_searchresources":{
"message":"Search resources by URL:",
"description":"A text shown on Resources viewer page"
},
"catblock_customfilters":{
"message":"User's custom filter",
"description":"Text used on Resource Viewer page telling, where the particular filter comes from"
},
"catblock_different_resourceblocker":{
"message":"Note: Requests made before opening this page are not shown.",
"description":"Text used on Resource Viewer page telling the difference between the old and the new resource viewer page"
}
}
20 changes: 20 additions & 0 deletions catblock/_locales/es-ES/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,5 +190,25 @@
"catblock_safaricontentblockingpausemessage":{
"description":"Alert displayed after clicking 'Pause AdBlock' in the AdBlock menu while Safari Content blocking is enabled",
"message":"To pause CatBlock with Content Blocking enabled, please select Safari (in the menu bar) > Preferences > Extensions > CatBlock, and uncheck 'Enable CatBlock'."
},
"catblock_allrequests":{
"message":"All requests",
"description":"A message in dropdown selection on Resource viewer page"
},
"catblock_time":{
"message":"Time",
"description":"Name of the table header on Resources viewer page"
},
"catblock_reloadtab":{
"message":"Reload tab",
"description":"Button on Resources viewer page, which reloads selected tab from dropdown menu"
},
"catblock_searchresources":{
"message":"Search resources by URL:",
"description":"A text shown on Resources viewer page"
},
"catblock_customfilters":{
"message":"User's custom filter",
"description":"Text used on Resource Viewer page telling, where the particular filter comes from"
}
}
20 changes: 20 additions & 0 deletions catblock/_locales/fi/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,5 +190,25 @@
"catblock_safaricontentblockingpausemessage":{
"description":"Alert displayed after clicking 'Pause AdBlock' in the AdBlock menu while Safari Content blocking is enabled",
"message":"To pause CatBlock with Content Blocking enabled, please select Safari (in the menu bar) > Preferences > Extensions > CatBlock, and uncheck 'Enable CatBlock'."
},
"catblock_allrequests":{
"message":"All requests",
"description":"A message in dropdown selection on Resource viewer page"
},
"catblock_time":{
"message":"Time",
"description":"Name of the table header on Resources viewer page"
},
"catblock_reloadtab":{
"message":"Reload tab",
"description":"Button on Resources viewer page, which reloads selected tab from dropdown menu"
},
"catblock_searchresources":{
"message":"Search resources by URL:",
"description":"A text shown on Resources viewer page"
},
"catblock_customfilters":{
"message":"User's custom filter",
"description":"Text used on Resource Viewer page telling, where the particular filter comes from"
}
}
20 changes: 20 additions & 0 deletions catblock/_locales/fr/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,5 +190,25 @@
"catblock_safaricontentblockingpausemessage":{
"description":"Alert displayed after clicking 'Pause AdBlock' in the AdBlock menu while Safari Content blocking is enabled",
"message":"To pause CatBlock with Content Blocking enabled, please select Safari (in the menu bar) > Preferences > Extensions > CatBlock, and uncheck 'Enable CatBlock'."
},
"catblock_allrequests":{
"message":"All requests",
"description":"A message in dropdown selection on Resource viewer page"
},
"catblock_time":{
"message":"Time",
"description":"Name of the table header on Resources viewer page"
},
"catblock_reloadtab":{
"message":"Reload tab",
"description":"Button on Resources viewer page, which reloads selected tab from dropdown menu"
},
"catblock_searchresources":{
"message":"Search resources by URL:",
"description":"A text shown on Resources viewer page"
},
"catblock_customfilters":{
"message":"User's custom filter",
"description":"Text used on Resource Viewer page telling, where the particular filter comes from"
}
}
20 changes: 20 additions & 0 deletions catblock/_locales/he/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,5 +190,25 @@
"catblock_safaricontentblockingpausemessage":{
"description":"Alert displayed after clicking 'Pause AdBlock' in the AdBlock menu while Safari Content blocking is enabled",
"message":"To pause CatBlock with Content Blocking enabled, please select Safari (in the menu bar) > Preferences > Extensions > CatBlock, and uncheck 'Enable CatBlock'."
},
"catblock_allrequests":{
"message":"All requests",
"description":"A message in dropdown selection on Resource viewer page"
},
"catblock_time":{
"message":"Time",
"description":"Name of the table header on Resources viewer page"
},
"catblock_reloadtab":{
"message":"Reload tab",
"description":"Button on Resources viewer page, which reloads selected tab from dropdown menu"
},
"catblock_searchresources":{
"message":"Search resources by URL:",
"description":"A text shown on Resources viewer page"
},
"catblock_customfilters":{
"message":"User's custom filter",
"description":"Text used on Resource Viewer page telling, where the particular filter comes from"
}
}
20 changes: 20 additions & 0 deletions catblock/_locales/hu/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,5 +190,25 @@
"catblock_safaricontentblockingpausemessage":{
"description":"Alert displayed after clicking 'Pause AdBlock' in the AdBlock menu while Safari Content blocking is enabled",
"message":"To pause CatBlock with Content Blocking enabled, please select Safari (in the menu bar) > Preferences > Extensions > CatBlock, and uncheck 'Enable CatBlock'."
},
"catblock_allrequests":{
"message":"All requests",
"description":"A message in dropdown selection on Resource viewer page"
},
"catblock_time":{
"message":"Time",
"description":"Name of the table header on Resources viewer page"
},
"catblock_reloadtab":{
"message":"Reload tab",
"description":"Button on Resources viewer page, which reloads selected tab from dropdown menu"
},
"catblock_searchresources":{
"message":"Search resources by URL:",
"description":"A text shown on Resources viewer page"
},
"catblock_customfilters":{
"message":"User's custom filter",
"description":"Text used on Resource Viewer page telling, where the particular filter comes from"
}
}
20 changes: 20 additions & 0 deletions catblock/_locales/it/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,5 +190,25 @@
"catblock_safaricontentblockingpausemessage":{
"description":"Alert displayed after clicking 'Pause AdBlock' in the AdBlock menu while Safari Content blocking is enabled",
"message":"To pause CatBlock with Content Blocking enabled, please select Safari (in the menu bar) > Preferences > Extensions > CatBlock, and uncheck 'Enable CatBlock'."
},
"catblock_allrequests":{
"message":"All requests",
"description":"A message in dropdown selection on Resource viewer page"
},
"catblock_time":{
"message":"Time",
"description":"Name of the table header on Resources viewer page"
},
"catblock_reloadtab":{
"message":"Reload tab",
"description":"Button on Resources viewer page, which reloads selected tab from dropdown menu"
},
"catblock_searchresources":{
"message":"Search resources by URL:",
"description":"A text shown on Resources viewer page"
},
"catblock_customfilters":{
"message":"User's custom filter",
"description":"Text used on Resource Viewer page telling, where the particular filter comes from"
}
}
Loading