Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,690 Commits 2 Branches 962 Tags 214 MiB
Commit Graph

1310 Commits

Author SHA1 Message Date
gorhill 1b1e982835
minor code review 2017-03-25 09:19:57 -04:00
gorhill ea99f5fd07
fix #2435 2017-03-25 09:18:19 -04:00
gorhill 556de1a9b4
new revision for release candidate 2017-03-23 08:36:38 -04:00
gorhill 15714ad22b
new revision for dev build 2017-03-20 16:30:30 -04:00
gorhill 23fa686f46
new revision for dev build 2017-03-14 16:05:44 -04:00
gorhill e0a5116348
fix #2454 2017-03-14 16:01:35 -04:00
gorhill fba8ea2e75
new revision for dev build 2017-03-13 10:27:13 -04:00
gorhill bed2e99e66
new revision for dev build 2017-03-11 16:54:47 -05:00
Andrei Petcu e8375f91cd #2433 Changed the XML namespaces to please jpm sign (#2434) 
*  #2433 changed the legacy install.rdf to match MDN
https://developer.mozilla.org/en-US/Add-ons/Install_Manifests

*  #2433 changed webext install.rdf to match MDN docs
 https://developer.mozilla.org/en-US/Add-ons/Install_Manifests

*  #2433 changed property added by mistake

*  #2433 changed localization XML namespaces to match install.rdf

*  #2433 small fixes
 2017-03-10 07:01:57 -05:00
gorhill 9f26776c11 new revision for dev build 2017-03-07 13:51:23 -05:00
gorhill 7e55ddf16b re. websocket: mind backward compatibility 2017-03-06 17:53:25 -05:00
gorhill 2213b005a0 forgot to add "ws://*/*"/"wss://*/*" to enable support for websocket type" 2017-03-06 17:34:46 -05:00
gorhill c271fbbd0d code review: remove old cruft 2017-03-05 17:20:28 -05:00
gorhill 4c832718d3 new revision for dev build 2017-03-05 14:32:53 -05:00
gorhill d7c1f2f919 fix sync storage for Firefox webext (#622) 2017-03-05 12:12:58 -05:00
gorhill 4d1ed37556 Firefox WebExt readiness (#622) + support more webRequest types when available (websocket, font, csp_report) 2017-03-05 08:25:55 -05:00
gorhill b77cfc3735 new revision for stable release 2017-03-03 08:13:19 -05:00
gorhill 0c804116a8 privacy API now supported in webext 2017-03-02 12:49:59 -05:00
gorhill 414f3a98b7 new revision for release candidate 2017-02-18 09:03:02 -05:00
gorhill 39f9d11ec5 prepare uBO for fix to https://github.com/gorhill/uBO-Extra/issues/29 2017-02-18 09:01:36 -05:00
gorhill ea8cca1445 new revision for dev build 2017-02-13 08:56:42 -05:00
gorhill 48b3ba161b new version for dev build 2017-02-06 15:38:39 -05:00
gorhill 1d705485e9 update max version info 2017-02-06 15:36:34 -05:00
gorhill e4e6d8d8c3 new stable version 2017-02-05 15:25:00 -05:00
gorhill f321ea31c1 new revision for release candidate 2017-02-03 08:13:08 -05:00
gorhill ba3127a59b new revision for release candidate 2017-02-01 08:59:35 -05:00
gorhill a0c172c13e to mitigate https://github.com/gorhill/uBO-Extra/issues/7 2017-01-28 13:42:33 -05:00
gorhill 0d2e4f5621 new release candidate 2017-01-27 13:46:33 -05:00
gorhill 5975832653 new release candidate 2017-01-26 10:24:28 -05:00
gorhill 393d0b2d08 new revision or dev build 2017-01-25 09:21:44 -05:00
gorhill 1809636680 fix #2337 2017-01-25 08:05:41 -05:00
gorhill 82b58664d4 new revision for release candidate 2017-01-23 17:17:12 -05:00
gorhill 975b0d8280 new version for release candidate 2017-01-23 11:08:01 -05:00
gorhill e0f9710cd8 new revision for dev build 2017-01-22 16:15:32 -05:00
gorhill 20ebe6d18f new revision for dev build 2017-01-20 15:31:47 -05:00
gorhill 4a8dd58f2d new revision for dev build 2017-01-20 11:24:18 -05:00
gorhill f2f7375e00 new revision for dev build 2017-01-19 08:35:37 -05:00
gorhill cc00dd3adc new revision for dev build 2017-01-18 13:47:21 -05:00
gorhill 7f4863fbcc new revision for dev build 2017-01-09 09:16:48 -05:00
gorhill b21e765f5c minor code review 2017-01-09 09:16:37 -05:00
gorhill 693758aacb new revision for dev build 2017-01-08 18:03:20 -05:00
gorhill 3b0d3e3330 code review: saner way to find a popup's opener tab id 2017-01-08 17:52:38 -05:00
gorhill eca33ea659 new revision for dev build 2017-01-08 14:37:44 -05:00
gorhill a303c7800e fix #2290 2017-01-08 14:36:08 -05:00
gorhill 4e747fd39e minor code review 2017-01-07 10:58:25 -05:00
gorhill 8d8905aab3 dont focus newly opened logger window: FF webext complains about it and not needed anyway 2017-01-07 10:57:16 -05:00
gorhill 30e02a7250 new revision for dev build 2017-01-06 13:26:01 -05:00
gorhill 1a92fff641 fix https://github.com/uBlockOrigin/uAssets/issues/255 2017-01-02 10:50:03 -05:00
gorhill c196bf5f53 new revision for dev build 2016-12-30 10:43:07 -05:00
gorhill 7d08b9da39 new revision for dev build 2016-12-29 14:44:06 -05:00
gorhill 35a63c784f new revision for dev build 2016-12-28 23:45:22 -05:00
gorhill e09b702470 fix #2274 (hopefully) 2016-12-28 23:39:15 -05:00
gorhill 914599431b new revision for dev build 2016-12-26 11:56:51 -05:00
gorhill d4155bf9e0 new revision for dev build + force lists to be recompiled 2016-12-25 17:00:24 -05:00
gorhill 2f01fcda54 fix #2256 2016-12-21 11:44:03 -05:00
gorhill 0b8f27801c new revision for dev build 2016-12-19 13:57:17 -05:00
gorhill 94637ee4ff fix https://github.com/nikrolls/uBlock-Edge/issues/30 2016-12-15 10:47:32 -05:00
gorhill 66de9a3b5c new revision for dev build 2016-12-15 09:53:53 -05:00
gorhill f30b31ff1e new revision for release 2016-12-14 07:51:20 -05:00
gorhill 289611173c new revision for release candidate 2016-12-08 00:03:57 -05:00
gorhill 4a4de32bba fix #2226 2016-12-07 23:59:10 -05:00
gorhill 9bc6b5b2fe new revision for release candidate 2016-12-07 20:22:07 -05:00
gorhill a727a99e35 new revision for dev build 2016-12-07 09:52:42 -05:00
gorhill cfa70bde7b minor code review 2016-12-07 09:49:43 -05:00
gorhill a6d402aefe new revision for dev build 2016-12-01 11:42:56 -05:00
gorhill 8b73ac1ef4 new revision for release 2016-11-28 16:01:01 -05:00
gorhill 1e25fc7c9e new revision for release candidate build 2016-11-23 16:24:58 -05:00
gorhill 2a13ac71c3 new revision for dev build 2016-11-17 09:31:00 -05:00
gorhill 73c8a96c48 workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1317173 2016-11-16 16:08:03 -05:00
gorhill a7316b7456 new revision for dev build 2016-11-14 12:07:25 -05:00
gorhill ad5fb9c8da fix webext version 2016-11-14 12:03:13 -05:00
gorhill b92a4f7c30 new revision for dev build 2016-11-12 13:48:52 -05:00
gorhill b6881773b9 new revision for dev build 2016-11-08 15:58:50 -05:00
Sean Whitton 8f39f88366 drop Conkeror from install.rdf (#2131) 
Since #1356 has been declined.
 2016-11-06 18:00:36 -05:00
gorhill 68d68f4c93 new revision for dev build 2016-11-06 17:10:23 -05:00
gorhill 69d515f286 new revision for dev build 2016-11-05 14:59:03 -04:00
gorhill 33f86a9ea7 new revision for dev build 2016-11-04 13:00:19 -04:00
gorhill f2cb4cefc4 fix #2126 2016-11-04 12:59:06 -04:00
gorhill 969747e3c0 new revision for dev build 2016-11-03 23:42:46 -04:00
gorhill 8c3da95d65 fix #2067 (experimental) + support for hidden settings 2016-11-03 11:20:47 -04:00
gorhill 18d1c4809e new revision for dev build 2016-11-02 00:30:15 -04:00
gorhill 2bb96d7b46 new revision for dev build 2016-10-31 08:44:45 -04:00
gorhill d740164ae3 new revision for dev build 2016-10-29 11:24:31 -04:00
gorhill 3628de7a9d necessary changes for https://github.com/nikrolls/uBlock-Edge/pull/22 2016-10-28 08:40:38 -04:00
gorhill 86ffd07ecf new revision for release 2016-10-24 11:22:55 -04:00
gorhill 9b57b827d3 fix uncaught `data:` URI by popup blocker when URL is updated using `location.replace()` 2016-10-22 18:10:49 -04:00
gorhill 8dd6559759 new revision for release candidate 2016-10-19 11:15:10 -04:00
gorhill e01a130bc5 changes required to use chromium platform code for webext platform code 2016-10-19 10:20:26 -04:00
gorhill a4ce5ec6af for now, make webext version based on chromium implementation as much as possible 2016-10-19 10:16:50 -04:00
gorhill 523259bf19 new revision for release candidate 2016-10-17 09:43:05 -04:00
gorhill fff8e71ac0 adapt for Firefox webext / chrome.privacy not available yet 2016-10-15 16:06:33 -04:00
gorhill 607e44b2d6 new WebExtensions platform: starting point = Chromium platform 2016-10-15 08:35:51 -04:00
gorhill afc13b9953 new revision for dev build 2016-10-14 11:00:55 -04:00
gorhill cbefeb923c fix #1884 2016-10-14 10:06:34 -04:00
gorhill b68c4f8f85 new revision for dev build 2016-10-12 07:06:26 -04:00
gorhill cd81f866b9 code review: benefit from ES6 Set() in content script 
fall back on legacy browser-specific polyfill code if required.
 2016-10-09 11:09:25 -04:00
gorhill 4c714cb11c new revision for dev build 2016-10-08 15:16:27 -04:00
gorhill a1fa4d0fe9 fix #2060 2016-10-08 15:14:24 -04:00
gorhill 41733339d3 oops forgot last stable is 1.9.14 2016-10-06 10:56:51 -04:00
gorhill 1dbeb2107e new revision fro dev build 2016-10-06 10:55:07 -04:00
gorhill e436a9be93 fix #2048 2016-10-05 06:52:43 -04:00
gorhill 889bf17545 new revision for dev build 2016-10-01 13:07:32 -04:00
gorhill ecf875f13d Merge branch 'master' of github.com:gorhill/uBlock into next 2016-10-01 13:06:34 -04:00
gorhill 33cdf3ba8c new release candidate 2016-10-01 12:53:42 -04:00
gorhill c084853d9a fix #1772: ability to preview procedural cosmetic filters 2016-10-01 12:34:25 -04:00
gorhill d721b83e21 code review #2014: gracefully deal with importing from a pre-1.9.12 module 2016-09-28 08:43:40 -04:00
gorhill 56176c8eb7 fix #2030: brain fart bug 2016-09-26 00:07:29 -04:00
gorhill 0c4137937d new release candidate 2016-09-25 17:02:47 -04:00
gorhill 69a76109c8 code review re 029bc946ad 
- fix error message when disabling extension
- properly cleanup when disabling extension
 2016-09-25 16:02:11 -04:00
gorhill c538b260de import fix for #2025, new revision for dev build 2016-09-24 17:35:53 -04:00
gorhill 1a29be62fb fix #2025 2016-09-24 17:19:52 -04:00
gorhill 029bc946ad oops, forgot to git add this for #2014 2016-09-24 15:28:33 -04:00
gorhill f0a8f55b16 new revision for dev build 2016-09-24 14:43:17 -04:00
gorhill 95ec573141 fix #2014 2016-09-24 14:36:08 -04:00
gorhill 203d8efb4f new revision for dev build 2016-09-22 12:21:57 -04:00
gorhill b30648dd47 new release 2016-09-21 16:23:33 -04:00
gorhill 8e2f468c8f release candidate for 1.9.8 2016-09-19 09:18:58 -04:00
gorhill 40a85f8c04 new revision for dev build 2016-09-16 19:14:03 -04:00
gorhill d516e576ff reworded comment 2016-09-15 09:09:13 -04:00
gorhill 6e81771783 #1735: remove spurious whitespaces from data URI description fields 2016-09-15 09:06:22 -04:00
gorhill 63691a26ef new revision for dev build 2016-09-13 15:27:14 -04:00
gorhill 4e0723e1b5 new revision for dev build 2016-09-13 12:49:36 -04:00
gorhill bc4ddad0dc new revision for dev build 2016-09-12 10:42:02 -04:00
gorhill e51debbcf8 no longer used, replaced by polyfill.js 
the polyfilled Set/Map may end up being used by "external" publicsuffixlist.js
 2016-09-12 10:28:13 -04:00
gorhill a7fe367eec refactor where appropriate to make use of ES6 Set/Map (#1070) 
At the same time, the following issues were fixed:
- #1954: automatically lookup site-specific scriptlets
- https://github.com/uBlockOrigin/uAssets/issues/23
 2016-09-12 10:22:25 -04:00
gorhill aa20b6185d typo in comments 2016-09-12 08:14:09 -04:00
gorhill 921bdfeba7 minor changes: header stuff 2016-09-10 08:29:18 -04:00
gorhill 558b82b7c1 fix #1971 2016-09-09 17:44:54 -04:00
gorhill 4c3ecd82ef new revision for dev build 2016-09-09 17:44:17 -04:00
gorhill cc5498235c new release version 2016-09-09 07:53:17 -04:00
gorhill f793039962 release candidate 2016-09-05 19:04:01 -04:00
gorhill 57a7558f6a new iteration for dev build 2016-09-01 15:55:20 -04:00
gorhill 43d699b1e2 new dev build iteration 2016-09-01 08:30:54 -04:00
gorhill 2c925ff5ee fix https://github.com/uBlockOrigin/uAssets/issues/123#issuecomment-244033330 2016-09-01 08:29:24 -04:00
gorhill 05adf750be new revision for dev build 2016-08-31 18:03:01 -04:00
gorhill 33234fdd8b fix #1952 2016-08-31 17:50:49 -04:00
gorhill 0d7e326dce code review re. changes in chrome.privacy.network with Chromium 48 2016-08-31 17:28:10 -04:00
gorhill c96c097d6c new revision for dev build 2016-08-31 06:14:35 -04:00
gorhill 83e66b36f1 patch or convert filters meant to target websocket network requests 2016-08-30 19:57:25 -04:00
gorhill 7073737593 new revision b0 dev build 2016-08-29 08:52:10 -04:00
gorhill c941bb4c04 new revision for dev build 2016-08-29 08:49:41 -04:00
gorhill 60cfab9209 new release revision 2016-08-29 07:56:35 -04:00
gorhill df6fb5070a update to a valid release version (forgot release versions are even numbers) 2016-08-28 09:31:06 -04:00
gorhill 07662ced95 new revision 2016-08-28 06:48:16 -04:00
gorhill ca13e1a8df new revision 2016-08-27 21:12:37 -04:00
gorhill fea00084bc new release candidate 2016-08-27 11:09:34 -04:00
gorhill b541c0e286 new release candidate 2016-08-25 17:11:15 -04:00
gorhill 6101e46a3a new release candidate 2016-08-23 10:37:44 -04:00
gorhill 6618cb1630 new release candidate 2016-08-22 19:18:32 -04:00
buttercookie42 3ea58979d5 Support back button navigation on Android (#1917) 
When opening a new tab in Fennec, we should pass the ID of the current tab as parentId, so that pressing the back button afterwards closes the new tab and returns to the original tab instead of just closing Firefox.
 2016-08-20 07:52:16 -04:00
gorhill ad02883118 new revision for dev build 2016-08-18 11:58:38 -04:00
gorhill 160ee42e9f new revision for dev build 2016-08-16 12:14:24 -04:00
gorhill 07d15ae817 minor code review 2016-08-16 08:42:12 -04:00
gorhill a9ec0a1c7b new revision for dev build 2016-08-15 23:07:20 -04:00
gorhill 2725479709 better fix for https://bugzilla.mozilla.org/show_bug.cgi?id=1232354, as pointed out in comments 2016-08-15 22:50:24 -04:00
gorhill dcc9138f31 new revision for dev build 2016-08-14 10:20:01 -04:00
gorhill 941692e7a1 new revision for dev build 2016-08-13 21:48:17 -04:00
gorhill fb7bd0cc1d fix #1893 2016-08-13 21:45:01 -04:00
gorhill 399441c837 new revision for dev build 2016-08-13 18:03:15 -04:00
gorhill e9157bafb7 fix #1892, #1891 2016-08-13 16:42:58 -04:00
gorhill 315dadb466 bump compatible thunderbird version 2016-08-12 11:30:50 -04:00
gorhill 6fd0bb4291 more refactoring of content script: better modularization of various components 2016-08-12 08:55:35 -04:00
gorhill a02173f815 new revision for dev build 2016-08-08 19:47:23 -04:00
gorhill fb62572976 new revision for dev build 2016-08-08 10:03:36 -04:00
asamuzaK (Kazz) 9700c32bc9 Optimize SVG icons (#1860) 
* Omit XML declaration:
* XML version is 1.0
* encoding is UTF-8
* standalone is no
so it can be omitted.
* Remove unnecessary attributes:
* `xmlns:rdf`, `xmlns:cc`, `xmlns:dc`, `xmlns:xlink` are not used in
these SVG icons.
* No text inside SVG, so `xml:space` is unnecessary.
* `version` attribute will be removed in SVG 2. [Changes from SVG 1.1 —
SVG 2](https://svgwg.org/svg2-draft/changes.html#structure)
* `x` and `y` can be omitted if they are `0`.
* Remove `enable-background` attribute / style property:
* Firefox / Safari does not support `enable-background`.
* It is proposed to be deprecated in SVG 2. [Filter Effects Module Level
1](https://drafts.fxtf.org/filters/#AccessBackgroundImage)
* Remove empty `g` elements.
* Add `width` and `height` attributes in `safari-icon16-off.svg`:
* They are in safari-icon16.svg, simple missing?
 2016-08-07 08:26:04 -04:00
gorhill e72c93ebd6 new revision for dev build 2016-08-06 23:29:24 -04:00
gorhill 8a909608f2 new dev build 2016-08-06 15:46:57 -04:00
gorhill ffc3bd10f6 fix regression on Pale Moon from 5704a90cf0 2016-08-06 15:27:33 -04:00
gorhill 4b005f4635 new revision for dev build 2016-08-06 12:17:27 -04:00
gorhill 16acbca1fa minor code review re. https://bugzilla.mozilla.org/show_bug.cgi?id=1232354 2016-08-06 10:20:11 -04:00
gorhill 5704a90cf0 improve performance issue reported at https://bugzilla.mozilla.org/show_bug.cgi?id=1232354 2016-08-05 22:43:10 -04:00
gorhill b1ba1e9611 update revision for dev build 2016-08-05 14:06:11 -04:00
gorhill c274195b69 bring support for dev build in Chrome store 2016-08-04 08:24:11 -04:00
gorhill 4593535a86 new revision for dev build 2016-08-02 16:37:31 -04:00
gorhill 3557e75592 release version 2016-08-01 17:41:58 -04:00
YFdyh000 cdabab7da5 restore network.dns.disablePrefetch when uncheck option (#1822) 2016-07-18 06:06:42 -04:00
gorhill dcb6e87c1f fix https://forums.lanik.us/viewtopic.php?f=64&t=31522 2016-07-14 09:35:38 -04:00
gorhill d7ff5a523e fix https://github.com/gorhill/uMatrix/issues/586 2016-07-13 09:21:36 -04:00
gorhill 58beeaacc1 bump minimum browser version 2016-07-11 20:33:07 -04:00
gorhill 068860ef74 remove reference to obsolete filter lists page 2016-07-09 21:37:16 -04:00
gorhill 02e6b088ef further refactoring + performance: skip surveying DOM after too many empty resultset 2016-07-09 19:21:46 -04:00
gorhill bec8243a46 revert committing changes meant to be local only 2016-07-01 18:20:55 -04:00
gorhill 973d3e79c1 minor code review 2016-07-01 14:33:43 -04:00
gorhill a3f6a4186a instrumenting content scripts to make for easy profiling when needed 2016-06-30 16:10:38 -04:00
gorhill 8aebf060b8 code review: return asap when in shouldLoadPopupListener 2016-06-30 15:47:51 -04:00
gorhill 09d35b65e0 minor code review re. #1768 2016-06-29 13:56:10 -04:00
gorhill ca785bf8b1 fix #1768: second part -- this removes a corrupted SQL file 
So that a new one can be created.
 2016-06-29 13:49:38 -04:00
gorhill 2973726da8 fix uBO misbehaving when corrupted SQL file is corrupted (1st step of the complete fix) 2016-06-29 12:07:25 -04:00
gorhill 6c513629bf refactor content script code + add support for new `:has` & `:xpath` filters 
Aside extending cosmetic filtering abilities, I expect this will
also take care of some long standing issues (I will have to find them
and mark them as "resolved" by this commit, as time allow).
 2016-06-27 19:09:04 -04:00
gorhill ee16ae728a fix https://github.com/gorhill/uMatrix/issues/540 2016-06-24 15:09:56 -04:00
gorhill e8e06dc10d new revision for dev build 2016-06-24 12:20:34 -04:00
gorhill 9208f8d56e new release version number 2016-06-22 10:19:25 -04:00
gorhill eb5421d686 minor code review (HTTP observer) 2016-06-21 08:04:31 -04:00
dhowe 77da1aabb3 Check responseHeaders length before calling pop() (#1739) 
This throws an error on Firefox when responseHeaders is 0-length
 2016-06-20 09:28:40 -04:00
gorhill 8c632db436 quite likely fix https://trac.torproject.org/projects/tor/ticket/19438 2016-06-19 18:53:03 -04:00
gorhill 848e716b08 bump compatible version for SeaMonkey 2016-06-19 12:31:18 -04:00
gorhill fa1dafafbe fix #1716 2016-06-16 10:56:49 -04:00
gorhill 758c8afdc7 fix #1702 2016-06-12 10:51:42 -04:00
gorhill f902c53be7 remove stray prototype code from last commit (84b81f751c) 2016-06-10 13:28:04 -04:00
gorhill 84b81f751c code review re. https://github.com/gorhill/uMatrix/issues/554: use channel data when available 2016-06-10 13:21:58 -04:00
gorhill 76c44e9672 code review re. https://github.com/gorhill/uMatrix/issues/554 
No longer need to evaluate within asyncOnChannelRedirect() since
all is now evaluated at `http-on-modify-request` time.
 2016-06-06 09:51:39 -04:00
gorhill e177e04f90 fix https://github.com/gorhill/uMatrix/issues/554 2016-06-03 09:32:05 -04:00
gorhill a8cf54c3a0 new revision for dev build 2016-05-02 17:38:04 -04:00
gorhill ab700b9bc1 remove now unused code, bump revision for Opera store 2016-05-02 17:20:15 -04:00
gorhill d676864211 #1604: remove now unreachable code 2016-05-02 14:30:24 -04:00
gorhill 0d6c088643 new revision 2016-05-02 08:28:24 -04:00
gorhill dfc7fa8438 emergency fix: remove websocket support for now 2016-05-02 08:27:19 -04:00
gorhill 374d5476f5 release version = even number 2016-04-30 12:03:34 -04:00
gorhill 0e7e653362 revise indentation, comments 2016-04-28 10:09:08 -04:00
gorhill ffc313136b #956: code review, again 2016-04-26 09:22:05 -04:00
gorhill 8c0246017d this fixes #1579 2016-04-22 11:45:20 -04:00
gorhill d34d47032d this fixes #1573 2016-04-21 14:34:20 -04:00
gorhill 6d79aa43ba #956/#1497: minor code review 2016-04-21 12:48:07 -04:00
gorhill e1f150f494 #956/#1497: code review 2016-04-21 12:26:08 -04:00
gorhill a6028083f3 #956: code review 2016-04-21 00:03:29 -04:00
gorhill 4dbdd39100 #1497: code review 2016-04-20 17:24:07 -04:00
gorhill 2d26d1dd3d this fixes #1497 2016-04-20 13:57:31 -04:00
gorhill fe767e672a new revision for dev build 2016-04-05 10:03:35 -04:00
gorhill 0df8acca8c new revision for release version 2016-04-05 07:56:08 -04:00
gorhill baed91e111 #1514: code review 2016-04-01 20:53:38 -04:00
gorhill cf47bdc4c8 this tentatively fixes #1514 2016-03-29 11:37:19 -04:00
gorhill db09f83e2f new revision for dev build 2016-03-26 19:10:57 -04:00
gorhill ced0641e7f release versions are even numbered 2016-03-25 14:19:38 -04:00
gorhill 95d0ffafb7 this fixes #870 2016-03-22 10:19:41 -04:00
gorhill 9c8fecc507 #1443: forgot to revisit this instance of vAPI.messaging 2016-03-16 09:47:10 -04:00
gorhill 2ac643b520 #1443: code review 2016-03-15 11:17:56 -04:00
gorhill 0547c0dd18 code review re. #1443 2016-03-09 17:13:22 -05:00
gorhill bb66d44bac minor code review 2016-03-09 11:24:21 -05:00
gorhill 9772e95046 this fixes #1459 2016-03-09 09:54:16 -05:00
gorhill eb8c17d55c this takes care of #1443 2016-03-08 16:35:06 -05:00
gorhill e5c2eff2d0 code review to fix "javascript.options.strict" warnings in browser console of Firefox 2016-03-07 09:55:04 -05:00
gorhill 7884cf70f6 code review: this is needed to keep closure alive 2016-03-06 21:27:28 -05:00
gorhill 040a3ea5ef code review: spin off init-only code from frameScript into its own init-time frame script 2016-03-06 19:49:27 -05:00
gorhill f77762e39f new revision 2016-03-06 18:49:54 -05:00
gorhill ee23f96bb3 this fixes #1444 2016-03-05 14:04:36 -05:00
gorhill 912f330afb updated max FF versions 2016-03-03 10:37:35 -05:00
gorhill ad24e1ed08 new revision for dev build 2016-02-26 10:07:34 -05:00
gorhill ea2b706a9a updated translation stuff for Opera store 2016-02-22 09:01:37 -05:00
gorhill 38e7636018 new revision for dev build 2016-02-17 09:30:40 -05:00
gorhill ced9f68918 new revision 2016-02-14 10:56:42 -05:00
gorhill 0bebc81369 code review + fixes another potential error in browser console (re. popup blocking) 2016-02-10 11:25:52 -05:00
gorhill f8de57dd1a this takes care of errors in browser console while testing popup blocking 2016-02-10 11:15:57 -05:00
gorhill e4f35e9f3d Revert "this fixes dm" -- I meant to commit only changes to assets 
This reverts commit 5b5c661e0d.
 2016-02-03 18:47:30 -05:00
gorhill 5b5c661e0d this fixes dm 2016-02-03 18:37:56 -05:00
gorhill f81b07fb4d code review 2016-01-29 11:43:12 -05:00
gorhill a89d3ebe18 this fixes #1312 2016-01-29 10:50:03 -05:00
gorhill 5f3b5365d1 #1305: forgot to add link to issue in code 2016-01-27 11:03:30 -05:00
gorhill f39d87f6e0 this fixes #1305 2016-01-27 11:02:08 -05:00
gorhill 5a9f3fa6fe new path for location of Console.jsm 2016-01-26 17:57:53 -05:00
gorhill 1f345b585f this should fix #1276 2016-01-22 11:13:29 -05:00
gorhill bb27f33b35 this fixes #1257: toolbar button missing for new uBO install w/ Seamonkey 2.39 2016-01-19 13:30:28 -05:00
gorhill d584be832b this addresses https://bugzilla.mozilla.org/show_bug.cgi?id=1203159 2016-01-19 09:28:39 -05:00
gorhill b5415f4f94 new revision for dev build 2016-01-17 13:45:48 -05:00
gorhill 89148351e8 #1163: this implements "block elements by size" 2016-01-17 13:30:43 -05:00
gorhill 032c83a829 new revision for dev build 2016-01-11 09:12:06 -05:00
gorhill 19518aed60 this fixes #1204 2016-01-11 01:38:29 -05:00
gorhill 06b44c7ceb this fixes #1206 2016-01-11 01:12:56 -05:00
gorhill 5591ff34f1 this fixes #1201 2016-01-11 00:37:57 -05:00
gorhill b8b5a5fea2 some have reported dashboard does not open: this may help 2016-01-06 17:20:38 -05:00
gorhill 0b0b88684a this fixes #838 2016-01-05 10:08:28 -05:00
gorhill 4e7736bc10 this fixes #1124 2016-01-02 19:33:32 -05:00
gorhill b5c8567368 minor code review 2015-12-31 09:45:30 -05:00
gorhill e8eaddd8c7 minor code review 2015-12-31 09:25:12 -05:00
gorhill 6b73b8c38c this fixes https://github.com/gorhill/uBlock/issues/533#issuecomment-167931681 2015-12-31 09:24:55 -05:00
gorhill 73eb8cb2ca bump revision number for dev build 2015-12-29 23:30:37 -05:00
gorhill ce8ea0b31b reverting fix to #533 because bad side effects 2015-12-29 22:43:24 -05:00
gorhill 53d49fd79a new revision 2015-12-27 15:42:32 -05:00
gorhill ee2a657f84 AMO review feedback: remove unecessary files from package 2015-12-26 15:53:56 -05:00
gorhill 3956605ee0 general code review re. most recent commits 2015-12-23 11:02:36 -05:00
gorhill e34d500bf9 fixed bad copy/paste, as reported in feedback section of Chrome store 2015-12-17 08:56:35 -05:00
gorhill 0f6e5be1d2 removed spurious comma 2015-12-15 21:43:21 -05:00
gorhill c27dea49da keep file naming consistent 2015-12-15 14:36:27 -05:00
gorhill 074c6a948c empty file because FF has all that stuff since at least v24 2015-12-15 14:25:54 -05:00
gorhill 00e6d40965 actually only chromium-based browsers need this, and 
AMO does not like mingling with prototypes of native
types.
 2015-12-15 14:15:02 -05:00
gorhill ea49484dd3 this fixes #1067 + partially fixes #1070 2015-12-15 10:40:40 -05:00
gorhill cfbefd096d bumping max versions for Firefox, Firefox for Android 2015-12-14 19:36:39 -05:00
gorhill 09d7d1fdc4 this fixes #533 (need confirmation) 2015-12-13 15:38:31 -05:00
gorhill 64ef90a338 new revision for dev build 2015-12-13 10:46:19 -05:00
gorhill 08085f7383 code review 2015-12-11 19:18:14 -05:00
gorhill 1e0014116b this fixes #1004 2015-12-09 13:29:22 -05:00
gorhill 9ce6f9eb23 code review: adding the option buttons at launch time is not critical, this can be deferred 2015-12-09 13:23:16 -05:00
gorhill 561a2dbb04 new version 2015-12-07 11:21:20 -05:00
gorhill 2af72459fe minor code review: move vars closer to their 1st use + reference links 2015-12-06 16:43:58 -05:00
gorhill 7ada31a545 this addresses `Cu.import` throwing as reported in #1004 2015-12-04 12:05:02 -05:00
gorhill 665ac59c73 #1004: this addresses `win` potentially being `null` at shutdown time (Pale Moon) 2015-12-04 11:35:31 -05:00
gorhill 756887a6cf code review re. lagacy toolbar button 2015-12-03 12:07:46 -05:00
gorhill a2f79952a2 code review 2015-12-03 01:16:28 -05:00
gorhill 2750b13e34 code review 2015-12-03 01:08:37 -05:00
gorhill f2f653945e can throw when trying to access `associatedWindow` 2015-12-02 01:13:56 -05:00
gorhill 2705432f43 code review 2015-12-02 00:59:51 -05:00
gorhill 11351bca6d this fixes regression re. popup/popunder blocking for Seamonkey 2015-12-01 17:15:31 -05:00
gorhill 4fd71d4209 this adds popunder filtering support for Firefox-based browsers 2015-12-01 15:07:22 -05:00
gorhill be7db835a8 this fixes sticky popup when legacy toolbar button + multiple windows 2015-11-28 10:28:48 -05:00
gorhill 5645cbc3fb #985: might be the missing trailing `#` 2015-11-27 14:30:17 -05:00
gorhill c4034d804a this fixes #966 2015-11-24 12:11:03 -05:00
gorhill 139cbc5069 this fixes #959 2015-11-23 07:48:15 -05:00
gorhill 22b30c6868 new revision for dev build 2015-11-21 10:54:42 -05:00
gorhill 7fcb0176fc #955: merging 1.3.6 changes 2015-11-21 10:53:43 -05:00
gorhill cb1a176e21 this hopefully fixes #955 2015-11-21 08:06:14 -05:00
gorhill 77504cb561 this fixes #951 2015-11-20 08:47:29 -05:00
gorhill 0540925b44 new revision for dev build 2015-11-20 00:43:54 -05:00
gorhill 8110b9ae6f #948: undo first attempt at fix 2015-11-20 00:43:02 -05:00
gorhill 5a63dc3184 Merge branch 'temp' 2015-11-20 00:16:16 -05:00
gorhill c4e3e1e8e5 reportedly this fixes #948 2015-11-19 20:19:15 -05:00
gorhill 0f7dc32a5e this fixes #948 2015-11-19 18:51:55 -05:00
gorhill 4e9d41a150 #948: this possibly addresses the 1st reported error case 2015-11-19 18:07:27 -05:00
gorhill 75f8802487 bump version for dev build 2015-11-19 09:37:26 -05:00
gorhill b9475507c8 this fixes #940 2015-11-16 15:12:26 -05:00
gorhill 4cebefd5b5 code review 2015-11-15 08:56:36 -05:00
gorhill 7b81b82e4b reversing fix to #868: does not work with latest FF/Nightly 2015-11-13 11:53:39 -05:00
gorhill 3d472beb1b code review: make onHeadersReceive() able to cancel responses 2015-11-09 17:59:19 -05:00
gorhill 2e2e76ebff compatible with Seemonkey 2.39 2015-11-09 08:37:32 -05:00
gorhill e487f0f500 code review 2015-11-08 09:55:29 -05:00
gorhill 2518a3d17c #906: comment to document fix 2015-11-08 01:02:39 -05:00
gorhill 1c6d969ccb this fixes #906 2015-11-08 00:31:49 -05:00
gorhill 35474f0146 minor changes 2015-11-06 14:18:40 -05:00
gorhill 18a95a922c this fixes #894 2015-11-06 10:17:32 -05:00
gorhill 0949cc6ac7 oops, forgot to remove console.log 2015-11-06 00:36:11 -05:00
gorhill 770875608d let's see if this fixes #906 2015-11-06 00:32:45 -05:00
gorhill c5c8edc4d1 #868: code review 2015-11-05 09:20:40 -05:00
gorhill fee26a70bc someone in Chrome store reported a JSON Schema error when trying to install uBO 2015-11-04 16:00:27 -05:00
gorhill 45335855af #749: code review 2015-11-03 18:00:08 -05:00
gorhill 6bec4d795c hopefully this fixes #749 2015-11-03 16:40:22 -05:00
gorhill 8612c54b6c new revision for build dev 2015-11-03 16:36:01 -05:00
gorhill b3669218e6 #900: code review 2015-11-03 08:46:21 -05:00
gorhill 0c5a9bfba6 this fixes #900 2015-11-03 07:44:18 -05:00
gorhill a44aa105da works fine on latest Nightly 2015-10-28 16:02:49 -04:00
gorhill 523f9f479d Merge branch 'next' 2015-10-28 09:36:23 -04:00
gorhill 99c4dfffc2 this fixes #876 2015-10-28 09:35:13 -04:00
gorhill 7483e7b306 new revision for dev build 2015-10-28 08:05:00 -04:00
gorhill 92f7e2da8a this fixes #875 2015-10-28 05:26:57 -04:00
gorhill e44d42c96e #868: minor code review 2015-10-27 10:37:02 -04:00
gorhill 13afd622ee this fixes #868 2015-10-27 10:11:52 -04:00
gorhill da6c7b8b5e code review: fixed sorting of 1st-party hostnames 2015-10-25 08:18:10 -04:00
gorhill d7f4b871e5 typo in comment 2015-10-24 09:37:43 -04:00
gorhill 26b70a1e64 This addresses Opera seemingly not supporting managed storage. 
As reported in 43a5ed735b (all_commit_comments)
 2015-10-24 09:20:39 -04:00
gorhill d83d194a7b compatible with FF for Android 41 2015-10-23 14:57:42 -04:00
gorhill 013a593e81 comment 2015-10-23 13:11:27 -04:00
gorhill 429d3f5017 code review: not all windows have tabs 2015-10-23 12:58:54 -04:00
gorhill b04f6e0d2a reportedly works fine on thunderbird 31.0 2015-10-22 18:28:55 -04:00
gorhill 0eb0708a5b code review: only clients of win watcher care about window type 2015-10-22 18:27:24 -04:00
gorhill 523ce7bfe0 code review 2015-10-22 07:22:18 -04:00
gorhill 567b1007f8 reworked window management for https://github.com/gorhill/uMatrix/issues/357 2015-10-22 07:16:21 -04:00
gorhill 0ae483704f put back windowWatcher: https://github.com/gorhill/uMatrix/issues/357 2015-10-21 14:36:50 -04:00
gorhill 43a5ed735b admin storage is accessed only by main context 2015-10-21 13:30:04 -04:00
gorhill 892913d185 this fixes #832 2015-10-21 11:53:03 -04:00
gorhill 1d85c16f82 hopefully this finally fix https://github.com/gorhill/uMatrix/issues/357 2015-10-21 09:02:31 -04:00
gorhill 5a9b96d7b5 code review 2015-10-20 06:46:26 -04:00
gorhill 1598273d6a minor code review 2015-10-19 19:05:18 -04:00
gorhill 3f0457a5c4 confirmed working with all Firefox flavors 2015-10-19 16:07:09 -04:00
gorhill 9b9f1eb6df new revision 2015-10-19 13:52:14 -04:00
gorhill b859d22c83 this fixes #845 2015-10-19 13:13:22 -04:00
gorhill e7daeb3edc more sensible var naming 2015-10-19 09:22:23 -04:00
gorhill 7e89b7a161 attach to window even if a tab browser is not present 2015-10-18 17:18:04 -04:00
gorhill e152db7004 limit search of adjacent button to current toolbar 2015-10-18 13:41:33 -04:00
gorhill 475f80239a toolbar icon: no need to keep looking for a spot once one found 2015-10-18 08:41:27 -04:00
gorhill 88dac6d4a1 minor code review 2015-10-17 18:30:59 -04:00
gorhill a19f5701ef more safeguard code to maximize success at attaching to a window 2015-10-17 18:08:46 -04:00
gorhill 308dd4bb30 more deferring code re. toolbar icon on legacy Firefox (#833) 2015-10-17 16:07:53 -04:00
gorhill cfdbacd0ad reworked legacy toolbar button in attempt at fixing #833 2015-10-17 11:50:34 -04:00
gorhill 230639d959 bumping max version for SeaMonkey to 2.38 2015-10-16 16:21:46 -04:00
gorhill 9559b6462c added @M-Reimer 2015-10-16 12:38:31 -04:00
gorhill 7d9525d6e9 let's see if this helps #833 2015-10-16 10:13:33 -04:00
gorhill c349511a7b bumping version number because of (basic) support for Thunderbird 2015-10-15 11:39:14 -04:00
gorhill 6424aee788 this fixes #820 2015-10-13 09:34:11 -04:00
gorhill ceb9800eb1 code review 2015-10-12 17:06:25 -04:00
Manuel Reimer 0eb42fdf4b Thunderbird: Fix closing extension tabs 2015-10-10 23:33:08 +02:00
gorhill 300968ac34 this fixes more Thunderbird errors in console 2015-10-09 10:37:02 -04:00
gorhill b885352724 this fixes bad code review 2015-10-09 10:24:48 -04:00
gorhill dc2dc3753d this should fix AMO validator error 2015-10-09 07:40:49 -04:00
gorhill d4d7ae4225 interim version for dev build 2015-10-09 07:34:30 -04:00
gorhill 91ecabf82a code review 2015-10-08 17:44:21 -04:00
Manuel Reimer 7501447cac Added basic Thunderbird support 2015-10-08 19:15:00 +02:00
gorhill 097489b4e0 new revision 2015-10-08 11:15:58 -04:00
gorhill 3a4abc83d5 preparing for next release 2015-10-05 09:05:00 -04:00
gorhill c96d0a7eff info accuracy in comment 2015-10-03 09:46:45 -04:00
gorhill 2ed90e1993 convert hard tabs to soft tabs 2015-10-03 09:44:23 -04:00
Jan Seeger e27151d4d7 Added double braces to application ID. 2015-10-03 15:35:56 +02:00
Jan Seeger e40e2345f9 Tab fixes, broken XML fixes. 
Replaced tabs with spaces, added missing namespace for Description element.
 2015-10-03 15:18:22 +02:00
Jan Seeger 95037276c8 Added Conkeror to the list of supported platforms. 
uBlock Origins runs well in Conkeror, an emacs-inspired browser. This
patch makes it possible to install the plugin directly, without having
to modify the install.rdf file.
 2015-10-03 14:24:00 +02:00
gorhill c141a29295 comment grammar 2015-09-30 09:35:24 -04:00
gorhill 8d294869fe this fixes #756 2015-09-30 09:33:38 -04:00
gorhill 6c65672db0 this fixes #640 2015-09-25 12:26:56 -04:00
gorhill f681bac407 reverting #739: this broke normal install 2015-09-25 11:54:07 -04:00
gorhill fc65c79d84 interim version for dev build 2015-09-25 08:33:50 -04:00
gorhill 8388ab4408 Merge branch 'master' of github.com:gorhill/uBlock 2015-09-25 08:32:06 -04:00
gorhill 69d4a0aa0a attempt at fixing #362 2015-09-25 08:29:52 -04:00
Neil Richardson 93fb1dd251 Do not call onReady if addon is installing 
If the uBlock extension is installed globally for all users on a machine, a user's first run of Firefox will fail to load uBlock because the call to appShell.hiddenDOMWindow will throw an exception. A second run of Firefox will load uBlock successfully.

The change will skip the call to onReady if the reason for the call to startup is because the addon is being installed.
 2015-09-25 14:52:54 +08:00
gorhill c3c4d75e8e #697: mind Firefox for Android 2015-09-14 14:46:12 -04:00
gorhill 549796003c #697: forgot to comment out related removeEventListener 2015-09-14 11:30:56 -04:00
gorhill bc287f98aa this fixes #697 2015-09-14 11:28:33 -04:00
gorhill 247e5ec464 given uBlock is beyond 1.0, moving to a 3-figure version scheme 2015-09-13 15:17:01 -04:00
gorhill 6763cca756 fixed comment 2015-09-10 09:54:38 -04:00
gorhill 6f2e468433 interim version for dev build 2015-09-04 17:29:21 -04:00
gorhill 7fe8c64f6f vAPI.net.registerListeners(): code review 2015-09-03 10:45:36 -04:00
gorhill 3aadf58a1f interim version for dev build 2015-08-31 18:47:09 -04:00
gorhill 583daddbf8 this fixes #654 2015-08-29 18:35:08 -04:00
gorhill 1c2ea2e921 works fine on FF43 and PM26 2015-08-20 07:34:53 -04:00
gorhill 9b4b998364 #608: this fixes a bunch of strictness-related warnings 2015-08-18 11:44:24 -04:00
gorhill 5366697a0c this fixes https://github.com/gorhill/uBlock/issues/80#issuecomment-132081658 
get/setComplexValue must be used to ensure proper handling of Unicode string
in `about:config`.
 2015-08-18 08:58:06 -04:00
gorhill 7373fb77f5 code review 2015-08-16 08:58:41 -04:00
gorhill 69ec33dc3a fixed typo in comment + return size of cloud storage 
- fixed typo as per 7a38cd756d (commitcomment-12702437)
- store size of cloud storage item, I might decide to use this in the UI
 2015-08-16 08:17:01 -04:00
gorhill 56451cf069 code review for last commit 2015-08-15 16:19:38 -04:00
gorhill 2d131e8fab this foils "speculative pre-connections" 2015-08-15 16:00:51 -04:00
gorhill 5de5074f1c this fixes https://github.com/gorhill/uMatrix/issues/325 2015-08-15 14:17:50 -04:00
gorhill 180856bd0d do not strip out window components in logger-as-popup-window 2015-08-14 10:13:08 -04:00
gorhill 7a38cd756d harden chrome.privacy calls: one threw for unknown reasons (can't repro so far) 2015-08-13 19:42:30 -04:00
gorhill 29b695d813 changes for a beta channel on AMO 2015-08-12 16:31:19 -04:00
gorhill db03802d00 interim version number for build dev 2015-08-11 19:13:41 -04:00
gorhill abc7a526da code review 2015-08-11 18:48:52 -04:00
gorhill 690421aead sync feature (#80): draft 2015-08-11 15:29:14 -04:00
gorhill 8e4f998a32 this fixes #574 2015-08-06 14:43:35 -04:00
gorhill 980125b8af minor code review 2015-08-03 09:25:18 -04:00
gorhill 528354f594 this fixes #507 2015-08-01 11:30:54 -04:00
gorhill 04d11d25b6 minor code review 2015-07-28 08:54:12 -04:00
gorhill c1e54d33b2 explicit support for Pale Moon 2015-07-24 19:26:39 -04:00
gorhill 3311b0fb1d default about better than custom about 2015-07-21 07:48:48 -04:00
gorhill 6fd149eb0a interim version for dev build 2015-07-20 16:32:49 -04:00
gorhill 309c0e3540 new version 2015-07-12 19:33:29 -04:00
gorhill 2ec0161471 commenting out debugging code 2015-07-12 19:33:12 -04:00
gorhill d7fa72b4ec works with Nightly 2015-07-12 08:38:22 -04:00
gorhill 1ac3d61427 add entries to manifest 2015-07-11 12:58:50 -04:00
gorhill bd43babf75 this fixes #470 2015-07-09 12:52:56 -04:00
gorhill 969e533ba8 this fixes #455 (regression) 2015-07-08 09:56:06 -04:00
gorhill a9089b3120 this fixes #452 2015-07-07 12:11:11 -04:00
gorhill 32d2ae0e11 this probably fixes #453 2015-07-07 11:03:26 -04:00
gorhill 7a00310934 this may fix #450 2015-07-07 09:10:53 -04:00
gorhill a27b46b817 this fixes stalling dom inspector 2015-07-06 09:07:51 -04:00
gorhill 46cbe42227 code review 2015-07-05 09:26:33 -04:00
gorhill fa6fa00656 interim version for dev build 2015-07-04 08:58:33 -04:00
gorhill 35ef80f3aa code review re. sandbox shutdown 2015-07-03 13:32:00 -04:00
gorhill 352ef808f1 code review: this taks care of ea4faff383 (commitcomment-11964137) 2015-07-03 07:00:29 -04:00
gorhill 75645e2f83 this fixes #429 2015-07-02 08:20:56 -04:00
gorhill ea4faff383 this fixes FF logger not being resizable 2015-07-01 18:08:51 -04:00
gorhill ad827576ce have the logger open in a separate window 2015-07-01 12:18:03 -04:00
gorhill bd9a63a73c Merge branch 'master' of github.com:gorhill/uBlock into inspector 2015-06-30 18:08:49 -04:00
gorhill ecd003ff4a this addresses #414 2015-06-30 01:59:22 -04:00
gorhill aeba71790f some refactoring: move to-aux-process-messaging timeout into vAPI 2015-06-29 10:46:20 -04:00
gorhill 39b0d719c0 some more work re inspector 2015-06-28 17:42:08 -04:00
gorhill 7d2855180c some refactoring of new DOM inspector code 2015-06-26 15:45:54 -04:00
gorhill 631443768f dom inspector: ébauche 2015-06-26 00:08:41 -04:00
gorhill 0afbb98f42 this fixes #399 2015-06-25 09:05:24 -04:00
gorhill 1ba7894a29 ability to prevent local ip address leak thru webrtc 2015-06-24 20:01:27 -04:00
gorhill c596e6c0e1 this fixes #394 2015-06-23 14:50:45 -04:00
gorhill 749f9992e8 interim version for dev build 2015-06-22 18:52:34 -04:00
gorhill fb25df9f05 this fixes https://github.com/chrisaljoudi/uBlock/issues/1449 2015-06-18 17:09:24 -04:00
gorhill 647b53beaf this fixes #264 2015-06-18 12:02:57 -04:00
gorhill 04dad27165 this fixes warnings about "Services" being undefined after re-enabling uBlock 2015-06-17 17:56:04 -04:00
gorhill 91f5584e9f minor code review 2015-06-17 14:11:30 -04:00
gorhill c8a48910d3 just renaming using natural resolution 2015-06-17 14:06:59 -04:00