Raphaël Lustin
401627ef48
Bug 859133 - Add a plain request/response headers view. r=vporof
2014-10-01 08:09:00 -04:00
Ed Morley
05d2bcbce8
Merge mozilla-central and fx-team
2014-10-03 15:15:58 +01:00
Ed Morley
e70f0aed29
Merge latest green fx-team changeset and mozilla-central; a=merge
2014-10-03 14:51:14 +01:00
anirudhgp
7b5b772866
Bug 1076626 - Global notification bars should be hidden in fullscreen mode. r=dao
2014-10-03 13:29:57 +02:00
Richard Marti
ffb51c42ec
Bug 1008603 - Define panel-subviews background-color in platform files. r=dao
2014-10-03 08:44:11 +02:00
Matthew Noorenberghe
e8358d1819
Bug 1047164 - Handle authentication errors (e.g. token expiry) for FxA Loop sessions and notify users. r=jaws
2014-10-03 03:17:32 -07:00
Ed Morley
8c0d5a673b
Merge mozilla-central and inbound
2014-10-03 15:14:53 +01:00
Yury Delendik
f05e4f226e
Bug 1077198 - Update Shumway to version 0.9.2970. r=till
2014-10-02 19:13:04 -05:00
Mark Banner
863c847e79
Bug 972017 Part 4 - Hook up the OT sdk to the direct calling window for Loop. r=nperriault
2014-10-03 22:42:02 +01:00
Victor Porof
2a779406c7
Bug 1056342 - Performance tab fails with app after second toolbox open, r=paul
2014-10-03 21:40:42 +01:00
Ryan VanderMeulen
3e02d1aa6e
Merge m-c to fx-team. a=merge
2014-10-03 16:33:31 -04:00
Ryan VanderMeulen
9140e15c0c
Backed out changeset 0a3385aaff01 (bug 1015988) for mochitest-bc orange.
2014-10-03 16:07:47 -04:00
Ryan VanderMeulen
2e19f5277d
Backed out changeset 53e7cea7d468 (bug 1077332) for Marionette failures.
2014-10-03 14:58:26 -04:00
Mike de Boer
525397604c
Bug 1077332: hide tabs when not logged in with FxA. r=paolo
2014-10-03 18:49:15 +02:00
Paolo Amadini
0ae54b5649
Bug 1037114 - Implement contacts list filtering on Name, Last Name and Mail. r=mikedeboer
2014-10-03 19:04:13 +01:00
Paolo Amadini
f841786c0f
Bug 1015988 - Client needs to report number of shared URLs on Desktop. r=MattN
2014-10-03 19:04:12 +01:00
Andrew Halberstadt
d292ee73f1
Bug 1066735 - Remove root b2g and android specific xpcshell manifests, r=chmanchester
2014-10-07 18:18:28 -04:00
Wes Kocher
37702e967f
Merge m-c to inbound a=merge
2014-10-07 18:43:16 -07:00
Ehsan Akhgari
e11ea02957
Bug 1079331 - Simplify test_contextmenu.html by removing privateBrowsingMode.js; r=jdm
2014-10-07 16:14:20 -04:00
Ryan VanderMeulen
deca1e4adb
Merge m-c to inbound. a=merge
2014-10-07 16:09:10 -04:00
Erik Vold
7c5f78fe4f
Bug 1037235 - toolkit/loader doesn't check module compatibility r=Mossop,past,jaws f=dteller
2014-09-09 18:33:55 -07:00
Adam Roach [:abr]
3386c3751e
Bug 1079959 - Google import fails if a contact contains a physical address r=mikedeboer
2014-10-08 11:42:45 -05:00
Mark Banner
1a81c9a195
Follow-up to bug 1072323 - Fix the Loop ui-showcase by passing a mock contact parameter, which is now needed rather than the call Id. rs=nperriault over irc. NPOTB so DONTBUILD
2014-10-08 16:37:46 +01:00
Carsten "Tomcat" Book
2fb3ffe395
Merge m-c to fx-team
2014-10-08 16:02:16 +02:00
Tim Taubert
b218ccd277
Bug 1077369 - Remove border between search term and globe icon for actiontype!=switchtab r=dao
2014-10-08 01:37:54 +02:00
Yury Delendik
9136fb6c01
Bug 1064306 - Adjust pdfjs Makefile to stop excluding non-existent files. r=gps
2014-09-08 09:48:10 -05:00
Mark Banner
85b2d189ea
Bug 972017 Part 3 - Finish the view flow transition for direct calling for Loop. r=nperriault
2014-10-02 19:55:22 +01:00
Nicolas Perriault
ad583709b0
Bug 1047406 - Remove notifications in Loop conversation window. r=Standard8
2014-10-02 19:55:21 +01:00
Justin Dolske
241dfc0454
Bug 1076943 - forget icon has white border (non-transparent background). r=jaws
2014-10-02 10:30:00 -07:00
Ryan VanderMeulen
44cc0b6341
Merge m-c to fx-team. a=merge
2014-10-02 13:16:26 -04:00
Ryan VanderMeulen
4c98b09137
Merge fx-team to m-c. a=merge
2014-10-02 13:00:31 -04:00
Mike de Boer
6568594f93
Bug 1074547: improve rendering flow of contacts list. r=Niko
2014-10-02 12:59:43 +02:00
Mike de Boer
392056106c
Bug 1069816: Enable import button in the contacts list. r=abr
2014-10-02 12:37:43 +02:00
Mike de Boer
0b4d324d7e
Bug 1069816: add unit tests for the GoogleImporter class. r=abr
2014-10-02 12:37:41 +02:00
Mike de Boer
9aa1b91cc1
Bug 1069816: implement Google contacts import class. r=abr
2014-10-02 12:37:38 +02:00
Mike de Boer
7d96aca1c9
Backed out changeset b26c709330d6 (bug 1069962). r=paolo.
2014-10-01 15:51:50 +02:00
J. Ryan Stinnett
f2f1a95536
Bug 989168 - Disable browser_manifest_editor. r=jryans
2014-10-01 05:24:00 +02:00
J. Ryan Stinnett
a52457932b
Bug 916804 - Telemetry for WebIDE. r=mratcliffe,paul
2014-10-01 16:04:00 +02:00
Nick Fitzgerald
6cab715092
Bug 915426 - Don't store debugging data in the global scope. r=ejpbruel
2014-10-01 07:45:00 +02:00
Mark Banner
4965914593
Follow-up to bug 1000240 Fix the generated conversation.js file, missed during bitrot. rs=nperriault
2014-10-02 08:55:56 +01:00
stefanh@inbox.com
49612ba0d9
Bug 1075672 - Style the sidebar in places window with Yosemite behind-window vibrancy, r=gijs
2014-10-01 10:02:00 +01:00
Gijs Kruitbosch
aff56ac9f2
Bug 1057166 - move FHR reporting out of docshell and fix test to work in e10s, r=bz
...
--HG--
extra : rebase_source : d5b9122803f306ab08deb85b953bbc7129e182f0
2014-09-11 14:50:55 +01:00
Victor Porof
9df36d6225
No Bug - Changeset 8a221e7030b1 was empty; Actually fix indentation on a line introduced in bug 1061653, r=me DONTBUILD
2014-10-02 08:09:16 +01:00
Felipe Gomes
5e25592280
Bug 1053456 - Pass a serialized SSL status to the parent process so that "Add exception" from about:certerror works. r=dkeeler
2014-10-02 01:17:13 -03:00
Jared Wein
2cc33e7473
No bug - Change tabs to spaces in MozLoopPushHandler.jsm r=me DONTBUILD
2014-10-01 20:02:09 -04:00
Mark Hammond
a82765b476
Bug 1075341 - tests disabled in Linux due to bug 1073339 are now also disabled for e10s. r=unfocused
...
--HG--
extra : rebase_source : 633c203e3836223466d77b698053e04d25fb0d5d
2014-10-02 09:29:40 +10:00
Wes Kocher
86eb3305b3
Merge inbound to m-c a=merge despite the CLOSED TREE
2014-10-01 16:26:44 -07:00
Dão Gottwald
2cff510db7
Bug 1075069 - Backed out search term highlighting in the location bar (bug 1047469
). r=ttaubert
...
--HG--
extra : rebase_source : de556821938f8d11a30487bbef0fb28a1a9f7ec7
2014-10-01 20:33:56 +02:00
Jared Wein
352c896d30
Bug 1075697 - MozLoopService.hawkRequest is not properly reset. r=dmose
2014-10-01 14:24:07 -04:00
Nicolas Perriault
e1f1020688
Bug 1000240 - Added a Call Failed view for Loop standalone. r=Standard8
2014-10-01 15:16:05 +01:00
Carsten "Tomcat" Book
459781f902
Backed out changeset b30d47d94a85 (bug 1068671) for bc1 test failures
2014-10-01 13:14:06 +02:00
Carsten "Tomcat" Book
29fad8f0d6
Backed out changeset 5a6b95c47b55 (bug 1068671)
2014-10-01 13:12:13 +02:00
Gijs Kruitbosch
c7d764da67
Backed out changeset 3cc898b3ef5d (bug 1057166) for build bustage
...
--HG--
extra : rebase_source : 724c8cb9e4c021a523a58af7e2f53a23aaa1901a
2014-10-01 11:46:28 +01:00
Florian Quèze
8da2701539
Bug 1071626 - make the global WebRTC sharing indicators actually list the streams with e10s enabled, r=felipe.
2014-10-01 12:39:52 +02:00
Florian Quèze
1c771c5a6e
Bug 1074202 - The WebRTC urlbar sharing indicator gets confused if 2 iframes on the same page are using different devices, r=felipe.
2014-10-01 12:39:48 +02:00
Gijs Kruitbosch
22e6962ade
Bug 1057166 - move FHR reporting out of docshell and fix test to work in e10s, r=bz
2014-09-11 14:50:55 +01:00
Asaf Romano
eb24352288
Bug 1068671 - Fix review comment (comment 15 on the bug) and a couple of typos. r=mak
2014-10-01 12:59:11 +03:00
Asaf Romano
896f516dd7
Bug 1068671 - Remove 'read-only' folders support from places. r=mak
2014-10-01 12:19:06 +03:00
Erik Vold
afa2847351
Bug 1075211 - Remove the self hack from content/newtab/updater.js r=ttaubert
2014-09-30 23:42:03 +01:00
Wes Kocher
e271b31367
Merge m-c to fx-team a=merge
2014-09-30 17:13:45 -07:00
Wes Kocher
4912aa7261
Merge fx-team to m-c a=merge
2014-09-30 16:55:14 -07:00
Mark Banner
062a92d254
Bug 1074823 - Infinite ringing if the caller cancels the call in the 'connecting' state. Handle the initial state returned from the websocket. r=dmose
2014-09-30 23:06:34 +01:00
Mark Banner
122e4eddcd
Bug 972017 Part 2 - Set up actions and a dispatcher and start to handle obtaining call data for outgoing Loop calls from the desktop client. r=mikedeboer
2014-09-30 20:44:05 +01:00
Mark Banner
631b97c2df
Bug 972017 Part 1 - Add a new controller view for selecting between incoming and outgoing calls in the Loop Conversation window. Also, set up a bare-bones outgoing pending conversation view. r=mikedeboer
2014-09-30 20:44:04 +01:00
Neil Deakin
6c1e283ef7
Bug 1071771, disable dictionary list when it cannot be accessed from another process. This makes the context menu work again after using it on a misspelled word, r=mconley
2014-09-30 12:05:53 -04:00
Mike Conley
97117148cf
Bug 1069075 - Send location along with CTP messages. r=gfritzsche.
...
Before, we were comparing Principals sent up from PluginContent against the
Principal of the selected browser - this was in order to account for races
(and intermittent oranges) where the browser has moved away from a page before
a CTP message has been received by the parent.
Comparing Principals works beautifully, except in the case of Data URIs, since
Data URIs inherit the Principals of the page they were linked from. That means
that if we're on a page with a link to a Data URI that embeds a plugin, if we
quickly browse to that page and back before a CTP message reaches the parent,
when the CTP message finally arrives, the Principals will match. We solve this
by sending the location as well as the Principal, to do a final comparison if
the Principals do match.
--HG--
extra : rebase_source : 095706306d241a254f62b28527a96a427d7e55c3
extra : histedit_source : 3afe814271166f70afce6a423bbb7809c5a983c7
2014-09-28 11:01:29 -04:00
Mike Conley
c4006a26e4
Bug 1069075 - Fix race condition in flushing pluginData cache in PluginContent.jsm. r=gfritzsche.
...
--HG--
extra : rebase_source : 0a0c801e0a8802e0a8ae04ac34e9977576f64e1e
extra : histedit_source : 03138083b2ac0892c2d66898db918528dda01fe0
2014-09-26 17:17:36 -04:00
Ed Morley
1090f50427
Backed out changeset 0ec9bd8e9880 (bug 1044020) for asan failures
2014-09-30 17:35:44 +01:00
Gijs Kruitbosch
4cc11faace
Bug 1074498 - some of the panic button panel's labels don't wrap, r=jaws
2014-09-29 23:47:31 +01:00
Gijs Kruitbosch
ce29fa90bc
Bug 1065429 - fix tabbar border on yosemite, r=mconley
2014-09-30 12:55:27 +01:00
David Rajchenbach-Teller
33d73c6559
Bug 1044020 - Add the duration of shutdown phases to Telemetry. r=froydnj
2014-09-30 11:43:46 +02:00
Mihaela Velimiroviciu
ec54f075e2
Bug 947914 - Add test for the functionality of Panel Menu buttons in Australis. r=Gijs
2014-09-30 10:12:43 +03:00
Carsten "Tomcat" Book
c34fdca71b
Merge m-c to fx-team
2014-09-30 15:38:31 +02:00
Carsten "Tomcat" Book
b37ac43e39
merge fx-team to mozilla-central a=merge
2014-09-30 15:10:47 +02:00
Paolo Amadini
f559f84c07
Bug 1038257 - Desktop client needs the ability to delete, block, and unblock contacts. r=mikedeboer
2014-09-30 13:10:24 +01:00
Paolo Amadini
64d54f95ed
Bug 1038246 - Desktop client needs the ability to edit a contact locally. r=mikedeboer
2014-09-30 13:10:23 +01:00
Paolo Amadini
065886e1f1
Bug 1071633 - Add dropdown menu to contact buttons. r=mikedeboer
2014-09-26 13:53:54 -07:00
Dão Gottwald
16c4c6ad95
Bug 1073497 - Merge autocomplete-search.svg CSS rules. r=unfocused
2014-09-30 12:57:27 +02:00
Michael Pruett
06db6f98bd
Bug 1056871 - Remove workarounds for bug 687194 in tests. r=mconley
2014-09-28 21:52:25 -05:00
Camilo Viecco
886005b84a
Bug 787133 - (hpkp) Part 2/2. Tests r=keeler
2014-09-29 20:31:08 -07:00
Brian Grinstead
dc6e2e7d01
Bug 920141 - Add support for inspecting anonymous content. r=pbrosset
...
--HG--
rename : browser/devtools/styleinspector/test/browser_ruleview_pseudo-element.js => browser/devtools/styleinspector/test/browser_ruleview_pseudo-element_01.js
2014-09-29 09:29:00 +02:00
Phil Ringnalda
fe1673fc99
Backed out 2 changesets (bug 1070778, bug 1073846) for bc1 bustage
...
Backed out changeset c5f1d81d3849 (bug 1070778)
Backed out changeset b327a052e47f (bug 1073846)
--HG--
extra : rebase_source : 49d62043ba91398f370997868bba693ccc6d8251
2014-09-29 20:34:54 -07:00
Blair McBride
fcd3684965
Bug 1070778 - Selecting a moz-action: result then typing more can result in "Search X for moz-action:..." item. r=mak
...
--HG--
extra : transplant_source : P/b%9D%B6T%85%22%A8%1B%F0%18%3A%827%C2qx%F6%97
2014-09-30 13:56:06 +13:00
Mark Hammond
9a68dd9c53
Bug 1073855 - fix browser_datareporting_notification tests for dialog-based prefs. r=gfritzsche
2014-09-30 09:52:39 +10:00
Tim Taubert
3acbbbf2f6
Bug 1073993 - Tiny follow-up fix to allow disabling the preloader again r=me
2014-09-29 13:24:47 -07:00
Ryan VanderMeulen
c8d14e42a2
Merge m-c to fx-team. a=merge
2014-09-29 16:09:22 -04:00
Ryan VanderMeulen
2168d239a4
Merge b2g-inbound to m-c. a=merge
2014-09-29 15:55:33 -04:00
Matt Brubeck
5c19faccb1
Bug 731865 - Show blocked popups when clicking 'Allow popups' [r=florian]
2014-09-29 08:00:32 -07:00
Ryan VanderMeulen
ade52f2a46
Merge m-c to b2g-inbound. a=merge
...
CLOSED TREE
2014-09-29 10:46:00 -04:00
Ed Morley
33d7b690ac
Backed out changeset 49b1465d3e5e (bug 1044020) for compilation failures
2014-09-29 15:41:54 +01:00
Carsten "Tomcat" Book
369aa43021
Merge m-c to fx-team
2014-09-29 16:19:41 +02:00
Carsten "Tomcat" Book
9d31360549
merge mozilla-inbound to mozilla-central a=merge
2014-09-29 15:42:55 +02:00
J. Ryan Stinnett
baca5b6ac9
Bug 1073588 - Turn on local runtime. r=paul
2014-09-26 10:06:00 -04:00
Tim Taubert
f3504d9241
Bug 1020831 - Make SessionStore.jsm and SessionFile.jsm share the same run state r=yoric
2014-09-25 23:26:41 +02:00
Irving Reid
0628f512eb
Bug 1059674 - use AsynchShutdown.blocker() for AddonManager provider shutdown; r=unfocused
2014-09-27 16:25:47 -04:00
Wes Kocher
6d4ad0e657
Backed out changeset 4c48e36e05bb (bug 1000240) for marionette failures
2014-09-26 16:31:30 -07:00
David Rajchenbach-Teller
e3611bca94
Bug 1044020 - Add the duration of shutdown phases to Telemetry. r=froydnj
2014-09-25 17:19:34 +02:00
Iaroslav Sheptykin
4170243a35
Bug 1031298 - Add a histogram for counting unrecoverable sessions. r=yoric
2014-09-25 13:39:00 -04:00
Blair McBride
fb77cb6167
Backout 262b6ad34702 (bug 1070778) due to bc1 failures. r=backout
2014-09-30 02:38:29 +13:00
Blair McBride
3a7427d581
Bug 1070778 - Selecting a moz-action: result then typing more can result in "Search X for moz-action:..." item. r=mak
...
--HG--
extra : transplant_source : %2C%E3F%B4%B9%A9%3A%AD1s%1C%E3Y%C1S%DC%A1%99%DF%C2
2014-09-30 01:49:52 +13:00
Alex Bardas
36a5102144
Bug 1071164 - Display magnifying glass for search results in awesomebar (follow-up of bug 1040725). r=Unfocused
2014-09-27 16:58:00 +02:00
Tim Taubert
5a90497000
Bug 1073502 - Restore closed windows even when there are no open windows on startup r=yoric
2014-09-25 12:17:00 +02:00
Tim Taubert
c6d1a998a4
Backed out changeset c9ef2c9434b5 (bug 1071164)
2014-09-29 02:21:49 -07:00
Alex Bardas
9a278d54af
Bug 1071164 - Display magnifying glass for search results in awesomebar (follow-up of bug 1040725). r=Unfocused
2014-09-27 16:58:00 +02:00
Tomasz Kołodziejski
05c810463a
Bug 1032324 - about:newtab can't switch search engine if icon/logo/image is not available. r=adw
2014-09-26 09:37:00 +02:00
Gijs Kruitbosch
4a94538aa8
Bug 1069300 - add a privacy/forget/panic button, r=jaws
...
--HG--
extra : rebase_source : cc94c6449aab3fc64f7b034cb553cc6cf0879395
2014-09-24 17:22:05 +01:00
Brian R. Bondy
e45fecdbb6
Bug 1049521 - Fix users affected by bad file associations. r=rstrong
2014-09-27 21:35:52 -04:00
Brian R. Bondy
2c59af85e8
Bug 1049521 - Only register for types when there is no default in either of HKLM or HKCU. r=rstrong
2014-09-27 21:35:06 -04:00
Sami Jaktholm
5aaa48a0c8
Bug 1067287 - DevTools Timeline: Fix intermittent browser_timeline_overview-initial-selection-02.js failures due to very unlikely race condition. r=vp
...
--HG--
extra : rebase_source : 17d6eab31b44b0716ffb154a951637f4367deb0d
2014-09-25 21:01:00 -04:00
Gijs Kruitbosch
5036248b31
Bug 1069300 - update toolbar and menuPanel sprites, r=jaws
...
--HG--
extra : rebase_source : ad0a784a53630072cb3fada370916177f2169856
2014-09-24 16:24:17 +01:00
Nicolas Perriault
6733051ac9
Bug 1000240 - Add a Call Failed view for Loop standalone UI. r=Standard8
2014-09-26 23:10:08 +01:00
Justin Dolske
60a36be7d2
Bug 1072036 - UI Tour: Add ability to highlight new privacy button. r=mattn
2014-09-26 13:45:43 -07:00
Dão Gottwald
d9093f1361
Bug 1071821 - fullscr-toggler element needs to be hidden in DOM fullscreen. r=mconley
2014-09-26 21:22:55 +02:00
Dão Gottwald
ed26c5ef7c
Bug 1057030 - Make the themes panel footer buttons' background not clash with the panel's arrow. r=jaws
2014-09-26 20:53:22 +02:00
Ayush Mishra
6464e11b50
Bug 1072889 - Replace array.indexOf(...) != -1 with array.contains(...) in browser/base/ ; r=dao
2014-09-26 20:51:09 +02:00
Tim Taubert
b02f79669c
Bug 1073175 - Fix 'this.formatValue is not a function' errors r=dao
2014-09-26 17:45:33 +02:00
Sudheesh Singanamalla
0d1a8f9ebb
Bug 1054492: move DirectoryLinksProvider.jsm to browser/ since it's Firefox-specific, r=gavin
...
--HG--
rename : toolkit/modules/DirectoryLinksProvider.jsm => browser/modules/DirectoryLinksProvider.jsm
rename : toolkit/modules/tests/xpcshell/test_DirectoryLinksProvider.js => browser/modules/test/xpcshell/test_DirectoryLinksProvider.js
2014-09-22 13:23:19 +05:30
Tim Taubert
4e7529fdb4
Bug 1073993 - Let the BrowserNewTabPreloader initialize lazily when the first new tab is opened r=jaws
2014-09-20 15:31:10 +02:00
Gavin Sharp
d95e34b75a
Bug 1031019: add "Apps" toolbar button that points to Marketplace, r=jared/Gijs
...
--HG--
extra : rebase_source : 32c104884c9a6116efd3911d8145b61b8aa5711b
2014-09-19 12:36:11 -07:00
Gavin Sharp
b28f93cee8
Bug 1031018: Add a "Tools->Apps" menu item pointing to marketplace, r=MattN
...
--HG--
extra : rebase_source : f1ff6847c646dcba9d6001e79bb285ac35f27298
2014-09-18 15:20:38 -07:00
Robert Strong
e6dcf41620
Mac v2 signing - Bug 1071465 - old precomplete file is not removed on update. r=spohl
2014-09-29 11:52:48 -07:00
Robert Strong
c6f8b42f6d
Mac v2 signing - Bug 1070863 - The preprocessed channel-prefs.js file needs to be the same for each build. r=ted
2014-09-29 11:52:40 -07:00
Robert Strong
0ee5b4612e
Mac v2 signing - Bug 1070149 - Add explicit file removals for channel-prefs.js, update-settings.ini, and precomplete files. r=spohl
2014-09-29 11:52:36 -07:00
Robert Strong
e401342c35
Mac v2 signing - Bug 1059567 - Packaging changes for the move of removed-files file from Contents/MacOS to Contents/Resources. r=bbondy, r=nthomas
...
--HG--
rename : tools/update-packaging/test/from-mac/Contents/MacOS/application.ini => tools/update-packaging/test/from-mac/Contents/Resources/application.ini
rename : tools/update-packaging/test/from-mac/Contents/MacOS/distribution/extensions/diff/diff-patch-larger-than-file.txt => tools/update-packaging/test/from-mac/Contents/Resources/distribution/extensions/diff/diff-patch-larger-than-file.txt
rename : tools/update-packaging/test/from-mac/Contents/MacOS/extensions/diff/diff-patch-larger-than-file.txt => tools/update-packaging/test/from-mac/Contents/Resources/extensions/diff/diff-patch-larger-than-file.txt
rename : tools/update-packaging/test/from-mac/Contents/MacOS/readme.txt => tools/update-packaging/test/from-mac/Contents/Resources/readme.txt
rename : tools/update-packaging/test/from-mac/Contents/MacOS/removed.txt => tools/update-packaging/test/from-mac/Contents/Resources/removed.txt
rename : tools/update-packaging/test/from-mac/Contents/MacOS/same.txt => tools/update-packaging/test/from-mac/Contents/Resources/same.txt
rename : tools/update-packaging/test/from-mac/Contents/MacOS/searchplugins/diff/diff-patch-larger-than-file.txt => tools/update-packaging/test/from-mac/Contents/Resources/searchplugins/diff/diff-patch-larger-than-file.txt
rename : tools/update-packaging/test/from-mac/Contents/MacOS/update-settings.ini => tools/update-packaging/test/from-mac/Contents/Resources/update-settings.ini
rename : tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/channel-prefs.js => tools/update-packaging/test/from-mac/Contents/Resources/{foodir/channel-prefs.js
rename : tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/force.txt => tools/update-packaging/test/from-mac/Contents/Resources/{foodir/force.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/application.ini => tools/update-packaging/test/to-mac/Contents/Resources/application.ini
rename : tools/update-packaging/test/to-mac/Contents/MacOS/distribution/extensions/added/file.txt => tools/update-packaging/test/to-mac/Contents/Resources/distribution/extensions/added/file.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/distribution/extensions/diff/diff-patch-larger-than-file.txt => tools/update-packaging/test/to-mac/Contents/Resources/distribution/extensions/diff/diff-patch-larger-than-file.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/extensions/added/file.txt => tools/update-packaging/test/to-mac/Contents/Resources/extensions/added/file.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/extensions/diff/diff-patch-larger-than-file.txt => tools/update-packaging/test/to-mac/Contents/Resources/extensions/diff/diff-patch-larger-than-file.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/readme.txt => tools/update-packaging/test/to-mac/Contents/Resources/readme.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/removed-files => tools/update-packaging/test/to-mac/Contents/Resources/removed-files
rename : tools/update-packaging/test/to-mac/Contents/MacOS/same.txt => tools/update-packaging/test/to-mac/Contents/Resources/same.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/searchplugins/added/file.txt => tools/update-packaging/test/to-mac/Contents/Resources/searchplugins/added/file.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/searchplugins/diff/diff-patch-larger-than-file.txt => tools/update-packaging/test/to-mac/Contents/Resources/searchplugins/diff/diff-patch-larger-than-file.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/update-settings.ini => tools/update-packaging/test/to-mac/Contents/Resources/update-settings.ini
rename : tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/channel-prefs.js => tools/update-packaging/test/to-mac/Contents/Resources/{foodir/channel-prefs.js
rename : tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/force.txt => tools/update-packaging/test/to-mac/Contents/Resources/{foodir/force.txt
2014-09-29 11:52:04 -07:00
Steven Michaud
81d559a243
Mac v2 signing - Bug 1047738 - Make distribution code look for the distribution directory under Contents/Resources due to v2 signing requirements. r=bsmedberg
2014-09-29 11:51:51 -07:00
Stephen Pohl
579061de7c
Mac v2 signing - Bug 1060562 - Update xpcshell-tests for the new v2 bundle structure on OSX. r=jmaher
2014-09-29 11:51:29 -07:00
Stephen Pohl
f88b557bf2
Mac v2 signing - Bug 1060652
- Make mochitest harness work with the new bundle structure for v2 signatures on OSX. r=jmaher
2014-09-29 11:51:25 -07:00
Stephen Pohl
7959bd3a2b
Mac v2 signing - Bug 1050944 - Get Firefox to launch and run on OSX with the new .app bundle structure, made necessary by Apple's v2 signatures. r=smichaud, r=ted, sr=bsmedberg
2014-09-29 11:51:04 -07:00
Stephen Pohl
517f06ea2b
Mac v2 signing - Bug 1047584 - Modify the .app file structure to allow for OSX v2 signing. r=bsmedberg
2014-09-29 11:50:56 -07:00
Gijs Kruitbosch
5e105d364c
Bug 1063529 - should catch shell service exceptions, r=mconley
...
--HG--
extra : rebase_source : f21763b563cdf5ed7936085d6bdfdb706b53778d
2014-09-24 16:18:45 +01:00
Tim Taubert
6ba660fae6
Bug 1072814 - Emulate old Promise.defer() API for non-trivial cases r=yoric
2014-09-25 09:14:53 +02:00
Tim Taubert
ac9a92b4bf
Bug 1072814 - Fix SessionFile.jsm to use new Promise() API r=yoric
2014-09-25 04:51:37 +02:00
Tim Taubert
3bde457253
Bug 1072814 - Convert trivial Promise.defer() usages to new Promise() r=yoric
2014-09-25 10:06:07 +02:00
Paolo Amadini
5ced64fa0f
Bug 1000112 - Desktop client needs the ability to add a contact locally. r=mikedeboer
2014-09-26 15:38:17 +01:00
Tim Taubert
e39d1b656a
Bug 1072198 - updateBrowserRemoteness() needs to keep .permanentKey when updating browsers r=billm
2014-09-24 12:19:46 +02:00
Blair McBride
48ae4b40a5
Bug 1067899 - Add autocomplete result type for arbitrary URLs. r=mak
...
--HG--
extra : transplant_source : %B4%5C%83%26%B0%3EL%F1%B0%0E%B4%822y%E5%8B%0B%A4%01%3D
2014-09-27 01:17:25 +12:00
Carsten "Tomcat" Book
9f76561203
merge fx-team to mozilla-central a=merge
2014-09-26 13:27:36 +02:00
Ed Lee
cdbff486c6
Bug 1062256 - Improve the design of the »What is this« bubble on about:newtab [r=adw]
...
Move customize item to outside the panel. Update various panel styling: spacing, sizing, colors.
2014-09-24 21:41:22 -07:00
Mark Hammond
d28c156476
Bug 932651 - getClipboardData in specialpowersAPI uses the chrome window so it works in e10s. r=ted
2014-09-26 14:03:41 +10:00
Blair McBride
62fda02841
Bug 1067896 - Add autocomplete result type for searching via alias of a search engine. r=mak
...
--HG--
extra : transplant_source : %16%CB%E8%D5%3F%3D%B6%2C%90%1F%0F4%0B%1C%ED%DFvC%F1%28
2014-09-26 15:32:07 +12:00
Blair McBride
d31c4e8e2f
Bug 1072320 - Intermittent browser_action_searchengine.js | Test timed out - expected PASS. r=Mossop,mak
...
--HG--
extra : transplant_source : r%F0%95%94%5C%A4%A7%BE%28%0D%27J%A3E%12%8A%8CSN%91
2014-09-26 15:31:55 +12:00
Blair McBride
d240e00242
Bug 1067888
- Add autocomplete result type for searching via current search engine. r=mak
...
--HG--
rename : toolkit/components/places/tests/unifiedcomplete/test_searchEngine.js => toolkit/components/places/tests/unifiedcomplete/test_searchEngine_restyle.js
extra : transplant_source : n%86%86%E2%23%85d%15%A8%0D%DD%F0%9A%A4%8B%E8y-%3DY
2014-09-25 17:04:06 +12:00
Matthew Noorenberghe
7ab75c6059
Bug 1073047 - Add Firefox Account logging to MozLoopService. r=jaws
...
--HG--
extra : rebase_source : 1010a9157a46a16a28f1befa610716e00da3532a
2014-09-25 09:00:51 -07:00
Matthew Noorenberghe
28458a4760
Bug 1073027 - Control MozLoopService logging with a preference. r=jaws
...
--HG--
extra : rebase_source : 7ba5547518b480c4cab01835662066dab30b5122
2014-09-25 09:00:32 -07:00
Ryan VanderMeulen
e1727505c9
Merge m-c to fx-team. a=merge
2014-09-25 16:57:55 -04:00
Ryan VanderMeulen
f24dab74ce
Merge inbound to m-c. a=merge
2014-09-25 16:46:51 -04:00
Mark Banner
b7355ef3a6
Bug 1035846 Update the ToS link for the Loop panel. r=abr
2014-09-25 20:26:42 +01:00
Dave Townsend
8b46b5daab
Bug 999239: Copy session history when recreating browser element for the remote -> non-remote transition. r=bz, r=felipe, sr=gavin
2014-09-25 11:35:45 -07:00
Ryan VanderMeulen
8a931577a4
Backed out changesets b08e57dbef4e and 1049cfbf3426 (bug 947044) for various regressions.
2014-09-25 14:32:43 -04:00
J. Ryan Stinnett
3872c48e2b
Bug 1071586 - List WiFi device on WebIDE init. r=paul
2014-09-23 06:45:00 -04:00
Fernando Jiménez
87db739c9b
Bug 1008990 - Loop standalone UI should hand off to FxOS Loop client. r=dmose
2014-09-25 14:48:09 +02:00
Nicolas Perriault
57f7727fba
Bug 1072279 - Prevent unnecessary scrollbars in Loop conversation window. r=Standard8
2014-09-25 11:28:09 +01:00
Mark Hammond
a233d9155c
Bug 1058879 - enable most canvasdebugger tests in e10s. r=pbrosset
2014-09-25 17:54:54 +10:00
Tim Taubert
5963c4dcca
Bug 1071638 - Add test to ensure there are no uninterruptible reflows when loading about:newtab r=adw
2014-09-23 17:48:38 +02:00
Tim Taubert
e87a1a3ec8
Bug 1071635 - Get rid of uninterruptible reflows caused by checkSizing() and onPageFirstSized() r=adw
2014-09-23 19:08:56 +02:00
J. Ryan Stinnett
6bcacd1e1f
Bug 979536 - Part 5: Fix reopening graphics tools. r=vporof
2014-09-24 08:49:00 +02:00
J. Ryan Stinnett
6ec96fa315
Bug 979536 - Part 4: Fix reopening web audio tool. r=jsantell
2014-09-24 08:49:00 +02:00
J. Ryan Stinnett
07ae2753cc
Bug 979536 - Part 3: Fix reopening storage tool. r=mratcliffe
2014-09-24 08:48:00 +02:00
J. Ryan Stinnett
f98b53db2a
Bug 979536 - Part 2: Fix reopening timeline tool. r=vporof
2014-09-24 08:45:00 +02:00
J. Ryan Stinnett
60baca296f
Bug 979536 - Part 1: Look for leftover fronts after toolbox close. r=ochameau
2014-09-24 19:59:00 +02:00
Ed Lee
49d0aca648
Bug 1068181 - NEW Indicator for Pinned Tiles on New Tab Page [r=ttaubert]
...
Remove text styling and use an image instead with balanced spacing.
2014-09-24 22:11:07 -07:00
Tim Taubert
0abde01963
Bug 998267 - Don't always show the throbber when opening new tabs in e10s r=billm
2014-09-25 05:34:47 +02:00
Mark Hammond
00dbbebd81
Bug 1072141 - get browser/devtools/webaudioeditor tests passing in e10s. r=pbrosset
2014-09-25 12:23:39 +10:00
Ed Lee
c25e09e640
Bug 1070022 - Improve Contrast of Text on New Tab Page [r=adw]
2014-09-23 16:19:52 -07:00
Ed Lee
b97c29e9de
Bug 1071088 - Hover-area is cut off at the bottom of the tiles [r=adw]
...
Use the same hover css selector as others for title/shadow/border.
2014-09-23 15:54:35 -07:00
Ed Lee
ba84f1293f
Bug 1071822 - update the learn more link in the tiles intro popup [r=adw]
...
Add a separate const for separate links.
2014-09-23 14:01:49 -07:00
Ed Lee
47eeb17bdc
Bug 1064515 - update learn more link for sponsored tiles overlay [r=adw]
2014-09-23 13:59:27 -07:00
Adrian Aichner
b410f70bf5
Bug 1067141 - Scratchpad Open File uses fallbackCharsetList on UTF-8 NS_ERROR_ILLEGAL_INPUT. r=fitzgen
...
---
browser/devtools/scratchpad/scratchpad.js | 75 +++++++++++++++++--
.../scratchpad/test/NS_ERROR_ILLEGAL_INPUT.txt | 2 +
browser/devtools/scratchpad/test/browser.ini | 2 +
.../scratchpad/test/browser_scratchpad_open.js | 27 +++++++-
.../chrome/browser/devtools/scratchpad.properties | 4 +
5 files changed, 101 insertions(+), 9 deletions(-)
create mode 100644 browser/devtools/scratchpad/test/NS_ERROR_ILLEGAL_INPUT.txt
2014-09-24 16:13:03 -07:00
Ryan VanderMeulen
8dc16bd640
Merge m-c to fx-team. a=merge
2014-09-24 17:13:47 -04:00
Ryan VanderMeulen
240ed29614
Merge m-c to inbound. a=merge
...
CLOSED TREE
2014-09-24 16:08:33 -04:00
Dave Townsend
560eade216
Bug 1072118: Catch uncaught promise rejection from gmpInstallManager.simpleCheckAndInstall. r=netzen
2014-09-24 08:38:46 -07:00
Ed Morley
07451b5f48
Backed out changeset dcd7ac495365 (bug 1067888
) for failures in browser_action_searchengine.js; CLOSED TREE
2014-09-24 16:09:01 +01:00
Dão Gottwald
235766c522
Bug 1038990 - Add a border on both side of the tab bar when using a lightweight theme. r=gijs
2014-09-24 15:54:51 +02:00
Jim Mathies
167fdbfc99
Bug 1071709 - Don't register Pdf.js mime handlers twice in the parent, fix for startup perf regression. r=mconley
2014-09-24 04:22:25 -05:00
Alexandre Poirot
2d11fdb8f2
Bug 1067380 - Refactor webide to use app actor front. r=jryans
2014-09-24 08:21:00 -04:00
Mihaela Velimiroviciu
70f93767ad
Bug 1064280 - Add automated test for changing the URL in a pinned tab. r=dao
2014-09-24 10:21:57 +03:00
Alexandre Poirot
2163c86b40
Bug 1055666 - Remember last selected project in WebIDE. r=jryans
2014-09-24 05:31:00 -04:00
Mike Conley
4a1e8018d2
Bug 1070053 - Avoid spurious hidden-plugin notifications when changing locations by doing a Principal comparison. r=gfritzsche
...
When the PluginRemoved event is fired when changing locations, it's fired
asynchronously such that the document that the plugin belongs to has already
been unloaded. This was causing the hidden plugin notification to appear in
some cases when users browsed away from documents that had hidden plugins
in them. Now we pass the Principal for the unloading document back to the
parent and do a comparison with the current browser Principal to ensure
that they match before showing the hidden plugin notification.
--HG--
rename : browser/base/content/test/plugins/plugin_small.html => browser/base/content/test/plugins/plugin_small_2.html
extra : rebase_source : e748e3b09de77cc7796b1a78f8e39a23af64049a
2014-09-24 10:30:18 -04:00
Jordan Santell
4f423ddf06
Bug 1068372 - Disable web audio editor option in browser toolbox. r=vp
2014-09-23 12:30:00 -04:00
Mark Banner
4bb3785445
Bug 1066502 Remove the backbone router from the Loop conversation window, use a react view for control. r=nperriault
2014-09-24 14:25:30 +01:00
Neil Deakin
13dd244d56
Bug 1006040, animate star panel when pressing escape, add argument to hidePopup to allow indication of whether the popup is being cancelled or not, r=neil
2014-09-24 12:15:49 -04:00
Vicamo Yang
bdae0f605d
Bug 833229 - 2.b/4: build voicemail by default. r=smaug
2014-09-26 13:00:23 +08:00
Mark Banner
0bb934614c
Follow-up to bug 1035846 Add a slash onto the end of the url for the ToS Link on the Loop Standalone UI. rs=mikedeboer over irc DONTBUILD
2014-09-24 12:47:04 +01:00
Jan Odvarko
d9a930834a
Bug 1035707 - Implement new API for customizing webconsole logs; r=past
...
--HG--
extra : rebase_source : 9e002076e354a191cde65a0e4db2da3f35cf1270
2014-09-24 08:42:17 +02:00
Florian Quèze
d98c931c7d
Bug 1063957
- Menu listing device access by websites empty if string for device set missing, r=Gijs.
2014-09-24 12:21:58 +02:00
Florian Quèze
00255e4a06
Bug 1056179 - WebRTC global indicator fails to open the sharing doorhanger if there's another notification before it, r=gavin.
2014-09-24 12:21:57 +02:00
Florian Quèze
2aa2289817
Bug 1067444 - Clicking the microphone button on the global webrtc sharing indicator opens a doorhanger with a camera icon, r=gavin.
2014-09-24 12:21:57 +02:00
Carsten "Tomcat" Book
e1dea5ce12
Backed out changeset 6d9fb906e5b9 (bug 1072141) for dt test failures
2014-09-24 11:33:00 +02:00
Mark Hammond
1b68a32e86
Bug 1072173 - disable devtools webide test browser_tabs in e10s. r=jryans
2014-09-24 19:28:22 +10:00
Blair McBride
44d02cacf6
Bug 1067888
- Add autocomplete result type for searching via current search engine. r=mak
...
--HG--
rename : toolkit/components/places/tests/unifiedcomplete/test_searchEngine.js => toolkit/components/places/tests/unifiedcomplete/test_searchEngine_restyle.js
extra : transplant_source : t%CE%24%5D%2C%FF%18%CF%F5%21%BC%D0%C4%B9%EB%FD%06%F4%DB%BE
2014-09-24 18:33:07 +12:00
Mark Hammond
04b25f3ec8
Bug 1072141 - get browser/devtools/webaudioeditor tests passing in e10s. r=pbrosset
2014-09-24 17:47:41 +10:00
Alex Bardas
332c4fb2c9
Bug 1070138 - Send only version number and release channel in appinfo. r=gavin
2014-09-22 12:04:00 +02:00
Justin Dolske
4230e802f2
Bug 1068290 - "UI Tour: Add ability to highlight New Private Window icon in chrome". r=MattN
2014-09-23 16:36:00 +02:00
Jordan Santell
d94b50a890
Bug 1057042 - refactor front end of web audio editor. r=vp
2014-09-19 17:19:00 +02:00
Jordan Santell
917f9bfa8b
Bug 1055211 - Add bypass method on AudioNodeActors. r=vp
2014-09-19 15:08:00 +02:00
Jennifer Fong
278902825c
Bug 1055011 - Reduce error timeout. r=jryans
2014-09-19 15:11:00 +02:00
vladikoff
f3905cbf49
Bug 1071225 - Fix closing the FxAccountsOAuthClient tab with e10s. r=MattN
...
--HG--
extra : rebase_source : 5ffdd51c674dfc22ac301ab54b317b9219d8e07f
2014-09-23 17:57:00 -07:00
Jared Wein
4652d7a523
Bug 1071964 - openAndLoadSubDialog compares the injectedStylesheets against the owner document's stylesheets instead of the subdialog's stylesheets. r=MattN
2014-09-23 15:13:00 +12:00
Jared Wein
8e2181a223
Bug 1071835 - this._hawkRequestError is not a function in MozLoopService.hawkRequest. r=MattN
...
--HG--
extra : rebase_source : 530184d1445140f9629b76d0996dcee5b11712f1
2014-09-23 16:40:06 -04:00
Ryan VanderMeulen
4cd2d230f2
Backed out changeset 9debd2833863 (bug 1067888
) for mochitest-bc failures.
...
CLOSED TREE
--HG--
rename : toolkit/components/places/tests/unifiedcomplete/test_searchEngine_restyle.js => toolkit/components/places/tests/unifiedcomplete/test_searchEngine.js
2014-09-23 14:26:16 -04:00
Blair McBride
98c98f59f7
Bug 1067888
- Add autocomplete result type for searching via current search engine. r=mak
...
--HG--
rename : toolkit/components/places/tests/unifiedcomplete/test_searchEngine.js => toolkit/components/places/tests/unifiedcomplete/test_searchEngine_restyle.js
extra : transplant_source : %851%B0%7BmD%40w/%86%89%CA%AF%25%60k%FE%9Am%F7
2014-09-24 05:21:48 +12:00
Adam Roach [:abr]
47f62235b2
Bug 1066816 - Allow OT toolkit to set GUID for analytics r=Standard8
2014-09-16 06:46:11 -07:00
J. Ryan Stinnett
4059a451fe
Bug 1070430 - Resolve races with tab projects. r=paul
2014-09-22 04:28:00 -04:00
Manu Jain
c8d9cf3e90
Bug 1069980 - [rule view] Adding a new css rule on an element with multiple classes doesn't work. r=pbrosset
2014-09-22 07:20:00 -04:00
Jordan Santell
2ff4c3a1bc
Bug 1066450 - Fix regression of web audio tools not reinitializing after navigation. r=vp
2014-09-22 10:28:00 -04:00
Jordan Santell
3eea2d2196
Bug 1059930 - When adding an existing app, select the existing app, and show alert errors with more descriptive information. r=jryans
2014-09-22 11:11:00 -04:00
Mike de Boer
be6da9c5d1
Bug 1070045: shim contacts React classes when ES6 is not available in the browser used. r=Niko
2014-09-23 12:21:35 +02:00
Tim Taubert
5ccfa07bf9
Bug 1067173 - Bail out early if _resizeGrid() is called before the page has loaded f=Mardak r=adw
2014-09-20 20:41:18 +02:00
Tim Taubert
96fa1e7309
Bug 1071104 - Remove legacy "hasWrittenState" flag from SessionWorker r=yoric
2014-09-22 19:11:00 +02:00
Mark Hammond
d62e1dc202
Bug 1050080 - add default permissions for uitour and addon installations, and remove PermissionsUtils. r=MattN
2014-09-23 16:33:35 +10:00
Asaf Romano
464d71888d
Bug 1070503 - Async Places Transactions: Delete command implementation. r=mak.
2014-09-23 09:11:26 +03:00
Asaf Romano
69c77bc2a1
Bug 1070690 - Remove _setDetailsFieldsDisabledState and paneElementsBroadcaster. r=mak
2014-09-23 09:01:04 +03:00
Wes Kocher
33627a20f5
Merge m-c to fx-team a=merge
2014-09-22 19:03:15 -07:00
Wes Kocher
5a802aade4
Merge inbound to m-c a=merge
2014-09-22 18:54:14 -07:00
Mark Hammond
fb05df118d
Bug 1070839 - disable failing e10s devtools/framework tests. r=past/billm
2014-09-23 09:25:56 +10:00
Mark Hammond
6691f81377
Bug 1070835 - allow browser_toolbox_window_reload_target.js to work with e10s enabled. r=past
2014-09-23 09:22:06 +10:00
Mark Hammond
0c199441d6
Bug 1069033 - Make devtool's TabTarget be e10s friendly. r=past
2014-09-23 09:18:00 +10:00
Matthew Noorenberghe
50d52a8e4f
Bug 1065144 - Unhide Loop Firefox Account UI. r=standard8
...
--HG--
extra : rebase_source : 4f22f916201958f52d9bbbdb064641239da2277d
2014-09-22 14:43:54 -07:00
Matthew Noorenberghe
67ae5618a9
Bug 1071259 - Clear the loop.hawk-session-token.fxa pref on shutdown to workaround bug 1071247. r=jaws
...
--HG--
extra : rebase_source : 49df694bae7a03d07552a47615b2711d076b8f43
2014-09-22 14:43:41 -07:00
Victor Porof
4186b6779b
Bug 1061653 - Remote profiler doesn't work with old geckos, r=pbrosset
2014-09-22 16:34:06 -04:00
Ryan VanderMeulen
cae5eb937c
Merge m-c to inbound. a=merge
2014-09-22 15:51:51 -04:00
Ryan VanderMeulen
344138b126
Merge m-c to inbound. a=merge
2014-09-22 15:50:08 -04:00
Eric Rahm
856d592c2c
Bug 1069490 - Part 4: Update tests. r=past
2014-09-22 11:29:16 -07:00
Jim Mathies
400ffc72ca
Bug 942707 - Update the way PdfJs initializes in the browser. r=mconley
2014-09-22 11:33:29 -05:00
Paul Kerr [:pkerr]
03da4b2c81
Bug 1070065: MozLoopService.jsm xpcshell unit test for busy reject feature r=standard8
2014-09-19 17:01:09 -07:00
Ryan VanderMeulen
d2d882904d
Merge m-c to fx-team. a=merge
2014-09-22 15:56:28 -04:00
Gijs Kruitbosch
5010b21bb7
Bug 1065998 - empty-check Windows8WindowFrameColor's customizationColor in case its registry value is gone, r=jaws
...
--HG--
extra : rebase_source : 951b857c1590761c5453a95639931dd94b9a80ac
2014-09-18 13:58:07 +02:00
Felipe Gomes
74080ca6cb
Bug 1069640 - Prompt for input when users turn off e10s in Nightly. r=billm
2014-09-22 15:55:40 -03:00
Florian Quèze
2c53bdd401
Bug 973001 - getUserMedia UI doesn't work with e10s - fix browser_wa_properties-view-media-nodes.js test, r=paul.
2014-09-22 20:39:59 +02:00
Florian Quèze
1612f1e7c9
Bug 973001 - getUserMedia UI doesn't work with e10s - fix test, r=felipe.
2014-09-22 20:39:58 +02:00
Florian Quèze
783671ecaf
Bug 973001 - getUserMedia UI doesn't work with e10s - fix the permission requests, r=felipe.
2014-09-22 20:39:58 +02:00
Florian Quèze
0d58508a60
Bug 973001 - getUserMedia UI doesn't work with e10s - fix the urlbar indicators and show the global indicators, r=felipe.
2014-09-22 20:39:57 +02:00
Alexandre Poirot
719bb56ef7
Bug 1045660 - Remember last selected runtime in WebIDE. r=jryans
2014-09-18 07:27:00 -04:00
J. Ryan Stinnett
b47818167d
Bug 1045660 - Add type attribute to webide runtimes. r=paul
2014-09-17 09:49:00 -04:00
Nicolas Perriault
509a70bec1
Bug 974873 - Add feedback form to Loop standalone conversation window. r=Standard8
2014-09-22 13:40:57 +01:00
Carsten "Tomcat" Book
dab1cb48dc
Backed out changeset 4d9e5795ee82 (bug 1066450) for test failures
2014-09-22 12:26:54 +02:00
Georg Fritzsche
5e842d8b16
Bug 1051772 - Plugin whitelist request: Cisco VGConnect plugin. r=bsmedberg
2014-09-22 12:02:48 +02:00
Georg Fritzsche
3d13240cc5
Bug 1036693 - Plugin Whitelist Request: Novell iPrint Client. r=bsmedberg
2014-09-22 12:02:47 +02:00
Carsten "Tomcat" Book
1c343eac45
Backed out changeset c2e654ecbd50 (bug 1057042) for dt test failures
2014-09-22 10:35:48 +02:00
Jordan Santell
0e650aa020
Bug 1066472 - AudioParam connections in web audio editor should not appear clickable. r=vp
2014-09-15 10:45:00 +02:00
Jordan Santell
a043a2ff3c
Bug 1066450 - Fix regression of web audio tools not reinitializing after navigation. r=vp
2014-09-12 05:31:00 +02:00
Jordan Santell
61dc01bcbd
Bug 1057042 - refactor front end of web audio editor. r=vp
2014-09-19 17:19:00 +02:00
Mark Hammond
a8b560fc69
Bug 1065355 (part 2) - get shadereditor tests working in e10s. r=pbrosset
2014-09-22 09:07:49 +10:00
Mark Hammond
475f4bd3ec
Bug 1065355 (part 1) - get timeline tests working in e10s. r=pbrosset
2014-09-22 09:07:47 +10:00
Tim Taubert
33f1056501
Bug 1054099 - Remove use of gradients in new tab page r=dao
2014-09-20 13:04:08 +02:00
Asaf Romano
5786c4db38
Bug 1069235 - make guid and parentGuid naming consistent. r=mak
2014-09-20 10:57:34 +03:00
Blair McBride
91854111b0
Bug 1066358 - Improve how keyword autocomplete results are displayed. r=mak
...
--HG--
extra : transplant_source : %EC%9E%D7%F8%C7-%87%90%F67%8Ah8%1E%60%CCh%23%9F-
2014-09-20 15:44:36 +12:00
Paul Kerr [:pkerr]
ef754ed79e
Bug 1065155: Check both Hawk sessions when PushServer notification received. Record session type with call data. r=standard8
2014-09-19 14:35:37 -07:00
Paul Kerr [:pkerr]
7110846680
Bug 1032700: LoopService reject with reason = busy an incoming call when busy. r=standard8,MattN
2014-09-19 14:32:53 -07:00
Ryan VanderMeulen
3025ffa168
Bug 1064496 - Update pdf.js to version 1.0.801. r=yury, r=Mossop
2014-09-19 17:14:01 -04:00
Asaf Romano
f48a031b37
Bug 1067959 - Async Places Transactions: when copying an item, do not copy "special" annotations.r=mak
2014-09-19 23:35:14 +03:00
stefanh@inbox.com
daffe108da
Bug 333910 - nsITheme for menu/scrollbox arrows, r=mstange,gijs
...
--HG--
extra : rebase_source : 91519a5d22ab54b7b109b5db240ba7d696374270
2014-09-08 10:45:00 +01:00
Camilo Viecco
c2c7007b5f
Bug 787133 - (hpkp) Part 1/2. Header Parsing and interface within PSM. r=keeler, r=mcmanus
2014-09-03 10:24:12 -07:00
Jim Mathies
af9be8e2a8
Bug 1072417 - Remove the browser.tabs.remote pref and turn everything it controls on by default. r=felipe
2014-09-29 16:11:08 -05:00
Jim Mathies
0c802f536a
Bug 1074299 - Fix navbar shortcut dragging in e10s. r=gavin
2014-09-29 16:51:55 -05:00
Bill McCloskey
4465d2b3ff
Bug 1039528 - [e10s] Make "Inspect element" context menu item work (r=pbrosset)
2014-09-29 13:05:22 -07:00
Bill McCloskey
42e95291a1
Bug 1067576 - Make console.log work in frame scripts (r=Mossop)
2014-10-07 11:46:25 -07:00
Ryan VanderMeulen
cd3e8a6f73
Backed out 7 changesets (bug 1047483, bug 1079301, bug 1079335) for webplatform test failures.
...
Backed out changeset 7d06b68c44d0 (bug 1079335)
Backed out changeset 92030169528e (bug 1079301)
Backed out changeset c09d7f95554a (bug 1047483)
Backed out changeset c199f1057d7e (bug 1047483)
Backed out changeset 18830d07884c (bug 1047483)
Backed out changeset e087289ccfbb (bug 1047483)
Backed out changeset 6238ff5d3ed0 (bug 1047483)
CLOSED TREE
--HG--
rename : content/base/public/File.h => content/base/public/nsDOMFile.h
rename : content/base/src/MultipartFileImpl.cpp => content/base/src/nsDOMBlobBuilder.cpp
rename : content/base/src/MultipartFileImpl.h => content/base/src/nsDOMBlobBuilder.h
rename : content/base/src/File.cpp => content/base/src/nsDOMFile.cpp
2014-10-07 13:16:11 -04:00
Andrea Marchesini
d272279126
Bug 1047483 - patch 1 - Porting DOMFile/DOMBlob to WebIDL, r=bz, r=bkelly, r=bholley
2014-10-07 15:20:52 +01:00
Ashutosh Dhundhara
507c4b35ac
Bug 1008620 - Clearing history should also clear jump list cache on Windows. r=bbondy
2014-09-23 20:57:40 -04:00
Bevis Tseng
0ce3edef4c
Bug 864484 - Part 5: Build CellBroadcast by default. r=vyang, r=smaug, r=ted
...
--HG--
extra : rebase_source : 73dcc868004c3e34c51806a34f88d25fc6c4c7c6
2014-08-25 17:24:03 +08:00
Robert Strong
16e9936bb9
Bug 1070988 - Windows installer should remove leftover chrome.manifest on pave over install to prevent startup crash with Firefox 32 and above with unpacked omni.ja. r=tabraldes
2014-09-24 00:33:58 -07:00
Bobby Holley
0a4400066c
Bug 1030420 - QI the pref service to the appropriate interface. r=billm
...
nsIPrefService and nsIPrefBranch are implemented by the same XPCOM object, but
getBranch lives on nsIPrefService rather than nsIPrefBranch. The bug here is
only noticeable if nobody has already QIed the per-scope-singleton object to
nsIPrefService. If we create two scopes where there previously was one, that's
more likely to be the case, and manifest itself as the bc1 orange we see on TBPL.
2014-09-24 09:17:34 +02:00
Ryan VanderMeulen
93d73ce5fb
Merge m-c to fx-team.
...
--HG--
rename : content/media/mediasource/SourceBuffer.cpp => content/media/mediasource/ContainerParser.cpp
extra : rebase_source : 8e7ce8e6b3b7dd41e6691465e6e65437d694a3ab
2014-09-19 14:19:13 -04:00
Ryan VanderMeulen
b41ea27ac0
Merge fx-team to m-c. a=merge
2014-09-19 14:10:43 -04:00
Asaf Romano
268a8a3563
Fix the 'bustage' of browser_parsable_script.js coming from bug 1067954 by whitelisting controller.js. It broke due to bug 1015578 (see mak's comment 2 there). CLOSED TREE
2014-09-19 18:23:20 +03:00
Mike de Boer
094e8228cc
Bug 1069965: add a visual separator between available and blocked contacts. r=paolo
2014-09-19 17:02:03 +02:00
Mike de Boer
e32dcdb16e
Bug 1069962: add support for Gravatar avatars. r=paolo
2014-09-19 17:02:00 +02:00
Mike de Boer
193cc7225e
Bug 1000766: add a contacts list to the Loop contacts tab. r=Niko,Standard8,paolo
2014-09-19 17:01:58 +02:00
Asaf Romano
00c2d6bc3f
Bug 1067956 - Async Places Transactions: Drop functionality. r=mak.
2014-09-19 17:04:51 +03:00
Asaf Romano
0493c2157b
Bug 1067954 - Async Places Transactions: Paste functionality. r=mak
2014-09-19 16:53:27 +03:00
Victor Porof
424f4358f9
Bug 1061772 - Profiler cost percentage should be calculated based on number of samples and not samples delta time, r=pbrosset
2014-09-19 08:55:54 -04:00
Victor Porof
ec5c51bd76
Bug 1061759 - Profiler 'calls' columns is improperly named, r=pbrosset
2014-09-19 08:55:53 -04:00
Carsten "Tomcat" Book
17b6861fc2
Merge m-c to mozilla-inbound
2014-09-19 14:35:57 +02:00
Blair McBride
9de8c71e4e
Bug 1065303 - Prepare autocomplete.xml/UnifiedComplete for adding new special result types and heuristics. r=mak
...
--HG--
extra : transplant_source : %96%27%20FGCQ%D9%B5%FC%8E%CAV%F3%80%5DN%88%0F.
2014-09-19 23:58:46 +12:00
Victor Porof
c33b635061
Bug 1066086 - Attempt to fix intermittent browser_timeline_waterfall-generic.js by checking if marker sidebar or waterfall nodes aren't spacers. r=vporof
2014-09-18 14:20:43 -04:00
Alex Bardas
cc17d5b170
Bug 1063698 - Add action to UITour.jsm for opening the Reset Firefox dialog. r=Unfocused
2014-09-17 14:58:00 +02:00
Pablo Terradillos
3911a75096
Bug 913711 - Added methods for finding manifest and updates project location if necessary. r=pablo
2014-09-18 08:14:00 +02:00
Mike Conley
11e4975e65
Bug 1069567 - [e10s] Make remote browser contentPrincipals not be CPOWs. r=billm.
...
--HG--
extra : rebase_source : 4f47430a2ff95737e579ddca1655d410656bb64a
2014-09-18 19:26:50 -04:00
Wes Kocher
8ea80bdb82
Merge m-c to fx-team a=merge
2014-09-18 16:12:56 -07:00
Wes Kocher
45f4500903
Merge inbound to m-c a=merge
2014-09-18 15:26:44 -07:00
Matthew Noorenberghe
592c049281
Bug 1047667 - Unregister logged in user from the Loop server upon logout. r=jaws
2014-09-18 13:53:44 -07:00
Jared Wein
44294c5842
Bug 1047181 - Change the Loop toolbar button when FxA sign in completes. r=MattN
2014-09-18 16:14:44 -04:00
Wes Kocher
d5de15a742
Backed out changeset 5710731f09e9 (bug 1047181) for bc1 orange
2014-09-18 14:47:24 -07:00
Wes Kocher
72aa296bbf
Backed out changeset 43b24197d25a (bug 1047667) to cleanly backout 1047181
2014-09-18 14:46:57 -07:00
Iaroslav Sheptykin
db3ed9977b
Bug 620565 - Proper handling of question mark in the action field of a form when creating a search keyword bookmark. r=MattN
2014-09-18 13:54:04 -07:00
Matthew Noorenberghe
9624fb6f0e
Bug 1047667 - Unregister logged in user from the Loop server upon logout. r=jaws
2014-09-18 13:53:44 -07:00
Jared Wein
497dd662ca
Bug 1047181 - Change the Loop toolbar button when FxA sign in completes. r=MattN
...
--HG--
extra : rebase_source : e0821ac3fdb8e5840ef241f24c4d9e675388dbf3
2014-09-18 16:14:44 -04:00
Dan Mosedale
43a1089bce
Bug 1065153 - Support call URLs with guest or FxA hawk session types, r=MattN
2014-09-18 10:40:35 -07:00
Bill McCloskey
601c277e33
Bug 1063669 - Don't enable e10s if IME is detected (r=jimm)
2014-09-18 10:26:33 -07:00
Justin Dolske
c80af2ab0d
Bug 836415 - Kill PFS. r=bsmedberg
2014-09-18 10:01:23 -07:00
Panos Astithas
2eed89179b
Don't set tracing hooks until tracing has started (bug 1049248). r=fitzgen
2014-09-17 20:00:40 +03:00
Paolo Amadini
a24d21503f
Bug 1059186 - Client needs to report number of generated URLs via Telemetry. r=MattN
2014-09-18 13:05:39 +01:00
Jennifer Fong
975f81ae39
Bug 1062204 - Make pictures scrollable. r=jryans
2014-09-16 16:01:00 -04:00
Gijs Kruitbosch
06493e0af6
Bug 990045 - focusNextFrame should special-case panels and notificationpopups, with the latter getting noautofocus by default, r=Enn, f=MarcoZ
...
--HG--
extra : rebase_source : a0fe3fba430301560433db3dbb825d5bbd7bfb9b
2014-09-18 13:29:03 +02:00
Mark Banner
240fe3f9ac
Bug 1066609 Various Loop xpcshell tests will perma-fail when Gecko 35 merges to beta (turn off throttling for tests). r=abr
2014-09-18 10:45:38 +01:00
Mark Banner
52e8706507
Bug 1069178 Drop some old references to serverUrl/baseServerUrl in Loop desktop code. r=mikedeboer
2014-09-18 10:45:38 +01:00
Mike de Boer
7725c505dc
Bug 1053774: fix test failures. rs=bustage,Standard8
2014-09-18 11:28:43 +02:00
Mark Hammond
a1b6b8155b
Bug 1063845 - Fix remaining style inspector e10s tests. r=pbrosset
2014-09-18 19:18:25 +10:00
Mike de Boer
e1b2f55dc1
Bug 1053774: use nsIExternalProtocolService to send emails. r=MattN
2014-09-18 10:52:05 +02:00
Alex Bardas
84af797cbe
Bug 1065525 - Determine user's Firefox version from UITour. r=MattN
2014-09-17 23:05:00 +02:00
Drew Willcoxon :adw
adfedbd7d8
Bug 1068852 - Highlight search suggestions on hover/mouseover. r=MattN
2014-09-17 13:37:00 +02:00
Alex Bardas
e198245b30
Bug 1043805 - Add tests for checking mixedblockdisabled and trackingblockdisabled attributes. r=adw
2014-09-17 10:39:00 +02:00
Tim Taubert
b2343a0b63
Bug 1067648 - Introduce restoreTab() and use it from restoreTabs() r=billm
2014-09-16 12:04:34 +02:00
Alex Bardas
a061476e64
Bug 1043805 - Added red shield when protection is disabled in blocked content doorhanger. r=Unfocused
2014-09-11 15:13:00 +02:00
Ryan VanderMeulen
72ff2b430b
Merge inbound to m-c. a=merge
...
CLOSED TREE
2014-09-17 22:10:31 -04:00
Mike Conley
6aecdba124
Bug 899347 - [e10s] Make click-to-play work with e10s. Originally written by mbrubeck. r=gfritzsche,felipe,Unfocused.
...
We now use message passing and content scripts in order to implement click-to-play. This allows
us to use click-to-play in e10s windows.
--HG--
extra : rebase_source : 6239a4b49e0af89800c5618e4589f8aef03f58d4
2014-09-17 16:06:58 -04:00
Felipe Gomes
5723c50a02
Bug 1068210 - Make the tab crashed Try Again button reload only the selected tab. r=ally
...
This is a temporary solution while we wait for bug 1065785 because this is causing many users to lose their session
2014-09-17 18:32:27 -03:00
Ryan VanderMeulen
31a808729a
Merge m-c to fx-team on a CLOSED TREE.
2014-09-17 16:38:12 -04:00
Jim Mathies
868cb823ab
Follow up for back out of bug 1047603, disable browser_social_flyout.js test that's failing in e10s. a=RyanVM CLOSED TREE
2014-09-17 15:28:36 -05:00
Dão Gottwald
42e85fd020
Bug 1060623 - Theme switcher in customize mode should only show the five most recently used lightweight themes. r=jaws
2014-09-17 21:41:35 +02:00
Ryan VanderMeulen
8bb5dfdcf0
Merge inbound to m-c. a=merge
2014-09-17 14:38:33 -04:00
Ryan VanderMeulen
6353009054
Backed out changesets 1e0e069b5cc7 and dc6a44c16a37 (bug 1047603) for causing bug 1067164. a=me
2014-09-17 14:19:58 -04:00
Drew Willcoxon
e8554ec8fc
Bug 1060888 - Autocomplete drop down list item should not be copied to the search fields when mouse over the list item. r=MattN
2014-09-17 09:11:06 -07:00
Drew Willcoxon
405a49873c
Bug 1066794 - Make the search suggestions popup on about:home/about:newtab more consistent with the main search bar's popup. r=MattN
2014-09-17 09:11:04 -07:00
Iaroslav Sheptykin
ea9fb10a76
Bug 407821 - Discard bookmark tags exceeding maximum length of 100 characters. r=paolo
2014-09-17 06:23:00 +01:00
Paolo Amadini
d693bf1ed2
Bug 1066509 - Tests for the tab view in the desktop client panel. r=mikedeboer
2014-09-17 16:42:16 +01:00
Benjamin Smedberg
acc347853a
Bug 1063052 - in case a user ends up with unpacked chrome, on update use omni.ja again by removing chrome.manifest, r=rstrong r=glandium sr=dbaron
2014-09-17 11:21:14 -04:00
Mark Banner
7cea7b4552
Follow-up to bug 1044411, fix the Loop standalone .gitignore file to properly exclude index.html. rs=mikedeboer over irc. NPOTB DONTBUILD
2014-09-17 14:18:25 +01:00
Asaf Romano
25f9c66641
Bug 1058566 - Transaction for duplicating any places item. r=mak.
2014-09-17 14:59:23 +03:00
Chris Adams
0bbc5b3517
Bug 1066101 - Use correct date for screen shot filename in Responsive Design View. r=jryans
...
The filename previously used the numeric day of the week instead of the day of
the month.
2014-09-11 11:32:11 -04:00
Ryan VanderMeulen
e5cbd10e82
Merge m-c to fx-team. a=merge
2014-09-17 14:46:28 -04:00
Mark Banner
f9cc5843b4
Bug 1067937 Fix translation of Loop's link-clicker UI in Google Chrome. r=dmose
...
--HG--
rename : browser/components/loop/standalone/content/libs/l10n-gaia-4e35bf8f0569.js => browser/components/loop/standalone/content/libs/l10n-gaia-02ca67948fe8.js
2014-09-17 19:23:31 +01:00
Mark Banner
f183a0d728
Bug 1035846 Update the ToS link for the Loop standalone UI. r=dmose
2014-09-17 19:23:31 +01:00
Mark Banner
fb77c1b4aa
Bug 1068580 Remove the backbone router from the Loop panel. r=nperriault
2014-09-17 19:23:30 +01:00
Mark Banner
afb468ac88
Bug 1066567 Part 2. Rename some old variables in the Loop OutgoingConversationView. r=nperriault
2014-09-17 19:23:30 +01:00
Mark Banner
8f4b739e62
Bug 1066567 Part 1. Stop use of the backbone router in the standalone UI to simplify code. The views now exclusively manage what is displayed according to state. r=nperriault
2014-09-17 19:23:29 +01:00
Alex Bardas
a14dc9af73
Bug 1063115 - Grey out text for mixed content and tracking protection if the corresponding type has been disabled. r=Unfocused r=dao
2014-09-16 17:57:00 +02:00
Bill McCloskey
5fc0c1ce2e
Bug 1066645 - [e10s] Fix isWindowPrivate call in about:home search (r=ttaubert)
2014-09-18 08:56:56 -07:00
Richard Marti
9aad4d102e
Bug 1055873 - Move the -moz-user-select back to incontent-preferences. r=MattN
2014-08-31 22:53:39 +02:00
Mark Hammond
cf3f6bc618
Bug 1053969 - get more social tests working with e10s. r=mixedpuppy
2014-09-17 14:52:44 +10:00
Wes Kocher
b894fd14c0
Merge m-c to fx-team a=merge
2014-09-16 17:23:36 -07:00
Wes Kocher
a9c70dde1f
Merge b2g-inbound to m-c a=merge
2014-09-16 16:22:16 -07:00
Ehsan Akhgari
7db5ff7a85
Bug 1067514 - Don't attempt to capture a tab preview in e10s; r=dao
2014-09-16 19:03:59 -04:00
Fabrice Desré
36c490fef2
Bug 1059194 - Trusted Hosted Apps, part 0: Add support in browser developer tools. r=fabrice
2014-09-16 13:14:01 -07:00
Ryan VanderMeulen
6e190d1428
Backed out changeset ae6de471bcd7 (bug 1058566) for causing bug 1067978.
2014-09-16 15:41:27 -04:00
Dan Mosedale
9af4492a29
Bug 1068178 - Fix Loop functional test bustage, rs=Standard8, NPOTB, so DONTBUILD
2014-09-16 11:47:39 -07:00
Panos Astithas
bfa09dd2b8
Use the devtools style for the scratchpad statusbar (bug 1067827). r=fitzgen
2014-09-16 21:11:02 +03:00
Jared Wein
35d61aae2c
Bug 1047146 - Add current username to the Loop panel footer. r=mattn r=niko
...
--HG--
extra : rebase_source : ba9f55a9a28d1a4df6284582ded6d761e269d5cf
2014-09-11 15:36:14 -04:00
Ryan VanderMeulen
c0b6c35cc7
No bug - Revert browser-plugins.js to revision 687318d464a5. a=me
2014-09-15 23:20:24 -04:00
Nigel Babu
1da2de4cb7
Merge fx-team to m-c with bustage fix, a=merge
2014-09-16 08:43:45 +05:30
Shu-yu Guo
3eee564f75
Bug 1001090 - Followup: fix merge error in browser-plugins.js on a CLOSED TREE. r=bustage
2014-09-15 18:23:03 -07:00
Paul Rouget
74a61ca53e
Bug 1045647 - register webide components in package-manifest.in. r=jryans
2014-09-15 17:18:23 -07:00
Adrian Aichner
8249f4c96a
Bug 1064282 - Scratchpad should have statusbar like Page Source viewer. r=fitzgen
...
---
browser/devtools/scratchpad/scratchpad.js | 12 ++++++++++++
browser/devtools/scratchpad/scratchpad.xul | 1 +
.../test/browser_scratchpad_run_error_goto_line.js | 11 +++++++++++
.../chrome/browser/devtools/scratchpad.properties | 5 +++++
4 files changed, 29 insertions(+), 0 deletions(-)
2014-09-15 17:18:16 -07:00
Wes Kocher
6e187f49f8
Merge m-c to inbound a=merge
2014-09-15 16:41:45 -07:00
Shu-yu Guo
59ccd2fecb
Bug 1001090 - Part 5: Fix errors in tests throughout the tree. (r=robcee,gavin)
2014-09-15 16:30:47 -07:00
Shu-yu Guo
15262d36a9
Bug 1001090 - Part 4: Fix errors in chrome code. (r=zombie,gavin,fitzgen,dcamp,bgrins,fabrice,gwagner,margaret,mrbkap,mak,njn,vicamo)
2014-09-15 16:30:46 -07:00
Wes Kocher
293eb7ac77
Merge fx-team to m-c a=merge
2014-09-15 16:24:37 -07:00
Wes Kocher
af54eff00f
Merge inbound to m-c a=merge
2014-09-15 15:18:28 -07:00
Chris Cooper
db0e21c929
Backed out changeset f763f26a2f35 - a=blocklist-update
2014-09-15 17:49:04 -04:00