Commit Graph

25373 Commits

Author SHA1 Message Date
Erik Vold
5573946a7a Bug 1075211 - Remove the self hack from content/newtab/updater.js r=ttaubert 2014-09-30 23:42:03 +01:00
Wes Kocher
034e6af469 Merge m-c to fx-team a=merge 2014-09-30 17:13:45 -07:00
Wes Kocher
c3dfb064c8 Merge fx-team to m-c a=merge 2014-09-30 16:55:14 -07:00
Mark Banner
d1632dc85c 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
3ef399e7fb 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
b86a73008f 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
238bcbb268 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
52676fa9cc 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
7cec4260d1 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
cbc58aea59 Backed out changeset 0ec9bd8e9880 (bug 1044020) for asan failures 2014-09-30 17:35:44 +01:00
Gijs Kruitbosch
a88057ff3d 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
e5ed5a63c2 Bug 1065429 - fix tabbar border on yosemite, r=mconley 2014-09-30 12:55:27 +01:00
David Rajchenbach-Teller
1fd3e2ade6 Bug 1044020 - Add the duration of shutdown phases to Telemetry. r=froydnj 2014-09-30 11:43:46 +02:00
Mihaela Velimiroviciu
960a22c6b3 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
31e6dd4408 Merge m-c to fx-team 2014-09-30 15:38:31 +02:00
Carsten "Tomcat" Book
1f82b2fb58 merge fx-team to mozilla-central a=merge 2014-09-30 15:10:47 +02:00
Paolo Amadini
fbaad1dfd4 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
40c8ab7975 Bug 1038246 - Desktop client needs the ability to edit a contact locally. r=mikedeboer 2014-09-30 13:10:23 +01:00
Paolo Amadini
327b8e1803 Bug 1071633 - Add dropdown menu to contact buttons. r=mikedeboer 2014-09-26 13:53:54 -07:00
DĂŁo Gottwald
54e845e00c Bug 1073497 - Merge autocomplete-search.svg CSS rules. r=unfocused 2014-09-30 12:57:27 +02:00
Michael Pruett
1e54b96268 Bug 1056871 - Remove workarounds for bug 687194 in tests. r=mconley 2014-09-28 21:52:25 -05:00
Camilo Viecco
836f2a96a1 Bug 787133 - (hpkp) Part 2/2. Tests r=keeler 2014-09-29 20:31:08 -07:00
Brian Grinstead
03ce1f7e86 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
413f3a0505 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
bf25d2da6e 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
daf46102ef Bug 1073855 - fix browser_datareporting_notification tests for dialog-based prefs. r=gfritzsche 2014-09-30 09:52:39 +10:00
Tim Taubert
8129932975 Bug 1073993 - Tiny follow-up fix to allow disabling the preloader again r=me 2014-09-29 13:24:47 -07:00
Ryan VanderMeulen
7420c8422d Merge m-c to fx-team. a=merge 2014-09-29 16:09:22 -04:00
Ryan VanderMeulen
b8afeaae1d Merge b2g-inbound to m-c. a=merge 2014-09-29 15:55:33 -04:00
Matt Brubeck
58910b249d Bug 731865 - Show blocked popups when clicking 'Allow popups' [r=florian] 2014-09-29 08:00:32 -07:00
Ryan VanderMeulen
dbdc908a0f Merge m-c to b2g-inbound. a=merge
CLOSED TREE
2014-09-29 10:46:00 -04:00
Ed Morley
1328e410b0 Backed out changeset 49b1465d3e5e (bug 1044020) for compilation failures 2014-09-29 15:41:54 +01:00
Carsten "Tomcat" Book
2694b0e4e3 Merge m-c to fx-team 2014-09-29 16:19:41 +02:00
Carsten "Tomcat" Book
203c114322 merge mozilla-inbound to mozilla-central a=merge 2014-09-29 15:42:55 +02:00
J. Ryan Stinnett
d3ac0a2acc Bug 1073588 - Turn on local runtime. r=paul 2014-09-26 10:06:00 -04:00
Tim Taubert
af8086b081 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
338bc024ab Bug 1059674 - use AsynchShutdown.blocker() for AddonManager provider shutdown; r=unfocused 2014-09-27 16:25:47 -04:00
Wes Kocher
fb1ba03717 Backed out changeset 4c48e36e05bb (bug 1000240) for marionette failures 2014-09-26 16:31:30 -07:00
David Rajchenbach-Teller
c108bf9ae8 Bug 1044020 - Add the duration of shutdown phases to Telemetry. r=froydnj 2014-09-25 17:19:34 +02:00
Iaroslav Sheptykin
4a233fee1e Bug 1031298 - Add a histogram for counting unrecoverable sessions. r=yoric 2014-09-25 13:39:00 -04:00
Blair McBride
2c1d123c25 Backout 262b6ad34702 (bug 1070778) due to bc1 failures. r=backout 2014-09-30 02:38:29 +13:00
Blair McBride
8fe7812caf 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
931abd5311 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
150dfea66e 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
a8ed4971b4 Backed out changeset c9ef2c9434b5 (bug 1071164) 2014-09-29 02:21:49 -07:00
Alex Bardas
b3b8fce582 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
4c4fa7a34f 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
ef3d69de82 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
7db382662a Bug 1049521 - Fix users affected by bad file associations. r=rstrong 2014-09-27 21:35:52 -04:00
Brian R. Bondy
3524b8c9d3 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