Ed Morley
93a6bced8e
Merge mozilla-central and b2g-inbound
2014-01-29 10:37:41 +00:00
Ed Morley
54d76ad687
Merge latest green b2g-inbound changeset and mozilla-central
2014-01-29 10:33:43 +00:00
Ed Morley
f3806e5adf
Merge latest green inbound changeset and mozilla-central
2014-01-29 10:32:34 +00:00
B2G Bumper Bot
92bd019891
Bumping manifests a=b2g-bump
2014-01-29 02:09:29 -08:00
B2G Bumper Bot
ad9832e2c1
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/3539f47a7dcf
Author: Ben Francis <ben@tola.me.uk>
Desc: Bug 963173 - Ensure address bar is always displayed when a different tab is selected. r=daleharvey
2014-01-29 02:05:21 -08:00
B2G Bumper Bot
a75f35254b
Bumping manifests a=b2g-bump
2014-01-29 01:56:44 -08:00
B2G Bumper Bot
5d283c73b4
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a865859744d4
Author: AndreiH <andrei.hutusoru@softvision.ro>
Desc: Merge pull request #15796 from chirarobert/unxfail
Re-enable test_persona_app.py on devices due to Bug 963582 being resolve...
========
https://hg.mozilla.org/integration/gaia-central/rev/fead4832e217
Author: chirarobert <chirarobert@yahoo.com>
Desc: Re-enable test_persona_app.py on devices due to Bug 963582 being resolved.
2014-01-29 01:55:14 -08:00
B2G Bumper Bot
12e13bbac3
Bumping manifests a=b2g-bump
2014-01-29 00:32:21 -08:00
B2G Bumper Bot
7f6f976f58
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/999353866b7c
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #15792 from RudyLu/keyboard/Bug920431-keyboard_layout_customize_2
Bug 913782 - [Keyboard] Build time default keyboard selection work for
r=yurenju
========
https://hg.mozilla.org/integration/gaia-central/rev/dc3f38c67046
Author: Rudy Lu <me@rudy.lu>
Desc: Bug 913782 - [Keyboard] Build time default keyboard selection work for
3rd-party keyboard support
- make build/settings.js read the default keyboard layout config
Bug 920431 - [keyboard] keyboard_layout.json should be customizable
- Refine to make it adopt the config in distribution package
2014-01-29 00:25:11 -08:00
B2G Bumper Bot
1c409376dd
Bumping manifests a=b2g-bump
2014-01-28 20:14:51 -08:00
Tim Taubert
182d251939
Bug 964929 - [Australis] Follow-up to remove OSX-only button styles from Windows and Linux r=bustage
2014-01-28 20:13:44 -08:00
B2G Bumper Bot
f61f5297e1
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/9e678fbbf8a8
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #15790 from gasolin/issue-964450
Bug 964450 - [E.me]let entry not overlap by menu while keyboard pop, r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/1fc17e09227b
Author: gasolin <gasolin@gmail.com>
Desc: Bug 964450 - [E.me]let entry not overlap by menu while keyboard pop
2014-01-28 20:05:12 -08:00
B2G Bumper Bot
5dff57076e
Bumping manifests a=b2g-bump
2014-01-28 19:54:44 -08:00
B2G Bumper Bot
2d07189d1f
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/bb35a32f9408
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #15764 from alivedise/bugzilla/956938/fix-activie-activity
Bug 956938 - Fix active activity
========
https://hg.mozilla.org/integration/gaia-central/rev/cdc361479f9f
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 956938 - Fix active activity
========
https://hg.mozilla.org/integration/gaia-central/rev/ba368558401f
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #15714 from snowmantw/issue963503
Bug 963503 - [NFC] Shrink UI Type Error in AppFrame in Shrinking_ui.js
========
https://hg.mozilla.org/integration/gaia-central/rev/0ba8b2419a8a
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 963503 - [NFC] Shrink UI Type Error in AppFrame in Shrinking_ui.js
========
https://hg.mozilla.org/integration/gaia-central/rev/a85e75fcf77f
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #15696 from etiennesegonzac/bug-963723-home-gesture-reboot
Bug 963723 - On startup, software home button should not be enabled if home gesture is enabled. r=alive,etienne
========
https://hg.mozilla.org/integration/gaia-central/rev/e626fd18d20d
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 963723 - On startup, software home button should not be enabled if home gesture is enabled.
2014-01-28 19:50:20 -08:00
B2G Bumper Bot
c9b7f9709b
Bumping manifests a=b2g-bump
2014-01-28 19:44:34 -08:00
B2G Bumper Bot
0da6b6b7f9
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/3169d5550e74
Author: EragonJ <eragonj@eragonj.me>
Desc: Merge pull request #15707 from EragonJ/bug-958412
Bug 958412 - [Gaia][DSDS] move simcard detection logic to system app
========
https://hg.mozilla.org/integration/gaia-central/rev/e228f95c86e5
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 958412 - [Gaia][DSDS] move simcard detection logic to system app
- add sim_settings_helper
- add related test
- update slot.isAbsent()
2014-01-28 19:40:22 -08:00
Phil Ringnalda
b28c502af5
Backed out 5 changesets (bug 962786, bug 952011) for svg test_text_selection.html bustage
...
CLOSED TREE
Backed out changeset d7a6a64b42f0 (bug 962786)
Backed out changeset e50ced4f4040 (bug 952011)
Backed out changeset c9e6fd6d5a03 (bug 952011)
Backed out changeset 406540ed9da0 (bug 952011)
Backed out changeset d6f164b6421a (bug 962786)
2014-01-28 19:37:54 -08:00
B2G Bumper Bot
fa5904e9b6
Bumping manifests a=b2g-bump
2014-01-28 19:26:38 -08:00
B2G Bumper Bot
133f02b58c
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/e3d420758d53
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Merge pull request #15362 from chirarobert/new_branch
Bug 936505 - Neaten up test_settings_wallpaper
========
https://hg.mozilla.org/integration/gaia-central/rev/15230e9673bc
Author: chirarobert <chirarobert@yahoo.com>
Desc: Bug 936505 - Neaten up test_settings_wallpaper
Changed to assert wallpaper.image setting instead of taking the info from html
========
https://hg.mozilla.org/integration/gaia-central/rev/a8ffdd25c5e7
Author: Yuren Ju <yurenju@gmail.com>
Desc: Revert "Bug 957497 - Allow include of uncompressed data files in the package apps"
This reverts commit 3eb52bf51d1ce57cdbbf9ee8cade488d77985ef1.
Conflicts:
build/utils-xpc.js
build/utils.js
========
https://hg.mozilla.org/integration/gaia-central/rev/543c4ab39c46
Author: Yuren Ju <yurenju@gmail.com>
Desc: Revert "Bug 957497 - Enable alignStoredFiles()"
This reverts commit 21f03c19a6659580b83004ae2757b539b1ee9782.
========
https://hg.mozilla.org/integration/gaia-central/rev/c99908aef26b
Author: Yuren Ju <yurenju@gmail.com>
Desc: Revert "Bug 962976 - Use a blacklist to avoid compressing specific file types which are already compressed r=yurenju"
This reverts commit 6c99ac252d1c75b06b3883e98d8ea36913ea36f1.
========
https://hg.mozilla.org/integration/gaia-central/rev/22795ff39d85
Author: Yuren Ju <yurenju@gmail.com>
Desc: Revert "Bug 962938 - Inconsistent file path in zip file"
This reverts commit 27c9fbbdac521950cb149848a73080d62312c7f4.
2014-01-28 19:25:15 -08:00
B2G Bumper Bot
46ac5d031d
Bumping manifests a=b2g-bump
2014-01-28 19:03:54 -08:00
B2G Bumper Bot
6e298cf07a
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/5b3330fb7532
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #15728 from crh0716/962452
Bug 962452 - Restore the automatic selection settings when navigating to the panel r=jaoo
========
https://hg.mozilla.org/integration/gaia-central/rev/88695ffa5c48
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 962452 - Restore the automatic selection settings when navigating to the panel
2014-01-28 19:00:18 -08:00
B2G Bumper Bot
11bb9e843e
Bumping manifests a=b2g-bump
2014-01-28 18:39:05 -08:00
B2G Bumper Bot
701e4a20df
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/e54e18491c9b
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #15760 from crh0716/943227
Bug 943227 - Stop using emergencyCallsOnly attribute r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/65a29a1d624d
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 943227 - Stop using emergencyCallsOnly attribute
2014-01-28 18:35:19 -08:00
B2G Bumper Bot
931ce7e144
Bumping manifests a=b2g-bump
2014-01-28 18:30:29 -08:00
B2G Bumper Bot
9467291494
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/9c527bfaea4e
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #15675 from crh0716/959962
Bug 959962 - Set correct width based on the padding r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/29cf6eacff16
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 959962 - Set correct width based on the padding
========
https://hg.mozilla.org/integration/gaia-central/rev/e2d4ddf0d63c
Author: Gregor Wagner <anygregor@gmail.com>
Desc: Merge pull request #15788 from gregorwagner/disable
Bug 965083 - Disable failing unit tests for a green tbpl. r=jgriffin
========
https://hg.mozilla.org/integration/gaia-central/rev/76d2300b80b5
Author: Gregor Wagner <anygregor@gmail.com>
Desc: Disable failing unit tests
2014-01-28 18:25:45 -08:00
Wes Kocher
88f1a2e0d5
Backed out changeset e5dfc4abbb91 (bug 940554) for b2g test bustage across the board on a CLOSED TREE
2014-01-28 18:23:22 -08:00
B2G Bumper Bot
8e7539d5ff
Bumping manifests a=b2g-bump
2014-01-28 18:03:38 -08:00
B2G Bumper Bot
4057ae9478
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/b3befa3a6a7f
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #15278 from jrburke/bug958675-email-upgrade-alameda
Bug 958675 - [email] Upgrade alameda.js to get latest prim r=asuth
========
https://hg.mozilla.org/integration/gaia-central/rev/1dd8b2f38bd6
Author: jrburke <jrburke@gmail.com>
Desc: Bug 958675 - [email] Upgrade alameda.js to get latest prim
2014-01-28 18:00:19 -08:00
Tim Taubert
37e4e5c3f2
Bug 964929 - [Australis] Implement doorhanger for sync errors r=gavin
2014-01-28 17:54:36 -08:00
Robert Strong
873d58fc12
Bug 964550 - Make marStageSuccessComplete.js, marStageSuccessPartial.js, and marAppInUseStageSuccessComplete_unix.js xpcshell tests pass on Mac. r=bbondy
2014-01-28 19:14:15 -08:00
Tim Taubert
2fd6d7c401
Bug 963384 - Implement modal "Choose What To Sync" dialog r=markh
2014-01-28 18:57:19 -08:00
Tim Taubert
02440deee8
Bug 963384 - [Australis] Don't show doorhanger when sync customization dialog will be shown r=markh
2014-01-28 18:54:01 -08:00
Zachary Carter
ff42bd5929
Bug 965024 - Fix legacy Sync URL on about:accounts intro screen. r=markh
2014-01-28 18:19:31 -08:00
Mark Hammond
3e0d8dd577
Bug 959222 (part 1) - Make browserid_identity a first-class identity module. r=rnewman
2014-01-28 17:51:09 -08:00
Mark Hammond
c428a82013
Bug 957426 - Update Sync Options for Firefox Accounts. r=rnewman
2014-01-28 17:51:09 -08:00
Mark Hammond
bce353b88e
Bug 959990 - Add Firefox Accounts specific TOS and PP prefs and have utils functions open them if appropriate. r=rnewman.
2014-01-28 17:51:08 -08:00
Wes Kocher
cf19b21c97
Backed out 2 changesets (bug 952873) for build bustage on a CLOSED TREE
...
Backed out changeset 92dfed2592ae (bug 952873)
Backed out changeset 1ae58fcd61a9 (bug 952873)
2014-01-28 17:34:42 -08:00
Wes Kocher
427aa72170
Backed out changeset 95c958fa3cf2 (bug 964504) for test failures
2014-01-28 17:27:09 -08:00
Matt Woodrow
8cfbeafe04
Bug 962786 - Bustage fix on a CLOSED TREE
2014-01-29 13:54:17 +13:00
Margaret Leibovic
f84d593f87
Bug 964926 - Update HomeProvider authority manifest declaration. r=mcomella
2014-01-28 16:43:11 -08:00
Margaret Leibovic
83cf3104cc
Bug 965033 - Hook up DynamicPanel to HomeProvider. r=lucasr
2014-01-28 16:43:09 -08:00
Wes Johnston
bc4166f17f
backout f4c5e883482a r=mfinkle
2014-01-28 16:25:40 -08:00
B2G Bumper Bot
84b27001e2
Bumping manifests a=b2g-bump
2014-01-28 15:21:43 -08:00
B2G Bumper Bot
166a6f822d
Bumping manifests a=b2g-bump
2014-01-28 15:16:13 -08:00
B2G Bumper Bot
00697eeaa0
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/35b28d5eb8a5
Author: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Desc: Merge pull request #15735 from jaoo/964345
Bug 964345 - [DSDS] Wrong panel navigation flow for call settings and cellular and data menu items. r=arthurcc
========
https://hg.mozilla.org/integration/gaia-central/rev/2b84159698e0
Author: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Desc: Bug 964345 - [DSDS] Wrong panel navigation flow for call settings and cellular and data menu items
2014-01-28 15:15:15 -08:00
B2G Bumper Bot
167a03274d
Bumping manifests a=b2g-bump
2014-01-28 15:11:00 -08:00
B2G Bumper Bot
0ad0862241
Bumping gaia.json for 9 gaia revision(s) a=gaia-bump
...
Truncated some number of revisions since the previous bump.
========
https://hg.mozilla.org/integration/gaia-central/rev/dbec389e249f
Author: Fabien Cazenave <fabien@mozilla.com>
Desc: Merge pull request #15766 from Archaeopteryx/system-crashPrivacyPolicyWhitespace-bug961870-v4
Bug 961870 - [system] Whitespace missing before privacy policy in 'What's in a crash report?' page, r=kaze
========
https://hg.mozilla.org/integration/gaia-central/rev/353d044ad684
Author: Sebastian Hengst <archaeopteryx@coole-files.de>
Desc: Bug 961870 - [system] Whitespace missing before privacy policy in 'What's in a crash report?' page
========
https://hg.mozilla.org/integration/gaia-central/rev/e10c3a7bb9fb
Author: Hubert Figuière <hub@figuiere.net>
Desc: Merge pull request #15775 from hfiguiere/bug964888
Bug 964888 - blacklist fullscreen test app. r=julienw
========
https://hg.mozilla.org/integration/gaia-central/rev/d0a5bbde077d
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 964888 - blacklist fullscreen test app
========
https://hg.mozilla.org/integration/gaia-central/rev/de58ee3001e4
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #15657 from KevinGrandon/bug_961495_to_master
Bug 961495 - [Task Manager] Opening transition
========
https://hg.mozilla.org/integration/gaia-central/rev/8142c7d7f908
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 961495 - [Task Manager] Clean up opening transition r=alive,aus
========
https://hg.mozilla.org/integration/gaia-central/rev/fd282fda00bd
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 913782 - [Keyboard] Build time default keyboard selection work for"
This reverts commit 41891f2f87d6304410776e043d53b36a13f26cad.
========
https://hg.mozilla.org/integration/gaia-central/rev/89daccf183cc
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #15774 from wanderview/opus-json
Bug 964768: Fix opus file names in json files. r=fabrice r=21
========
https://hg.mozilla.org/integration/gaia-central/rev/de630cc767ee
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 964768: Fix opus file names in json files.
2014-01-28 15:10:13 -08:00
Olli Pettay
11135ed6c2
Bug 959585, clear capturing content before entering modal state, r=mrbkap, f=enn
...
--HG--
extra : rebase_source : 31d6fa26fbabd6cdded638fa24d946f9f9d97a13
2014-01-28 09:15:47 -08:00
Nikhil Marathe
fcd51ca0c7
Bug 945766 - DOM Promise should pass Promise/A+ tests. r=bz
...
--HG--
extra : rebase_source : efd56968e490fcde3ede6535002864104511a1d1
2014-01-28 10:14:57 -08:00
Jim Chen
21f2bd4395
Bug 964813 - Make HandleUncaughtException JNI wrapper multithreaded; r=kats
2014-01-28 18:32:28 -06:00