Commit Graph

25409 Commits

Author SHA1 Message Date
Ryan VanderMeulen
990ae72de0 Merge m-c to inbound. a=merge 2014-10-02 13:14:06 -04:00
Ryan VanderMeulen
9e879e02d8 Merge fx-team to m-c. a=merge 2014-10-02 13:00:31 -04:00
Mike de Boer
84fc2dc6c3 Bug 1074547: improve rendering flow of contacts list. r=Niko 2014-10-02 12:59:43 +02:00
Mike de Boer
de69c7b8a1 Bug 1069816: Enable import button in the contacts list. r=abr 2014-10-02 12:37:43 +02:00
Mike de Boer
3de92ffd8d Bug 1069816: add unit tests for the GoogleImporter class. r=abr 2014-10-02 12:37:41 +02:00
Mike de Boer
b7328204e1 Bug 1069816: implement Google contacts import class. r=abr 2014-10-02 12:37:38 +02:00
Mike de Boer
fdbf67f60c Backed out changeset b26c709330d6 (bug 1069962). r=paolo. 2014-10-01 15:51:50 +02:00
Robert Strong
b67610d419 Mac v2 signing - Bug 1076370 - Fix Firefox.app l10n repacks for Mac v2 signing. r=jmaher 2014-10-02 09:12:36 -07:00
Till Schneidereit
9f0c7267f9 Bug 1075059 - Part 1: Backout of Array.prototpype.contains usages. r=me
--HG--
extra : rebase_source : c40bca2849fdfee824560253c7ffe8fb93f9b774
2014-10-02 17:37:48 +02:00
J. Ryan Stinnett
370fda5da0 Bug 989168 - Disable browser_manifest_editor. r=jryans 2014-10-01 05:24:00 +02:00
J. Ryan Stinnett
1d8ef2c6d4 Bug 916804 - Telemetry for WebIDE. r=mratcliffe,paul 2014-10-01 16:04:00 +02:00
Nick Fitzgerald
2a439ec2f3 Bug 915426 - Don't store debugging data in the global scope. r=ejpbruel 2014-10-01 07:45:00 +02:00
Mark Banner
49765267b9 Follow-up to bug 1000240 Fix the generated conversation.js file, missed during bitrot. rs=nperriault 2014-10-02 08:55:56 +01:00
Gijs Kruitbosch
44b9bce3a0 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
cbbedf9884 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
df5a4068bc 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
bcf27cee21 No bug - Change tabs to spaces in MozLoopPushHandler.jsm r=me DONTBUILD 2014-10-01 20:02:09 -04:00
Mark Hammond
6238930d82 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
e12565592e Merge inbound to m-c a=merge despite the CLOSED TREE 2014-10-01 16:26:44 -07:00
Dão Gottwald
485f673c17 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
487dd73ae3 Bug 1075697 - MozLoopService.hawkRequest is not properly reset. r=dmose 2014-10-01 14:24:07 -04:00
Nicolas Perriault
33cb7c2cbd Bug 1000240 - Added a Call Failed view for Loop standalone. r=Standard8 2014-10-01 15:16:05 +01:00
Carsten "Tomcat" Book
29d7d7a356 Backed out changeset b30d47d94a85 (bug 1068671) for bc1 test failures 2014-10-01 13:14:06 +02:00
Carsten "Tomcat" Book
33c4a5d9c2 Backed out changeset 5a6b95c47b55 (bug 1068671) 2014-10-01 13:12:13 +02:00
Gijs Kruitbosch
d8e3e20495 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
ea6a65d232 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
a0cbe44ac9 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
9db078a24b 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
f4eb33eb12 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
6860a7fd03 Bug 1068671 - Remove 'read-only' folders support from places. r=mak 2014-10-01 12:19:06 +03:00
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