Nicolas Perriault
671908ff16
Bug 1033841: Ported Loop panel views to React. r=Standard8
2014-07-04 17:08:55 +01:00
Nicolas Perriault
c3ab34545d
Bug 1033841: Added react 0.10.0 to loop shared libs. r=dmose
2014-07-04 17:08:54 +01:00
Ryan VanderMeulen
8c67d36a18
Merge m-c to fx-team. a=merge
2014-07-03 17:07:17 -04:00
Ryan VanderMeulen
9698c53e85
Merge inbound to m-c. a=merge
2014-07-03 17:03:48 -04:00
Bernardo P. Rittmeyer
4c5adb9545
Bug 1023339 - Fixed in-content preferences clickable areas width to cover only the element and its label. r=mconley
2014-07-03 13:59:08 -04:00
Mike Conley
3ccdee6887
Backout ba704d0b0b09 (Bug 1023339) because there was a much better way to pull this off.
2014-07-03 13:58:26 -04:00
Andrei Oprea
e175569bea
Bug 1015891 Implement ToS and privacy notice links for Loop. r=dmose
2014-07-03 15:22:09 +01:00
Mark Banner
533e623513
Bug 1032741 Adapt to latest Loop server changes - update parameter name for /calls_url and add a callType parameter when starting a call. r=nperriault
2014-07-03 15:15:16 +01:00
Carsten "Tomcat" Book
6cbc1d089e
Merge mozilla-central to fx-team
2014-07-03 14:28:45 +02:00
Carsten "Tomcat" Book
27ead41013
merge fx-team to mozilla-central a=merge
2014-07-03 13:54:51 +02:00
Mark Banner
65803c9c95
Bug 1032738 Desktop client fails to authenticate session tokens with the latest loop server - change to using a hex key for hawk. r=jparsons
2014-07-03 09:23:40 +01:00
Mark Banner
756395df34
Bug 1020876 Route desktop client XHRs though the mozLoop API to share hawk implementation with MozLoopService. r=ttaubert
...
--HG--
rename : browser/components/loop/content/shared/js/client.js => browser/components/loop/content/js/client.js
rename : browser/components/loop/test/shared/client_test.js => browser/components/loop/test/desktop-local/client_test.js
2014-07-03 09:23:38 +01:00
Wes Kocher
613b089a47
Merge m-c to fx-team
2014-07-02 19:10:42 -07:00
Gijs Kruitbosch
580ab12dee
Bug 987586 - flex and wrap customization footer, r=jaws, ui-r=phlsa
...
--HG--
extra : rebase_source : 7bc03a130bdadaeb61854d3e199d285e37e56b80
2014-07-02 10:30:46 +01:00
Wes Kocher
08588cef30
Backed out 2 changesets (bug 1028187) for mochitest-oth orange
...
Backed out changeset 01cba8ff52dd (bug 1028187)
Backed out changeset caf43baf3306 (bug 1028187)
2014-07-02 17:29:33 -07:00
Bernardo P. Rittmeyer
ed9984de01
Bug 1023339 - Fixed in-content preferences clickable areas width to cover only the element and its label. r=mconley
2014-07-02 13:40:00 +02:00
Tim Taubert
cbb86fdf3f
Bug 1028187 - Enable IndexedDB for about:looppanel and about:loopconversation, sharing an origin r=bz
2014-06-28 11:56:06 +02:00
Bernardo P. Rittmeyer
ea5ec77abd
Bug 974652 - "Add aWidgetId and aArea to INFO()'d message when failing in onWidgetRemoved". r=MattN
2014-07-01 15:19:00 +02:00
Monica Chew
c95bda7aa1
Bug 1024610: Register tracking protection list and hook it up in nsChannelClassifier (r=gcp)
2014-07-02 12:41:00 -07:00
Ed Morley
42f3e8d00c
Bug 979207 - Disable browser_968447_bookmarks_toolbar_items_in_panel.js on Linux for intermittent failures
2014-07-03 13:40:10 +01:00
Carsten "Tomcat" Book
44ac68d674
Merge mozilla-central to mozilla-inbound
2014-07-02 15:09:37 +02:00
Jan-Ivar Bruaroey
468ae04ba0
Bug 1026782 Implements MozLoopService.setLoopCharPref. r=ttaubert
2014-07-01 17:12:54 +01:00
Mark Banner
98b6ad08bc
Bug 1032018 Don't build Loop core when building of Loop is disabled. r=glandium
2014-07-01 09:39:10 +01:00
Phil Ringnalda
7235f6934a
Merge m-c to m-i
2014-06-28 20:51:49 -07:00
Blake Kaplan
d96a208414
Bug 949617 - Make the login manager work in e10s. r=dolske/mconley/mfinkle/jimm
2014-06-28 11:09:45 -07:00
Wes Kocher
8f891b42c0
Merge m-c to fx-team a=merge
2014-06-27 17:54:18 -07:00
Wes Kocher
b7cfc12713
Merge inbound to m-c a=merge
2014-06-27 17:40:49 -07:00
Gijs Kruitbosch
11e58f93b9
Bug 1028872 - use collapsed property to check for toolbar state in test, r=dao
...
--HG--
extra : rebase_source : 8a0370bb924fcbdeeb3abe57696f312ada09be35
2014-06-27 15:55:23 +01:00
Tim Taubert
15b3e6f664
Bug 1030719 - Properly restore form data for contenteditables r=smacleod
2014-06-26 15:55:16 +02:00
Tim Taubert
1259249b6d
Bug 1027084 - Use about:blank as the initial tab for new windows in sessionstore tests r=smacleod
2014-06-27 13:00:11 +02:00
Justin Dolske
4b94c326de
Bug 1023508 - Add telemetry for HiDPI usage. r=felipe
2014-06-27 11:20:02 -07:00
Carsten "Tomcat" Book
11b78eff19
merge mozilla-inbound to mozilla-central a=merge
2014-06-27 15:34:28 +02:00
Carsten "Tomcat" Book
2ab07cce72
Backed out changeset 8c1ee05fbbd6 (bug 949617)
2014-06-27 15:17:42 +02:00
Matthew Noorenberghe
9d92f9b1c8
Bug 1021618 - Create the foundation for converting preference dialogs to be in-content. r=jaws a11y=MarcoZ f=Paenglab,davidb
2014-06-26 13:17:17 -04:00
Carsten "Tomcat" Book
af394a68f4
Merge mozilla-central to fx-team
2014-06-26 15:53:44 +02:00
Mark Banner
2c0edbc2eb
Bug 1030062 Loop Marionette tests need clearer failure points when displayed on tbpl. r=dburns
2014-06-26 09:00:08 +01:00
Carsten "Tomcat" Book
6bec2c9775
Merge mozilla-central to mozilla-inbound
2014-06-27 15:51:09 +02:00
Andrei Oprea
3c340e75fe
Bug 1023507 - Handle SDK failures when calling connect. r+ui-r=dmose
2014-06-25 11:00:00 -04:00
Adam Roach [:abr]
4ae8f8c90d
Bug 1011472 - Add audio alert for incoming call r=florian,standard8
2014-06-26 18:55:03 -05:00
David Rajchenbach-Teller
dc017d33f1
Bug 801598 - Making SessionWorker use the now public PromiseWorker API. r=ttaubert
2014-07-01 05:26:00 +02:00
Carsten "Tomcat" Book
aeffb3c8a4
Backed out changeset 781fc1eb104a (bug 801598) for bc1 test bustage
2014-07-02 09:48:46 +02:00
David Rajchenbach-Teller
65d6e83219
Bug 801598 - Making SessionWorker use the now public PromiseWorker API. r=ttaubert
2014-07-01 05:26:00 +02:00
Wes Kocher
c0ad0c4c48
Merge m-c to inbound a=merge
2014-06-25 18:39:25 -07:00
Gijs Kruitbosch
25aa2504f5
Bug 1027125 - set sync signup pref for button test, r=ttaubert
2014-06-25 16:23:42 +01:00
Carsten "Tomcat" Book
0fedf193db
Backed out changeset 24fb014f1ae3 (bug 1021618) for Linux Memory Leak on a CLOSED TREE
2014-06-25 10:03:44 +02:00
Matthew Noorenberghe
35e13a0727
Bug 1021618 - Create the foundation for converting preference dialogs to be in-content. r=jaws a11y=MarcoZ f=Paenglab,davidb
2014-06-25 02:38:24 -04:00
Jim Blandy
4d6a633bba
Bug 914753: Make Emacs file variable header lines correct, or at least consistent. DONTBUILD r=ehsan
...
The -*- file variable lines -*- establish per-file settings that Emacs will
pick up. This patch makes the following changes to those lines (and touches
nothing else):
- Never set the buffer's mode.
Years ago, Emacs did not have a good JavaScript mode, so it made sense
to use Java or C++ mode in .js files. However, Emacs has had js-mode for
years now; it's perfectly serviceable, and is available and enabled by
default in all major Emacs packagings.
Selecting a mode in the -*- file variable line -*- is almost always the
wrong thing to do anyway. It overrides Emacs's default choice, which is
(now) reasonable; and even worse, it overrides settings the user might
have made in their '.emacs' file for that file extension. It's only
useful when there's something specific about that particular file that
makes a particular mode appropriate.
- Correctly propagate settings that establish the correct indentation
level for this file: c-basic-offset and js2-basic-offset should be
js-indent-level. Whatever value they're given should be preserved;
different parts of our tree use different indentation styles.
- We don't use tabs in Mozilla JS code. Always set indent-tabs-mode: nil.
Remove tab-width: settings, at least in files that don't contain tab
characters.
- Remove js2-mode settings that belong in the user's .emacs file, like
js2-skip-preprocessor-directives.
2014-06-24 22:12:07 -07:00
Ed Morley
632b40c1f3
Merge mozilla-central and fx-team
2014-06-24 17:24:53 +01:00
Ed Morley
4ffd0ec330
Merge latest green fx-team changeset and mozilla-central; a=merge
2014-06-24 17:02:56 +01:00
David Rajchenbach-Teller
1bc3c5e0ba
Bug 883609 - Porting tests to new Session Restore backup mechanism;r=ttaubert
...
--HG--
rename : browser/components/sessionstore/test/browser_833286_atomic_backup.js => browser/components/sessionstore/test/browser_backup_recovery.js
2014-06-24 16:51:22 +02:00