ffba687a20
Bug 1025965 - Rename browser.safebrowsing.enabled to browser.safebrowsing.phishing.enabled. r=francios
...
MozReview-Commit-ID: 3TMs6MPtWsC
2016-05-09 14:44:08 +08:00
8166e86959
Bug 1229927 - Allow `showHeartbeat` to change the icon. r=MattN
...
MozReview-Commit-ID: 9by6Z0rN5IT
--HG--
extra : transplant_source : %85L%A4%93%15%08py6%BF%CF%5E%28CS%93%BE%A5%9E%D8
2016-06-07 15:57:24 +08:00
8733310923
Bug 1221730 - Change GamepadServiceTest into webidl. r=qdot, r=baku
...
--HG--
extra : rebase_source : 8e04725e80467a17d1a1a775f791782abe842c1b
2016-06-28 00:26:00 +02:00
8414c26e20
Merge m-c to inbound, a=merge
2016-06-27 14:09:06 -07:00
aec3ca7a7a
merge mozilla-inbound to mozilla-central a=merge
2016-06-18 04:35:15 +01:00
f10e7491d4
Backed out changeset 7410a15b0850 (bug 1251071) for permafailing browser_bookmark_popup.js on OS X. r=backout
2016-06-17 17:54:54 +02:00
9ed4429e08
Bug 1231701 - Ship our own variant of EmojiOne on Windows and Linux, r=glandium, r=dolske, r=jfkthame, r=gerv
...
This patch bundles a color font named "EmojiOne Mozilla", and turn on
the necessary code for including the bundled font, on Linux and Windows.
With that, users of Linux and Windows <=8.0 is able to see color Emoji
on Firefox without support from System.
The font bundled is the v0.2.1 version, generated from the project repo
in
https://github.com/mozilla/emojione-colr
with artwork from the original EmojiOne font and Twemoji,
under CC BY 4.0 license.
Test files, about:license page, and the packager instruction are
modified accordingly.
MozReview-Commit-ID: 2mmxnA0vS3u
2016-06-15 21:58:49 +01:00
367f33f78d
Bug 1279224 - remove all Sync promotions from doorhangers. r=adw
...
MozReview-Commit-ID: 8QELFxqM6Av
--HG--
extra : rebase_source : e76d93d5096e9f820238645a9ac2db658f815718
2016-06-15 13:43:25 +01:00
217642efe0
Bug 1251071 - "New bookmark" popup disappears if I reopen it after creating bookmark. r=mak
...
MozReview-Commit-ID: DNqcu5vxrBG
--HG--
extra : rebase_source : 4a8c49ca01ca6987b43b3c1bffcbdd406ca98f70
2016-06-12 15:53:38 -04:00
acbe92a947
Bug 1280391 - Merge UI migration steps that try to add bookmarks-menu-button. r=mak
2016-06-17 10:43:26 +01:00
7c23d539a6
Bug 1280251 - Remove leftover references to unifiedComplete pref. r=past
...
MozReview-Commit-ID: 9GQ6u7V6tKs
--HG--
extra : rebase_source : 579d95b007a9712a0247406d7ec0b4f6dec699ef
2016-06-16 15:06:07 +01:00
ecdef8e6f4
merge mozilla-inbound to mozilla-central a=merge
2016-06-17 00:32:10 +01:00
ecad056c91
Backed out changeset 6ba1398db335 (bug 1231701) for causing valgrind failures
2016-06-16 18:31:16 +01:00
75745129ca
Bug 1120377 - Update preferences so TLS error reports are POSTed to the new data pipeline. r=keeler
...
MozReview-Commit-ID: K1xZp4RQjEo
2016-06-14 15:56:41 +01:00
3b1e93ac5e
Merge mozilla-central to mozilla-inbound
...
--HG--
extra : rebase_source : 4b15946d1de3c0e3d7fed8fc0f68b5f653d8836a
2016-06-16 08:39:13 +01:00
815f65343a
Bug 1280338 - Use clang 3.8 on TSan builds. r=froydnj
2016-06-16 16:16:53 +09:00
2fe5367788
Bug 1280338 - Use tooltool GCC's ld on TSan builds. r=froydnj
...
Something similar was done in bug 1278718 for ASan builds, because of
indirect dependencies on libstdc++ being picked by the linker and
leading to linkage failure with the older binutils from the CentOS 6
image we use to do desktop builds.
2016-06-16 16:16:51 +09:00
a967cdb984
merge mozilla-inbound to mozilla-central a=merge
2016-06-16 08:06:50 +01:00
f1de083a08
Bug 1279953 - Ambiguous string usage for "not encrypted page". r=dolske
...
--HG--
extra : rebase_source : e6ea020d8b98e9bef2e895e5312edc47d839cc2c
2016-06-13 22:14:04 +02:00
4901223999
Bug 1231701 - Ship our own variant of EmojiOne on Windows and Linux, r=glandium, r=dolske, r=jfkthame, r=gerv
...
This patch bundles a color font named "EmojiOne Mozilla", and turn on
the necessary code for including the bundled font, on Linux and Windows.
With that, users of Linux and Windows <=8.0 is able to see color Emoji
on Firefox without support from System.
The font bundled is the v0.2.1 version, generated from the project repo
in
https://github.com/mozilla/emojione-colr
with artwork from the original EmojiOne font and Twemoji,
under CC BY 4.0 license.
Test files, about:license page, and the packager instruction are
modified accordingly.
MozReview-Commit-ID: 2mmxnA0vS3u
--HG--
extra : rebase_source : 34008d9063fa0ecf95d4f76d645f0d40635290ba
2016-06-15 21:58:49 +01:00
04654fd5c1
Bug 1280177 - fix titlebar button position in devedition, r=mstange
...
MozReview-Commit-ID: 5lTpdW38gOL
--HG--
extra : rebase_source : 0d0fede93d77fb113f2bc6d52f3a37ffe6119162
2016-06-15 12:42:53 +01:00
d357c59414
Bug 1279845 - Remove duplicate download-blocked.svg. r=jaws
...
MozReview-Commit-ID: 3kavXPIT6Hn
2016-06-16 03:04:47 -07:00
97d70544b0
Bug 1279208, followup, rs=bustage/dao
...
MozReview-Commit-ID: BQo5WCM9us3
2016-06-16 10:38:24 +01:00
a60614a313
Bug 1279208, r=mak
...
MozReview-Commit-ID: KOuTjwn9MSx
--HG--
extra : rebase_source : 9ab3fbb75019e6a7ccfca4164d18c9b756c43d7d
extra : amend_source : bdf3328e53f56c37cca745e03254f3483fd188df
2016-06-09 13:25:07 +01:00
4a4a88314c
Merge mozilla-central to mozilla-inbound
2016-06-17 01:03:05 +01:00
cbb5b2eb40
Bug 1280131 - Add tabbrowser hidpi assets in Linux. r=Gijs
...
MozReview-Commit-ID: 45EVizpkB9S
--HG--
extra : rebase_source : 57e80a651aa8705a8e34457478da64fbda318489
2016-06-14 22:43:40 +01:00
2afc94cd98
Bug 1206251 - Add a permission change observer to refresh the identity block. r=paolo
...
MozReview-Commit-ID: J7qwLud2oXo
--HG--
extra : amend_source : 49910ea1561115f170a1b5798805d88d860379f2
extra : transplant_source : %E7%09%18%7C%F6%96%9C%8C%10%DA%5E%A1h%8A%18%2C%9F%C1eQ
2016-06-07 11:36:54 +02:00
8cf838c33b
Bug 1268756 - Disable browser_save_link-perwindowpb.js on Windows debug e10s and re-enable all the other tests in browser/base/content/test/general. r=Enn
...
--HG--
extra : rebase_source : 086a690598cf0a6b69bf4974daaccce331e43946
2016-06-21 12:25:46 -04:00
5688cefb7f
Bug 1163418 - Remove use of CPOWs in safebrowsing tests. r=felipe
2016-06-21 13:46:02 -07:00
65c8df357c
Bug 1163418 - Remove use of CPOWs in browser_bookmark_titles.js. r=felipe
2016-06-21 13:46:02 -07:00
eb98b5c082
Bug 1163418 - Remove use of CPOWs in in browser plugin tests. r=felipe
2016-06-21 13:46:02 -07:00
312e6936e5
Bug 1281192 - Set velocity bias to 0 on Fennec. r=rbarker
...
MozReview-Commit-ID: HupL2wF6rFK
--HG--
extra : rebase_source : e0ac2431699687cc6dfaa6d7f34e861c1ec76fdb
2016-06-21 14:46:34 -04:00
dd3c9e4501
Bug 1279389 P3 Fix OS.File.DirectoryIterator leaks throughout tree. r=yoric
2016-06-28 18:47:55 -07:00
4db29185c2
bug 1282889 - Don't --enable-rust in artifact builds. r=chmanchester
...
MozReview-Commit-ID: FfgV7J2KEkF
--HG--
extra : rebase_source : ee3326dc2f6a2e000062d2fc66083808ad2ed171
2016-06-28 15:13:16 -04:00
c850532165
Bug 1281793 - Remove some non-used telemetry IDs - part 3 - random things, r=chutten
2016-06-28 19:30:15 +02:00
880aca8671
Bug 1281793 - Remove some non-used telemetry IDs - part 1 - expired keys in nsBrowserApp, r=gfritzsche
2016-06-28 19:29:09 +02:00
206dc72425
Backed out changeset e1001d232f8a (bug 1281793) for bustage on a CLOSED TREE
2016-06-28 17:05:04 +02:00
d7c349e036
Backed out changeset 3af9c0fa2ba6 (bug 1281793)
2016-06-28 17:04:50 +02:00
a90ce99e52
Bug 1281793 - Remove some non-used telemetry IDs - part 3 - random things, r=chutten
2016-06-28 16:44:42 +02:00
1a91dfc4d0
Bug 1281793 - Remove some non-used telemetry IDs - part 1 - expired keys in nsBrowserApp, r=gfritzsche
2016-06-28 16:44:42 +02:00
316a00cede
Bug 1280606 - Dotted square cuts through the description of icons. r=Gijs
...
MozReview-Commit-ID: EZB4jT2TFLJ
--HG--
extra : rebase_source : 3cb678363e1f86d2a862da2c6e970f2fa1ec426e
2016-06-24 22:09:17 -04:00
076865739f
Bug 1280485 - Don't sort permission list to improve tab load performance. r=Gijs
...
MozReview-Commit-ID: CIOY5G1v44u
--HG--
extra : transplant_source : %C37%0C%98%E4%ED%E1d%EEH%AC%AB%FA%F5%1A%03/%BE%22%EF
2016-06-17 14:59:01 +01:00
3e877b1ddd
Bug 1135781 - generate builds per checkin on beta/release/esr that allow installation of unsigned addons r=me workaround for bug 1281024 DONTBUILD
2016-06-23 09:19:53 -04:00
c7264cb3ac
Bug 1269162 - part 3 - Move XHR code into dom/xhr, r=smaug
...
--HG--
rename : dom/workers/XMLHttpRequestUploadWorker.cpp => dom/xhr/XMLHttpRequestUploadWorker.cpp
rename : dom/workers/XMLHttpRequestUploadWorker.h => dom/xhr/XMLHttpRequestUploadWorker.h
rename : dom/workers/XMLHttpRequestWorker.cpp => dom/xhr/XMLHttpRequestWorker.cpp
rename : dom/workers/XMLHttpRequestWorker.h => dom/xhr/XMLHttpRequestWorker.h
rename : dom/base/nsIXMLHttpRequest.idl => dom/xhr/nsIXMLHttpRequest.idl
rename : dom/base/nsXMLHttpRequest.cpp => dom/xhr/nsXMLHttpRequest.cpp
rename : dom/base/nsXMLHttpRequest.h => dom/xhr/nsXMLHttpRequest.h
rename : dom/base/test/echo.sjs => dom/xhr/tests/echo.sjs
rename : dom/base/test/file_XHRDocURI.html => dom/xhr/tests/file_XHRDocURI.html
rename : dom/base/test/file_XHRDocURI.html^headers^ => dom/xhr/tests/file_XHRDocURI.html^headers^
rename : dom/base/test/file_XHRDocURI.sjs => dom/xhr/tests/file_XHRDocURI.sjs
rename : dom/base/test/file_XHRDocURI.text => dom/xhr/tests/file_XHRDocURI.text
rename : dom/base/test/file_XHRDocURI.text^headers^ => dom/xhr/tests/file_XHRDocURI.text^headers^
rename : dom/base/test/file_XHRDocURI.xml => dom/xhr/tests/file_XHRDocURI.xml
rename : dom/base/test/file_XHRDocURI.xml^headers^ => dom/xhr/tests/file_XHRDocURI.xml^headers^
rename : dom/base/test/file_XHRResponseURL.js => dom/xhr/tests/file_XHRResponseURL.js
rename : dom/base/test/file_XHRResponseURL.sjs => dom/xhr/tests/file_XHRResponseURL.sjs
rename : dom/base/test/file_XHRResponseURL.text => dom/xhr/tests/file_XHRResponseURL.text
rename : dom/base/test/file_XHRResponseURL.text^headers^ => dom/xhr/tests/file_XHRResponseURL.text^headers^
rename : dom/base/test/file_XHRResponseURL_nocors.text => dom/xhr/tests/file_XHRResponseURL_nocors.text
rename : dom/base/test/file_XHRSendData.sjs => dom/xhr/tests/file_XHRSendData.sjs
rename : dom/base/test/file_XHRSendData_doc.xml => dom/xhr/tests/file_XHRSendData_doc.xml
rename : dom/base/test/file_XHRSendData_doc.xml^headers^ => dom/xhr/tests/file_XHRSendData_doc.xml^headers^
rename : dom/base/test/file_XHR_anon.sjs => dom/xhr/tests/file_XHR_anon.sjs
rename : dom/base/test/file_XHR_binary1.bin => dom/xhr/tests/file_XHR_binary1.bin
rename : dom/base/test/file_XHR_binary1.bin^headers^ => dom/xhr/tests/file_XHR_binary1.bin^headers^
rename : dom/base/test/file_XHR_binary2.bin => dom/xhr/tests/file_XHR_binary2.bin
rename : dom/base/test/file_XHR_fail1.txt => dom/xhr/tests/file_XHR_fail1.txt
rename : dom/base/test/file_XHR_fail1.txt^headers^ => dom/xhr/tests/file_XHR_fail1.txt^headers^
rename : dom/base/test/file_XHR_fail1b.txt => dom/xhr/tests/file_XHR_fail1b.txt
rename : dom/base/test/file_XHR_header.sjs => dom/xhr/tests/file_XHR_header.sjs
rename : dom/base/test/file_XHR_pass1.xml => dom/xhr/tests/file_XHR_pass1.xml
rename : dom/base/test/file_XHR_pass2.txt => dom/xhr/tests/file_XHR_pass2.txt
rename : dom/base/test/file_XHR_pass3.txt => dom/xhr/tests/file_XHR_pass3.txt
rename : dom/base/test/file_XHR_pass3.txt^headers^ => dom/xhr/tests/file_XHR_pass3.txt^headers^
rename : dom/base/test/file_XHR_system_redirect.html => dom/xhr/tests/file_XHR_system_redirect.html
rename : dom/base/test/file_XHR_system_redirect.html^headers^ => dom/xhr/tests/file_XHR_system_redirect.html^headers^
rename : dom/base/test/file_XHR_timeout.sjs => dom/xhr/tests/file_XHR_timeout.sjs
rename : dom/base/test/file_html_in_xhr.html => dom/xhr/tests/file_html_in_xhr.html
rename : dom/base/test/file_html_in_xhr.sjs => dom/xhr/tests/file_html_in_xhr.sjs
rename : dom/base/test/file_html_in_xhr2.html => dom/xhr/tests/file_html_in_xhr2.html
rename : dom/base/test/file_html_in_xhr3.html => dom/xhr/tests/file_html_in_xhr3.html
rename : dom/base/test/progressserver.sjs => dom/xhr/tests/progressserver.sjs
rename : dom/workers/test/relativeLoad_import.js => dom/xhr/tests/relativeLoad_import.js
rename : dom/workers/test/relativeLoad_worker.js => dom/xhr/tests/relativeLoad_worker.js
rename : dom/workers/test/relativeLoad_worker2.js => dom/xhr/tests/relativeLoad_worker2.js
rename : dom/base/test/responseIdentical.sjs => dom/xhr/tests/responseIdentical.sjs
rename : dom/workers/test/subdir/relativeLoad_sub_import.js => dom/xhr/tests/subdir/relativeLoad_sub_import.js
rename : dom/workers/test/subdir/relativeLoad_sub_worker.js => dom/xhr/tests/subdir/relativeLoad_sub_worker.js
rename : dom/workers/test/subdir/relativeLoad_sub_worker2.js => dom/xhr/tests/subdir/relativeLoad_sub_worker2.js
rename : dom/workers/test/terminateSyncXHR_worker.js => dom/xhr/tests/terminateSyncXHR_worker.js
rename : dom/base/test/test_XHR.html => dom/xhr/tests/test_XHR.html
rename : dom/base/test/test_XHRDocURI.html => dom/xhr/tests/test_XHRDocURI.html
rename : dom/base/test/test_XHRResponseURL.html => dom/xhr/tests/test_XHRResponseURL.html
rename : dom/base/test/test_XHRSendData.html => dom/xhr/tests/test_XHRSendData.html
rename : dom/base/test/test_XHR_anon.html => dom/xhr/tests/test_XHR_anon.html
rename : dom/base/test/test_XHR_header.html => dom/xhr/tests/test_XHR_header.html
rename : dom/base/test/test_XHR_onuploadprogress.html => dom/xhr/tests/test_XHR_onuploadprogress.html
rename : dom/base/test/test_XHR_parameters.html => dom/xhr/tests/test_XHR_parameters.html
rename : dom/base/test/test_XHR_system.html => dom/xhr/tests/test_XHR_system.html
rename : dom/base/test/test_XHR_timeout.html => dom/xhr/tests/test_XHR_timeout.html
rename : dom/base/test/test_XHR_timeout.js => dom/xhr/tests/test_XHR_timeout.js
rename : dom/base/test/test_html_in_xhr.html => dom/xhr/tests/test_html_in_xhr.html
rename : dom/workers/test/test_relativeLoad.html => dom/xhr/tests/test_relativeLoad.html
rename : dom/base/test/test_sync_xhr_timer.xhtml => dom/xhr/tests/test_sync_xhr_timer.xhtml
rename : dom/workers/test/test_terminateSyncXHR.html => dom/xhr/tests/test_worker_terminateSyncXHR.html
rename : dom/workers/test/test_xhr.html => dom/xhr/tests/test_worker_xhr.html
rename : dom/workers/test/test_xhr2.html => dom/xhr/tests/test_worker_xhr2.html
rename : dom/workers/test/test_xhrAbort.html => dom/xhr/tests/test_worker_xhrAbort.html
rename : dom/workers/test/test_xhr_3rdparty.html => dom/xhr/tests/test_worker_xhr_3rdparty.html
rename : dom/workers/test/test_xhr_cors_redirect.html => dom/xhr/tests/test_worker_xhr_cors_redirect.html
rename : dom/workers/test/test_xhr_headers.html => dom/xhr/tests/test_worker_xhr_headers.html
rename : dom/workers/test/test_xhr_implicit_cancel.html => dom/xhr/tests/test_worker_xhr_implicit_cancel.html
rename : dom/workers/test/test_xhr_parameters.html => dom/xhr/tests/test_worker_xhr_parameters.html
rename : dom/workers/test/test_xhr_parameters.js => dom/xhr/tests/test_worker_xhr_parameters.js
rename : dom/workers/test/test_xhr_responseURL.html => dom/xhr/tests/test_worker_xhr_responseURL.html
rename : dom/workers/test/test_xhr_system.html => dom/xhr/tests/test_worker_xhr_system.html
rename : dom/workers/test/test_xhr_system.js => dom/xhr/tests/test_worker_xhr_system.js
rename : dom/workers/test/test_xhr_timeout.html => dom/xhr/tests/test_worker_xhr_timeout.html
rename : dom/base/test/test_xhr_abort_after_load.html => dom/xhr/tests/test_xhr_abort_after_load.html
rename : dom/base/test/test_xhr_forbidden_headers.html => dom/xhr/tests/test_xhr_forbidden_headers.html
rename : dom/base/test/test_xhr_overridemimetype_throws_on_invalid_state.html => dom/xhr/tests/test_xhr_overridemimetype_throws_on_invalid_state.html
rename : dom/base/test/test_xhr_progressevents.html => dom/xhr/tests/test_xhr_progressevents.html
rename : dom/base/test/test_xhr_send.html => dom/xhr/tests/test_xhr_send.html
rename : dom/base/test/test_xhr_send_readystate.html => dom/xhr/tests/test_xhr_send_readystate.html
rename : dom/base/test/test_xhr_withCredentials.html => dom/xhr/tests/test_xhr_withCredentials.html
rename : dom/workers/test/file_getcookie.sjs => dom/xhr/tests/worker_file_getcookie.sjs
rename : dom/workers/test/terminateSyncXHR_frame.html => dom/xhr/tests/worker_terminateSyncXHR_frame.html
rename : dom/workers/test/testXHR.txt => dom/xhr/tests/worker_testXHR.txt
rename : dom/workers/test/xhr_cors_redirect.js => dom/xhr/tests/worker_xhr_cors_redirect.js
rename : dom/workers/test/xhr_cors_redirect.sjs => dom/xhr/tests/worker_xhr_cors_redirect.sjs
rename : dom/workers/test/xhr_headers_server.sjs => dom/xhr/tests/worker_xhr_headers_server.sjs
rename : dom/workers/test/xhr_headers_worker.js => dom/xhr/tests/worker_xhr_headers_worker.js
rename : dom/workers/test/xhr2_worker.js => dom/xhr/tests/xhr2_worker.js
rename : dom/workers/test/xhrAbort_worker.js => dom/xhr/tests/xhrAbort_worker.js
rename : dom/workers/test/xhr_implicit_cancel_worker.js => dom/xhr/tests/xhr_implicit_cancel_worker.js
rename : dom/workers/test/xhr_worker.js => dom/xhr/tests/xhr_worker.js
2016-06-27 19:13:40 +02:00
687c67ce6d
Bug 1279120 Call revokeObjectURL() on search engine icon blob URLs. r=adw
2016-06-27 08:10:50 -07:00
1d9f4fd998
Bug 1208078, improve drag feedback appearance in e10s, r=jared
2016-06-15 08:49:06 -04:00
7c172bb734
Bug 1274265 - browser_broadcastchannel.js should not expose content promises to the rest of the test, r=jhao
2016-06-15 11:51:44 +01:00
eeea2c125f
Backed out changeset ebeedb6959e8 (bug 1274265) for browser_broadcastchannel.js failures
2016-06-15 10:52:21 +01:00
f1ac321990
Bug 1274265 - browser_broadcastchannel.js should not expose content promises to the rest of the test, r=jhao
2016-06-15 10:11:46 +01:00
53b6985242
Bug 1265845 - Implement browser.history.onVisited, r=aswan
...
MozReview-Commit-ID: 6jXEUA1Cll9
--HG--
extra : transplant_source : %FC%8Frg%7C2%25%A6%A0%FB%27%AB%DE%04Q%3E%83%BE%A6%EE
2016-06-08 12:42:13 -04:00
3f12d50429
Merge mozilla-central to mozilla-inbound
2016-06-15 06:27:08 +01:00
58167fd092
merge mozilla-inbound to mozilla-central a=merge
2016-06-15 06:24:33 +01:00
ad42a406bd
Bug 1278718 - Use the same setup for clang and binutils on TC as on buildbot. r=kmoir
2016-06-15 12:22:57 +09:00
422162d82a
Bug 1278718 - Use clang 3.8 on ASAN builds. r=decoder
2016-06-15 12:22:56 +09:00
8b0e723ab3
Bug 1278718 - Build clang 3.8 with static libstdc++. r=froydnj
...
Use the resulting clang everywhere we are currently using clang 3.8.
2016-06-15 12:22:54 +09:00
6d673a6148
Bug 1276412 - Fix a typo in a comment - part 2, r=me
2016-06-14 23:10:25 +01:00
a0c3da6eec
Bug 1276412 - Fix a typo in a comment, r=me
2016-06-14 23:05:48 +01:00
f98ee064d0
Bug 1276412 - Enable experimental containers feature for Nighlty to test the OriginAttributes platform work and get some validation on the idea. r=past
2016-06-14 22:41:36 +01:00
699a92d0e0
Bug 1276412 - Fix context menu test that doesn't account for New Container Tab option. r=past
2016-06-14 22:41:33 +01:00
340307851a
Backed out changeset 19ac9881aa5e (bug 1276412) for bc7 failures on OSX and Windows in browser_contextmenu.js. r=backout
2016-06-14 17:19:41 +02:00
14183e306e
Bug 754623 - Get page title from tab label; r=mak
...
MozReview-Commit-ID: BOXUKUcA0fZ
--HG--
extra : transplant_source : C%15%EB%C50%A3%E4eK%C7%60%965l%F5u%A3%F3%B9%0F
2016-05-19 12:45:21 +08:00
a1dac7caad
Bug 1279392: [webext] Move API permission definitions to the schemas. r=aswan
...
MozReview-Commit-ID: 8m7wJrAbFwS
--HG--
extra : source : a00cf073f5c00380d4e42b13bc0cd3146b708845
extra : amend_source : d74ef90e88acbe62e33af3b5b9cf870d5c0a9d3e
2016-06-09 17:44:47 -07:00
f8035f62a8
Backed out changeset a00cf073f5c0 (bug 1279392) for failing mochitest test_ext_contentscript_create_iframe.html at least on Linux x64 opt. r=backout
2016-06-14 13:37:52 +02:00
b08c1c8d78
Backed out changeset 5662da82f125 (bug 1203481)
2016-06-14 12:21:19 +02:00
b465305345
Bug 1279392: [webext] Move API permission definitions to the schemas. r=aswan
...
MozReview-Commit-ID: 8m7wJrAbFwS
--HG--
extra : rebase_source : cba877c0ef400917b0b7e5913895e64ebefb34b9
extra : amend_source : 6e943015e3e00854c431cbd653994a6734e66ce4
2016-06-09 17:44:47 -07:00
17ef874c3b
Bug 1276412 - Enable experimental containers feature for Nighlty to test the OriginAttributes platform work and get some validation on the idea. r=past
2016-06-14 12:46:02 +01:00
b5797b008c
Bug 1280006 - Backout "Bug 1270680 - Part 2: Tests that make sure image cache respect originAttributes." r=tanvi
...
This reverts commit c3ca86b9a6a787a8d81331453f5ff064de096038.
2016-06-14 12:43:17 +01:00
c984b99b67
Bug 877856 - Remove obsolete defaultset attributes from default toolbars, r=gijs
...
MozReview-Commit-ID: Ve8PWDg96
--HG--
extra : rebase_source : 47db228a26b9253b60327a8d833da3bacd9e8b64
2016-06-11 17:53:35 +05:30
4cf0c2b256
Bug 1277967 - Use defaultFavicon for default search image. r=florian
2016-06-13 09:36:29 +01:00
1bf257e0b3
Bug 1276880 - 'Open link in a new <container_name> Tab' in the context menu, r=gijs
2016-06-12 16:23:10 +02:00
c5caa62fdf
Bug 1278456 - Add the tooltool GCC library directory to LD_LIBRARY_PATH on Linux builds. r=mshal
...
Build slaves on automation are based on Centos 6, which doesn't have a
recent enough version of libstdc++ for our new requirements. But since
we're building with a recent GCC or clang with its own libstdc++, we do
have such a libstdc++ available somewhere, and the compiler picks it
when invoking the linker.
Problems start happening when we execute some of the built programs
during the build, like host tools (e.g. nsinstall), or target programs
(xpcshell, during packaging). In that case, we need the compiler's
libstdc++ to be used. Which required adding the GCC or clang library
directory to LD_LIBRARY_PATH.
Unconveniently enough, the clang 3.5 tooltool package we're using for
ASAN builds until we can update to at least 3.8 (bug 1278718) doesn't
contain libstdc++.so. So for those builds, pull the GCC package from
tooltool as well, and pick libstdc++ from there.
2016-06-12 18:52:15 +09:00
c6816bf0df
merge mozilla-inbound to mozilla-central a=merge
2016-06-12 11:26:13 +02:00
43172a8229
Bug 1248639 - Adding in context menu icons for gtk layout. r=jaws
...
MozReview-Commit-ID: 4eFIxsmTUOR
--HG--
extra : transplant_source : %14E%98%01%28%BF%05%5Es%EFC%E8%97%8F%A8p%87%84%EA%21
2016-06-09 22:09:16 +01:00
05d0f2d0ee
Bug 1252509 - Use a sliding panel overlay from the downloads panel to display the available actions. r=jaws
...
MozReview-Commit-ID: FhRlxcPeWu3
2016-06-10 22:08:59 -07:00
592fc3ac55
Disable browser_CaptivePortalWatcher.js on Windows for intermittent failures (bug 1279491). r=bustage
...
MozReview-Commit-ID: LXYKoIq1OfU
2016-06-10 20:26:59 +03:00
836ac9cc86
Bug 1279476 - Fix search arrow background styling in about:home and about:newtab. r=florian
2016-06-10 18:25:50 +02:00
4e79acfb43
Bug 1206246 - Change identity icon for sites with granted permissions. r=paolo
...
MozReview-Commit-ID: 2GV4fBrB6vO
--HG--
extra : rebase_source : cc57bae78137244b075a3158f5b85e821b0d1a53
2016-06-01 18:17:26 +02:00
314c636f81
Bug 1279465 - Back out changeset 4ca15e44f0b5 to prevent inconsistency with future designs. r=paolo
...
MozReview-Commit-ID: FxSZ9FJO1Xd
--HG--
extra : rebase_source : 4547f305523e49f06bcab84adac2a5c86095931f
2016-06-10 13:10:08 +02:00
48d4127667
Merge mozilla-central to fx-team
2016-06-10 15:42:51 +02:00
4ee1ed2b8f
merge mozilla-inbound to central a=merge
...
--HG--
extra : amend_source : 10247ace8885c608987dcf31d47368e0dec09b19
2016-06-10 15:39:23 +02:00
cfae79fe6f
Bug 989193 - Add tests for CaptivePortalWatcher module. r=MattN
...
MozReview-Commit-ID: 4Pn6jnpCyHm
2016-06-10 15:22:43 +03:00
7323a16958
Bug 989193 - Open captive portal automatically in a new tab when detected. r=MattN
...
MozReview-Commit-ID: 8SZ0mOwIUtC
2016-06-10 15:19:31 +03:00
c4704ecab3
Bug 1268462 - match main popup appearance in bookmarks toolbar submenus, r=dao
...
MozReview-Commit-ID: OTbdzDGyjr
--HG--
extra : rebase_source : eeadd34de3e0a229f93cb5573527c499b26e8b7a
2016-06-10 11:44:47 +01:00
563a519550
Bug 1253825 - Fix intermittent issue with clearInterval attempting to clear the wrong timers, caused by missing stubs. r=mancas
2016-06-10 10:57:32 +01:00
c7b3a300d9
Bug 1271775 - shut up eslint warning about return value, rs=bustage
...
MozReview-Commit-ID: ESoog14WDSw
--HG--
extra : rebase_source : b0321f9911090894d6a1167d267289fb64e33a6c
2016-06-10 10:11:51 +01:00
8cb64e5de1
Fix an intermittent failure in browser_popupNotification_4.js (bug 1041724). r=florian
...
MozReview-Commit-ID: 7OjaeL0WGk6
2016-06-10 12:11:47 +03:00
592e9bcfd9
Bug 1271775 - allow bypassing the initial migration dialog, r=jaws
...
MozReview-Commit-ID: LkhHl7ipGEb
--HG--
extra : rebase_source : f61fd08c394196468a7594acf8bb8926da04d0f2
2016-06-01 19:00:53 +01:00
225ca7a439
Bug 1260820 - Search engine drop down closes when I change search engines by pressing Up/Down, r=Gijs.
2016-06-10 09:55:30 +02:00
8d9648c3dd
Bug 1206709 - [RTL] mispositioned separators between one-off buttons in the searchbar panel, original patch by johngraciliano, r=adw.
2016-06-10 09:52:19 +02:00
83893d9c78
Bug 1278546 - [RTL] The search go arrow should point left, r=dao.
2016-06-10 09:52:00 +02:00
6439777db0
Bug 1271785: [webext] Better error messages for "choices" schema types. r=aswan
...
The generated messages are still a bit rough in some instances, but they're at
least much better than what we have now.
MozReview-Commit-ID: gTS0RvDnwk
--HG--
rename : toolkit/components/extensions/test/xpcshell/.eslintrc => browser/components/extensions/test/xpcshell/.eslintrc
rename : toolkit/components/extensions/test/xpcshell/head.js => browser/components/extensions/test/xpcshell/head.js
rename : toolkit/components/extensions/test/xpcshell/test_ext_manifest_content_security_policy.js => browser/components/extensions/test/xpcshell/test_ext_manifest_commands.js
rename : toolkit/components/extensions/test/xpcshell/xpcshell.ini => browser/components/extensions/test/xpcshell/xpcshell.ini
extra : rebase_source : 058603a2ab0efa90d3626b82be6d5e2cf1436fc3
extra : amend_source : 3a7924ef237cb392dd2f4c1f696b8858daad43ab
2016-06-04 23:31:35 -07:00
0fccc460b7
Bug 1277698, r=bz
...
MozReview-Commit-ID: JH5QUu357gc
--HG--
extra : rebase_source : 3394613dbaf1b49bf9dc16086d0bd0ae870d89b9
2016-06-07 14:47:35 +01:00
4547bc3da6
Bug 1274480 - Part 2 - Sort notification-icons.inc.css by notification type. r=Gijs
...
MozReview-Commit-ID: CjtNTLTvrNC
--HG--
extra : rebase_source : 8a14752e80ebdd40b0eaca3bb77e9143e5c21fdf
2016-06-08 15:56:06 +01:00
5797203ab2
Bug 1274480 - Part 1 - Use SVG for permission icons and notifications. r=Gijs
...
MozReview-Commit-ID: Dk0PajOppVL
--HG--
extra : rebase_source : eed692400919f5c126debb14b3ae2c2d17c7cb7d
2016-06-08 16:34:10 +01:00
2cdbcb870d
Bug 384458 - part 4: implement modal highlighting using the AnonymousContent API and SVG masks. r=jaws
2016-06-09 13:30:49 +02:00
5748931883
Bug 384458 - part 2: change the matches count timeout to 100ms, up the limit to a 1000 counts and capture the state of 'Highlight All' in a pref which will be TRUE by default in the browser. r=jaws
2016-06-09 13:30:46 +02:00
2273c7b9f8
Merge mozilla-central to fx-team
2016-06-09 12:14:03 +02:00
733a4f6de5
merge mozilla-inbound to mozilla-central a=merge
2016-06-09 11:58:06 +02:00
1bdb5bec87
Bug 1278538 - Migrate tests for browser.history to use History.insertMany rather than PlacesTestUtils.addVisits, r=aswan
...
MozReview-Commit-ID: IfPJ2vbBiLt
--HG--
extra : transplant_source : %2C%14K%25%00%08%070%C8%A9%D0%03%D4%F4%9FV%12%D0D%C2
2016-06-07 09:43:57 -04:00
58daf54a0e
Bug 1271675 - Add tests for browser.history.search that use specific date ranges. r=aswan
...
MozReview-Commit-ID: GqG39ytrDpa
--HG--
extra : transplant_source : %9B%AE%2C%2B%80%2A%09%1C%C1%D4%BC/%9E%B9%C8%15%02%E6%2C%0C
2016-06-06 15:21:20 -04:00
e0c9a7bf97
Merge m-c to fx-team, a=merge
2016-06-08 17:13:46 -07:00
07d01350a8
Merge fx-team to central, a=merge
2016-06-08 17:06:18 -07:00
0adc8ded6e
Backed out 6 changesets (bug 384458) for frequent browser_FinderHighlighter.js failures
...
Backed out changeset ded915ec401f (bug 384458)
Backed out changeset 63ec66da50fa (bug 384458)
Backed out changeset ae71396d3be0 (bug 384458)
Backed out changeset 3b025cbfbe3c (bug 384458)
Backed out changeset 091c5465acf7 (bug 384458)
Backed out changeset 5eabde153def (bug 384458)
2016-06-08 14:53:57 -07:00
5d03979f6b
Bug 1278733: Turn on JSDoc validation, and fix basic errors in existing comments. r=aswan
...
MozReview-Commit-ID: EZpOyvoi2h0
--HG--
extra : rebase_source : b03b211a1fe3aad3c760bd0f9235bbaaca171a9a
2016-06-07 18:36:19 -07:00
c1194ab1a9
Bug 1277026 - Disconnect Sync and show a notification on FxA remote disconnect. r=markh
...
MozReview-Commit-ID: Hxz1j5QDkfM
--HG--
extra : transplant_source : J%82i%FD%AA%3D%E6%13%FB%A0%C8%5EC%8F%85%ADq%9C%B9%C8
2016-06-08 10:40:42 -07:00
7270ed519a
Back out 4 changesets (bug 1276132) for browser_gmpProvider.js failures
...
CLOSED TREE
Backed out changeset 511a2389ca48 (bug 1276132)
Backed out changeset 91b3cdd0640a (bug 1276132)
Backed out changeset 09b9972e36f9 (bug 1276132)
Backed out changeset 69052d4e3dbb (bug 1276132)
2016-06-08 20:36:22 -07:00
632b11bf2f
Bug 1274877 - contextMenus API starts logging errors after removing an item, r=kmag
...
MozReview-Commit-ID: 86bxjxEQaQX
2016-06-07 15:26:08 -04:00
c192826ab8
Bug 1265835 - Implement browser.history.getVisits, r=aswan
...
MozReview-Commit-ID: lhFdMTHYUl
--HG--
extra : amend_source : a65036e2420795601486c9e5f9adca4e557029db
2016-06-08 08:50:08 -04:00
359a1add5d
Bug 1276132 - Don't show EME 'enable' UI for non-visible keysystems. r=gijs
...
This means we'll only show the EME UI for keysystems that are explicitly turned
on in the build config, or those that are enabled after the build via prefs.
MozReview-Commit-ID: 7VTp1BJSZFy
--HG--
extra : rebase_source : 6a31f9d8fc2f06ef05988b510946ed924c613c2a
2016-05-31 12:04:12 +12:00
ac07135594
Bug 1276132 - Rename media.gmp-*.forcevisible to media.gmp-*.visible, and set it when keysystems are enabled. r=spohl
...
Repurpose the media.gmp-*.forcevisible pref to control whether the
corresponding GMP is visible in the addons manager UI. The pref has to be true
for the GMP to be usable.
The pref is enabled and not hidden when the corresponding EME keysystem is
enabled in the mozconfig.
This means users can turn on EME without needing to recompile their build; they
just need to create a hidden pref. This will be useful for CDM developers, and
users on platforms where we've not enabled EME yet but users want to test it
(Linux).
We also need to change the GMPUtils.isPluginHidden() accessor so that plugins
are considered hidden if the "visible" pref is false OR we're on an unsupported
platform. This ensures that we must be on a supported OS and the visibility
pref is true before GMPs appear in the addon list.
A consequence of the isPluginHidden() change is that we also need to add a
"force-supported" pref to override the checks that refuse to load the GMPs on
various platform versions, so that the unit tests pass.
MozReview-Commit-ID: h6CwLDkvFW
--HG--
extra : rebase_source : d09b952cc12da6f46b404439781b62784e4f54b3
2016-05-31 10:59:44 +12:00
a479893c6a
Bug 384458 - part 4: implement modal highlighting using the AnonymousContent API and SVG masks. r=jaws
2016-06-08 19:54:10 +02:00
2c1479d246
Bug 384458 - part 2: change the matches count timeout to 100ms, up the limit to a 1000 counts and capture the state of 'Highlight All' in a pref which will be TRUE by default in the browser. r=jaws
2016-06-08 19:54:07 +02:00
60a875da64
Bug 1275089 - Wrap the call to getHistogramById().add() in a try/catch since the probe expires in v50 and the histogram is no longer reported as a COUNT histogram since it is expired. Histograms that are not COUNT histograms must supply a value when calling .add(). r=Gijs
...
MozReview-Commit-ID: C4x6dR1nULR
--HG--
extra : rebase_source : c4442b1cf50683dec47343299e86b9ef0a5df10a
2016-05-27 13:43:19 -04:00
a9df8d4d3f
Bug 1278851 - Enable service worker notifications everywhere except for non-release B2G. r=baku
...
MozReview-Commit-ID: InG420vpNtA
--HG--
extra : rebase_source : 0523697466cb8f438b1af129c5d74a1b0c8df499
2016-06-07 14:25:59 -07:00
a4c22dfaca
Bug 1270678 - Part 2: Add a test case to verify that the loading of favicon obey originAttributes. r=ckerschb
2016-06-07 16:38:00 +02:00
6439e7004c
merge mozilla-inbound to mozilla-central a=merge
2016-06-08 11:57:53 +02:00
1bd67fd288
merge fx-team to mozilla-central a=merge
2016-06-08 11:56:38 +02:00
c1439093ab
Merge mozilla-central to mozilla-inbound
2016-06-07 15:34:15 +02:00
c6d661cfe2
merge mozilla-inbound to mozilla-central a=merge
2016-06-07 15:23:03 +02:00
035f8773be
Back out 32d16086e85e (bug 1271516) for frequent ChromeUtils::IsOriginAttributesEqual assertin failures
...
CLOSED TREE
2016-06-06 21:07:42 -07:00
ca39a66245
Back out e8dab5e5d63a (bug 1272107) for 10.10 e10s debug startup hangs/asserts/aborts
...
CLOSED TREE
2016-06-06 21:06:42 -07:00
8b595135ed
Bug 1277747 - Show "Restarting..." label when we restart from about dialog updater, r=mikedeboer
...
Restart might not happen instantly when the user clicks the restart
button. Ideally we want to provide instant feedback in that case. This
patch will switch the UI to a "Restarting..." label as soon as the user
clicks the restart button.
The button is restored if the restart action is aborted.
MozReview-Commit-ID: BfMVla87FmT
--HG--
extra : transplant_source : X%5B%B9c%02%B6%B1%87z%13%18F%AC%1E.dt%20%F7%93
2016-06-03 14:01:38 +08:00
29005dba67
Bug 1273980 - Handle correctly Synced Tabs sidebar device icon focussed states. r=markh
...
MozReview-Commit-ID: 29UKxxfxKuI
--HG--
extra : transplant_source : %09%B4%AAn%D5%1CRx%A9%18%CFX%7C%F6%12_%A3%5B%D3%CF
2016-06-06 14:00:57 -07:00
c98153037d
Bug 1276025: Stop using injectInDocShell to tag docShells with types. r=billm
...
MozReview-Commit-ID: 7h5PI2birY4
--HG--
extra : source : 99b213f494e1a9e20629e936681faedec16d22a3
extra : amend_source : d70ffaecbc11445a5bddeb52c9c940a866934347
2016-06-02 20:53:41 -07:00
3ec856c177
Backed out changeset 99b213f494e1 (bug 1276025) for xpcshell bustage CLOSED TREE
2016-06-07 16:59:20 -07:00
e74c05284e
Backed out changeset 947617c723cd (bug 1277026)
...
MozReview-Commit-ID: 6wRsDiaxVp1
2016-06-07 16:10:56 -07:00
5399e1e48d
Bug 1278149 - split browser_sessionStoreContainer.js. r=mikedeboer
2016-06-07 11:02:38 +08:00
5859f4c006
Bug 1277344 - Opened a new private window, to remove setting docshell to private. r=ehsan
...
MozReview-Commit-ID: 9hFEKV3Wq2J
2016-06-07 18:56:07 -07:00
b1d79ef530
Bug 1203743 - Windows and Linux Dev Edition theme bottom border on #navigator-toolbox isn't using theme colors r= Gijs.
...
MozReview-Commit-ID: 9amKUN7dVFB
--HG--
extra : rebase_source : c258e7ee7e199e046b1c7ee7ff937c90696ee1f7
2016-06-08 01:27:06 +05:30
392c65b534
Bug 1261386 - Avoid history flooding from repeated reloads. r=adw
...
MozReview-Commit-ID: FhU8nOoNUHb
--HG--
extra : rebase_source : ff75adb252b13f4042da49d4572fb807c3d0d823
2016-05-26 17:49:40 +02:00
5714578c95
Bug 1278528: Don't try to initialize the sandbox TargetServices when we are not sandboxed. r=jimm
...
MozReview-Commit-ID: EpXy9LYXwQL
2016-06-07 14:03:51 +01:00
4476fb27cb
Bug 1271249 - Fixed by Bug1269361 adding new OriginAttributes. r=baku
2016-06-07 08:27:41 +02:00
df97b7592f
Bug 1270680 - Part 2: Tests that make sure image cache respect originAttributes. r=jdm,seth
...
MozReview-Commit-ID: LbGy6MfZGEL
2016-06-06 03:39:00 +02:00
47d1fa5cde
Bug 1233899 - fix the feeds converter to use default user context origin attributes. r=baku
...
(HEAD -> Bug_1233899)
passing origin attributes from loading channel to feed rendering page.
2016-06-06 14:22:00 +02:00
000c4ca9ce
Bug 1277026 - Disconnect Sync and show a notification on FxA remote disconnect. r=markh
...
MozReview-Commit-ID: Hxz1j5QDkfM
--HG--
extra : rebase_source : 396713694fb50042331715dde2d404e32e659815
2016-06-02 15:22:12 -07:00
c5d392a9bc
Bug 1276025: Stop using injectInDocShell to tag docShells with types. r=billm
...
MozReview-Commit-ID: 7h5PI2birY4
--HG--
extra : rebase_source : a8b8b9b49f9ef8304ee669f6c28c9290a1198ff3
extra : amend_source : f868dc11e3da5f89852343e88e373db14f5dcbd3
extra : histedit_source : 6ee59978a58828e22a9f2cbf651cb713ba28d25d
2016-06-02 20:53:41 -07:00
825acb86c4
revert Bug 1186522 - force per checkin and release desktop firefox builds to require signed add-ons on beta 47 r=mshal DONTBUILD
2016-06-07 14:45:21 -04:00
825b101112
Bug 1277685, r=jaws
...
MozReview-Commit-ID: BtZCFTIdlMh
--HG--
extra : rebase_source : d5e780066ec58b82a46a79ad6a0ee16c1e2bffe3
2016-06-07 14:53:34 +01:00
94aee01d99
Bug 1186522 - force per checkin and release desktop firefox builds to require signed add-ons on beta 47 r=mshal DONTBUILD
2016-06-07 14:28:26 -04:00
dd6cbdac21
Bug 1271516 - Introducing nsIWebNavigation.setOriginAttributesBeforeLoading, r=smaug
2016-06-07 19:59:22 +02:00
807cf956d8
Merge m-c to inbound, a=merge
2016-06-06 17:14:49 -07:00
07bca63718
Merge fx-team to m-c a=merge CLOSED TREE
2016-06-06 15:14:37 -07:00
7fbcf3fa34
Bug 1278389 - skip browser_mozLoop_telemetry.js because changing to firefox50 broke it a=test-only
2016-06-06 14:50:05 -07:00
c8fda3aef7
Bug 1278388 - skip browser_permissions_urlFieldHidden.js because changing to firefox50 broke it a=test-only
2016-06-06 14:46:13 -07:00
943c6e667c
Bug 1271516 - Introducing nsIWebNavigation.setOriginAttributesBeforeLoading, r=smaug
2016-06-07 00:47:13 +02:00
8524414783
Bug 1272107 - FlyWeb desktop UI. Only enabled on nightly and aurora. r=mconley
...
--HG--
extra : amend_source : 20eecf238ea852129fe0c788379a7a31cd765f6b
2016-06-06 18:47:06 -04:00
219956a13e
Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release
2016-06-06 15:18:13 -04:00
4aea0165dc
merge mozilla-inbound to mozilla-central a=merge
2016-06-06 11:55:56 +02:00
11e77b01e4
merge fx-team to mozilla-central a=merge
2016-06-06 11:54:52 +02:00
3f096f7801
No bug, Automated blocklist update from host bld-linux64-spot-384 - a=blocklist-update
2016-06-04 05:09:35 -07:00
Thomas Nguyen
Fischer.json
Chih-Yi Leu
Wes Kocher
Carsten "Tomcat" Book
Sebastian Hengst
Timothy Guan-tin Chien
Mark Hammond
Jared Wein
Dão Gottwald
Marco Bonardo
Mark Goodwin
Mike Hommey
Onno Ekker
Gijs Kruitbosch
Drew Willcoxon
Eitan Isaacson
Johann Hofmann
Ryan VanderMeulen
Blake Kaplan
Kartikaya Gupta
Ben Kelly
Ted Mielczarek
Andrea Marchesini
Kim Moir
Neil Deakin
Bob Silverberg
Tanvi Vyas
Scott Wu
Kris Maglione
Jonathan Hao
Akshat Kedia
Michael Kaply
Jonathan Kingston
Panos Astithas
Nihanth Subramanya
Mark Banner
Florian Quèze
Paolo Amadini
Mike de Boer
Edouard Oger
Phil Ringnalda
Chris Pearce
Kit Cambridge
Tim Huang
Matthew Noorenberghe
Yoshi Huang
James Andreou
Rakhi Sharma
Bob Owen
Dave Huseby
Justin D'Arcangelo
ffxbld
ffxbld