Skip to content

Commit

Permalink
Release version 1.4.2
Browse files Browse the repository at this point in the history
Signed-off-by: Tomáš Taro <[email protected]>
  • Loading branch information
tomasko126 committed Jun 5, 2016
1 parent ebaa18a commit 8ef5168
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 86 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- Fixed injecting of jQuery UI
- Fixed undoing added hiding filters within popup menu on Firefox
- Punycode library wasn't defined in Safari
- Fixed path to bandaids.js (#49)

1.4.1:
- Added context menu options (Pause/Unpause CatBlock; Options page)
Expand Down
170 changes: 85 additions & 85 deletions Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,90 +2,90 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Author</key>
<string>CatBlock Team</string>
<key>Builder Version</key>
<string>11601.7.1</string>
<key>CFBundleDisplayName</key>
<string>AdBlock with CatBlock</string>
<key>CFBundleIdentifier</key>
<string>com.catblock.adblockwithcatblock</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleShortVersionString</key>
<string>1.4.1</string>
<key>CFBundleVersion</key>
<string>101.4.1</string>
<key>Chrome</key>
<dict>
<key>Global Page</key>
<string>background_safari.html</string>
<key>Toolbar Items</key>
<array>
<dict>
<key>Command</key>
<string></string>
<key>Identifier</key>
<string>AdBlockOptions</string>
<key>Image</key>
<string>img/icon16_grayscale.png</string>
<key>Label</key>
<string>Options</string>
<key>Palette Label</key>
<string></string>
<key>Tool Tip</key>
<string>AdBlock with CatBlock Options</string>
</dict>
</array>
</dict>
<key>Content</key>
<dict>
<key>Scripts</key>
<dict>
<key>End</key>
<array>
<string>lib/punycode.min.js</string>
<string>uiscripts/load_jquery_ui.js</string>
<string>uiscripts/blacklisting/rightclick_hook.js</string>
<string>uiscripts/blacklisting/overlay.js</string>
<string>uiscripts/blacklisting/clickwatcher.js</string>
<string>uiscripts/blacklisting/elementchain.js</string>
<string>uiscripts/blacklisting/blacklistui.js</string>
<string>uiscripts/send_content_to_back.js</string>
<string>uiscripts/top_open_blacklist_ui.js</string>
<string>uiscripts/top_open_whitelist_ui.js</string>
<string>uiscripts/safari_hooks.js</string>
</array>
<key>Start</key>
<array>
<string>lib/jquery.min.js</string>
<string>js/port.js</string>
<string>js/functions.js</string>
<string>filtering/filteroptions.js</string>
<string>js/bandaids.js</string>
<string>js/adblock_start_common.js</string>
<string>js/adblock_start_safari.js</string>
<string>catblock/contentscript.js</string>
</array>
</dict>
</dict>
<key>Description</key>
<string>Replaces ads with pictures of cats, or whatever you want</string>
<key>DeveloperIdentifier</key>
<string>3KKZV48AQD</string>
<key>ExtensionInfoDictionaryVersion</key>
<string>1.0</string>
<key>Permissions</key>
<dict>
<key>Website Access</key>
<dict>
<key>Include Secure Pages</key>
<true/>
<key>Level</key>
<string>All</string>
</dict>
</dict>
<key>Website</key>
<string>http://catblock.tk</string>
<key>Author</key>
<string>CatBlock Team</string>
<key>Builder Version</key>
<string>11601.7.1</string>
<key>CFBundleDisplayName</key>
<string>AdBlock with CatBlock</string>
<key>CFBundleIdentifier</key>
<string>com.catblock.adblockwithcatblock</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleShortVersionString</key>
<string>1.4.2</string>
<key>CFBundleVersion</key>
<string>101.4.2</string>
<key>Chrome</key>
<dict>
<key>Global Page</key>
<string>background_safari.html</string>
<key>Toolbar Items</key>
<array>
<dict>
<key>Command</key>
<string></string>
<key>Identifier</key>
<string>AdBlockOptions</string>
<key>Image</key>
<string>img/icon16_grayscale.png</string>
<key>Label</key>
<string>Options</string>
<key>Palette Label</key>
<string></string>
<key>Tool Tip</key>
<string>AdBlock with CatBlock Options</string>
</dict>
</array>
</dict>
<key>Content</key>
<dict>
<key>Scripts</key>
<dict>
<key>End</key>
<array>
<string>lib/punycode.min.js</string>
<string>uiscripts/load_jquery_ui.js</string>
<string>uiscripts/blacklisting/rightclick_hook.js</string>
<string>uiscripts/blacklisting/overlay.js</string>
<string>uiscripts/blacklisting/clickwatcher.js</string>
<string>uiscripts/blacklisting/elementchain.js</string>
<string>uiscripts/blacklisting/blacklistui.js</string>
<string>uiscripts/send_content_to_back.js</string>
<string>uiscripts/top_open_blacklist_ui.js</string>
<string>uiscripts/top_open_whitelist_ui.js</string>
<string>uiscripts/safari_hooks.js</string>
</array>
<key>Start</key>
<array>
<string>lib/jquery.min.js</string>
<string>js/port.js</string>
<string>js/functions.js</string>
<string>filtering/filteroptions.js</string>
<string>js/bandaids.js</string>
<string>js/adblock_start_common.js</string>
<string>js/adblock_start_safari.js</string>
<string>catblock/contentscript.js</string>
</array>
</dict>
</dict>
<key>Description</key>
<string>Replaces ads with pictures of cats, or whatever you want</string>
<key>DeveloperIdentifier</key>
<string>3KKZV48AQD</string>
<key>ExtensionInfoDictionaryVersion</key>
<string>1.0</string>
<key>Permissions</key>
<dict>
<key>Website Access</key>
<dict>
<key>Include Secure Pages</key>
<true/>
<key>Level</key>
<string>All</string>
</dict>
</dict>
<key>Website</key>
<string>http://catblock.tk</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "AdBlock with CatBlock",
"short_name": "CatBlock",
"version": "1.4.1",
"version": "1.4.2",
"description": "CatBlock, it's AdBlock but with cats...",
"author": "CatBlock Team",
"icons": {
Expand Down

0 comments on commit 8ef5168

Please sign in to comment.