Ed Morley
4e24a7f3a5
Merge mozilla-central and b2g-inbound
2014-08-21 14:28:53 +01:00
James Hobin
d4164347b7
Bug 1042463 - "System Update Ready" prompt keeps coming back and remind me battery is not 50% charged. r=fabrice
2014-08-19 14:57:00 -04:00
Robert Bindar
c03560557d
Bug 899585 - Add custom data support in the Notification constructor r=baku
2014-08-20 17:56:12 -07:00
Julien Wajsberg
caf8ef4dc1
Bug 1046828 - [Notifications API] We should never send the "show" event using system messages at a reboot. r=mhenretty
2014-08-06 03:45:00 -04:00
Fabrice Desré
a722dcc938
Bug 1050423 - Killing an app that has an open permissions dialog leaks the ContentParent r=vingtetun
2014-08-08 11:03:21 -07:00
Fabrice Desré
6128f1e270
Bug 1042881 - ManifestHelper() must resolve uris against the manifest url r=myk
2014-07-30 14:00:15 -07:00
Fabrice Desré
cc7dd1764b
backout 5a84a1907654 (bug 1042881) for causing app startup failures r=me
2014-07-31 12:14:03 -07:00
Carsten "Tomcat" Book
7431ce9279
merge mozilla-inbound to mozilla-central a=merge
2014-07-31 12:57:22 +02:00
Fabrice Desré
154ab0bbdf
Bug 1042881 - ManifestHelper() must resolve uris against the manifest url r=myk
2014-07-30 14:00:15 -07:00
Sid Stamm
edab85ef33
Bug 994782 - Remove the old Content Security Policy parser, CSPUtils.jsm and tie-in logic. (r=ckerschb,jst)
2014-07-30 14:37:22 -07:00
Ryan VanderMeulen
21dbef51d4
Bug 1019572 - Disable test_permission_gum_remember.html on opt builds as well.
...
DONTBUILD
2014-07-18 09:43:37 -04:00
Fabrice Desré
eed7739dc9
Bug 1037212 - [Flame] Phone is not completely erased when a ringtone is set from the Music App r=dougt,dhylands,khuey
2014-07-17 18:30:47 -07:00
Shih-Chiang Chien
c6ab29fb5b
Bug 1019572 - disable test_permission_gum_remember.html on b2g-emulator debug build. r=RyanVM.
2014-07-16 18:33:00 +02:00
Alfredo Yang
98b14a5dcc
Bug 984274 - Remove WebappsUpdateTimers in B2G mochitests. r=fabrice
2014-06-30 23:59:00 -04:00
Alexandre Poirot
5c8fa7d9ab
Bug 1036415 - Fix webapps actor on Mulet. r=jryans
2014-07-09 07:39:00 -04:00
Jed Parsons
206e207871
Bug 1036198 - rejection not defined in _handleGetAssertionError. r=spenrose
2014-07-08 18:00:25 -07:00
Mark Banner
8d22dc72fc
Fix b2g bustage from Bug 1032017, add missing commas. rs=bustage fix for CLOSED TREE
2014-07-08 08:11:23 +01:00
Mark Banner
daf2fe32a4
Bug 1032017 Remove MOZ_SERVICES_FXACCOUNTS flags as it is no longer necessary. Also fixes test_hawkrequest.js failures in m-c. r=glandium
2014-07-08 07:37:57 +01:00
Alexandre Poirot
274505232a
Bug 1033511 - Remove simulatorscreen annoying error message. r=21
2014-07-02 10:52:00 -04:00
Alexandre Poirot
9b33747995
Bug 963490 - Implement a b2g component to easily interact with all frames. r=vingtetun, r=janx, r=jryans
2014-06-30 06:16:00 -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
Antonio M. Amaya
bc0543d31e
Bug 1028042 - Re-enable the activity handler for the OMA DD MIME type. r=vingtetun
2014-06-20 01:45:00 -04:00
Ed Morley
fa389ef499
Bug 984274 - Disable test_sandbox_permission.html on B2G for too many intermittent failures
...
--HG--
extra : rebase_source : 1774eb1f371100ab13d1711855776d4d708395fd
2014-06-19 09:43:48 +01:00
Antonio M. Amaya
a045096e18
Bug 1021156 - Re-enable activity handlers for OMA downloads. r=vingtetun
2014-06-17 09:44:00 -04:00
Mike Habicher
1b8cd97bdb
Bug 1022705 - allow StopRecordingImpl() to be called from any thread, r=jesup
2014-06-10 09:52:22 -04:00
Ryan VanderMeulen
c8ca0853e5
Merge m-c to b2g-inbound. a=merge
2014-06-07 14:16:54 -04:00
Fernando Jiménez
147c63de46
Bug 988469 - MSISDN verification API for privileged apps. Part 3: B2G UI Glue. r=vingtetun
2014-06-07 19:30:19 +02:00
Ryan VanderMeulen
7b4af4d888
Bug 984274 - Disable test_sandbox_permission.html for frequent failures on a CLOSED TREE.
2014-06-07 01:12:33 -04:00
Shih-Chiang Chien
cadc31120f
Bug 1019572 - Manually stop the media stream in test_permission_gum_remember.html. r=baku.
2014-06-05 05:07:00 -07:00
Vivien Nicolas
d47e742018
Bug 1015894 - Use window.realFrameElement into b2g/components/ContentPermissionPrompt.js to dispatch the permission request to the correct iframe. r=ochameau
2014-06-04 20:11:06 +02:00
Ryan VanderMeulen
3a3ab13539
Backed out 5 changesets (bug 1015871, bug 1020257, bug 1015887, bug 1005888, bug 1015894) for desktop B2G mochitest failures on a CLOSED TREE.
...
Backed out changeset dbcb9974b640 (bug 1020257)
Backed out changeset 3220b7b2efc9 (bug 1015894)
Backed out changeset 4e23647ae247 (bug 1015887)
Backed out changeset 59df0cdacc15 (bug 1015871)
Backed out changeset e7124b07804b (bug 1005888)
2014-06-04 16:07:06 -04:00
Vivien Nicolas
d8fd7904f1
Bug 1015894 - Use window.realFrameElement into b2g/components/ContentPermissionPrompt.js to dispatch the permission request to the correct iframe. r=ochameau
2014-06-04 20:11:06 +02:00
Sean Lin
2b0e5d4858
Bug 1013671 - Use SystemAppProxy to fire "system-messages-open-app" from SystemMessageInternal.js. r=gene
...
Bug 793420 - Remove the waiting timer for the open-app mozChromeEvents requested by System Message.
r=gene, fabrice
2014-05-30 15:48:25 +08:00
Shih-Chiang Chien
38866397b0
Bug 978660 - no need to prompt if gUM is already granted. r=fabrice.
2014-05-13 13:58:04 +08:00
Alexandre Poirot
1e8598317b
Bug 1016031 - Fix ProfD race in b2g child processes. r=fabrice
2014-05-26 10:39:00 +02:00
Sean Lin
311190e038
Bug 908191 - Use xpcom-interface caller to do interaction between Inter-App Communication API and run-time prompt. r=gene,fabrice
2014-05-26 11:53:44 +08:00
Ryan VanderMeulen
7285915a55
Merge m-c to fx-team.
2014-05-21 08:56:33 -04:00
Alexandre Poirot
ba71388b74
Bug 964778 - Fix app install. r=fabrice
2014-05-20 09:30:00 -04:00
Sam Penrose
46179ab350
Bug 982969 - DIALOG_CLOSED_BY_USER fires oncancel. r=jedp
2014-05-13 13:56:30 -07:00
Fabrice Desré
625b7bf6a0
Bug 1009781 - Remove activities -> content handler mappings r=vingtetun
2014-05-20 13:51:30 -07:00
Fabrice Desré
9639dcbe16
Bug 1009253 - Activities with no choice available are not reporting error r=vingtetun
2014-05-12 16:30:30 -07:00
Alexandre Lissy
cb57a71f64
Bug 967475 - Implement mozChromeNotifications API. r=mhenretty,bent
2014-05-08 23:16:00 +02:00
Wes Kocher
835be078b9
Backed out changeset 21d743a319c6 (bug 967475) for apparently introducing two hazards to the build
2014-05-08 16:06:40 -07:00
Alexandre Lissy
6427efb2cf
Bug 967475 - Implement mozChromeNotifications API. r=mhenretty, r=bent
...
--HG--
extra : rebase_source : 595b53c85f031784bd77591d4e0593e60b39ccfd
2014-05-08 10:07:00 -04:00
Sam Penrose
a8be0eb5da
Bug 1004242 - Expose FxAccounts resendVerificationEmail to Gaia. r=jedp
2014-05-07 11:14:05 -07:00
Ben Turner
d43c965184
Bug 982779 - Ensure that child->parent IPC blobs are never mysterious, r=baku.
2014-04-29 13:02:41 -07:00
Alexandre Lissy
603ca21295
Bug 1005093 - Fix return code path of getNotificationURLFor(). r=fabrice
2014-05-02 11:22:00 +02:00
Alexandre Lissy
ad096abd0a
Bug 963234 - Move AlertsHelper out of shell.js. r=fabrice, r=ochameau
2014-05-01 05:23:00 -04:00
Carsten "Tomcat" Book
f04a2b076c
merge fx-team to mozilla-central
2014-04-30 15:01:45 +02:00
Sam Penrose
8dfdb2f152
Bug 981210 - FxAccountsManager.jsm and consumers: change "accountId" attribute to "email" r=jedp
2014-04-29 14:47:59 -07:00