Commit Graph

343522 Commits

Author SHA1 Message Date
Ryan VanderMeulen
d0ecd68d34 Merge fx-team to m-c. 2014-01-28 16:18:18 -05:00
Ryan VanderMeulen
3cd00d5594 Merge b2g-inbound to m-c. 2014-01-28 16:12:29 -05:00
Wes Johnston
87288f70fc backout 4e6fcc7b5d13, 58d9759ff3d1, and 45d37d92612d CLOSED TREE 2014-01-28 12:28:46 -08:00
Nikhil Marathe
8c829fb1a0 Bug 957926 - Add JS::CreateTypeError. r=jorendorff
--HG--
extra : rebase_source : d621273cbff342f10864c2843a53eb55421fe582
2014-01-28 09:19:48 -08:00
B2G Bumper Bot
8b5b3f707c Bumping manifests a=b2g-bump 2014-01-28 09:14:39 -08:00
B2G Bumper Bot
ea6f8b84db Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2f947703e8fd
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #15482 from eeejay/bug-961169

Bug 961169 - [Settings] Clean up range inputs, and make them more screen... r=kaze

========

https://hg.mozilla.org/integration/gaia-central/rev/d07e762767ae
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 961169 - [Settings] Clean up range inputs, and make them more screen reader friendly.
2014-01-28 09:10:21 -08:00
B2G Bumper Bot
9693937b0e Bumping manifests a=b2g-bump 2014-01-28 08:49:35 -08:00
B2G Bumper Bot
ad4d3785fb Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3d4209fdf720
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 909839 - Merge JavaScript 'atoms' used by gaia and gaiatest. r=jgriffin r=zcampbell
2014-01-28 08:45:21 -08:00
B2G Bumper Bot
675af8be19 Bumping manifests a=b2g-bump 2014-01-28 08:22:21 -08:00
Honza Bambas
7cdb98db06 Bug 963703 - Don't use LoadUnblocked flag as cache priority load indication, r=michal 2014-01-28 17:21:21 +01:00
B2G Bumper Bot
19bcb6fb27 Bumping manifests a=b2g-bump 2014-01-28 08:19:22 -08:00
B2G Bumper Bot
0ad2bf7a9b Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3451eb6b72d2
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 946812 - Disable test_camera_flash on Hamachi (no flash present) a=testonly r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/24822dd90ea8
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 949897 - Disable test_cards_view_kill_apps_two_apps for device a=testonly r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/a8ac9ba099f3
Author: rwood-moz <rwood@mozilla.com>
Desc: Bug 964280 - Add option to override b2g start timeout duration. r=dhunt
2014-01-28 08:19:12 -08:00
Gijs Kruitbosch
52df74ab68 Bug 964217 - search item is broken in Australis' customize code, r=mikedeboer 2014-01-28 15:53:45 +00:00
Gijs Kruitbosch
52d52c962a Bug 947915 - fix sync button pending state on Australis win7 glass on menubar/tabstoolbar, r=mikedeboer 2014-01-29 16:27:33 +00:00
Mike de Boer
1dfb968abe [Australis] Bug 870593: add locale strings to be used for tips in Customize Mode. r=Gijs 2014-01-29 15:43:29 +01:00
Margaret Leibovic
40eec356bc Bug 961375 - Create a shorter label for dynamic toolbar pref. r=bnicholson 2014-01-29 06:58:49 -08:00
Margaret Leibovic
14e73da2e4 Bug 745755 - Generate a marketplace bookmark on profile creation. r=wesj 2014-01-29 06:58:46 -08:00
Mike de Boer
7a1b180930 [Australis] Bug 963095: adjust toolbar widget panel styling. r=Gijs 2014-01-29 12:20:40 +01:00
Carsten "Tomcat" Book
bef90343c8 Backed out changeset e3a37b924215 (bug 964510) for suspicion of causing frequent rc2 orange on android 2014-01-29 12:17:42 +01:00
Carsten "Tomcat" Book
a7c41d97ab Backed out changeset 33060d0581d6 (bug 784759) for suspicion of causing frequent rc2 orange on android 2014-01-29 12:17:32 +01:00
Carsten "Tomcat" Book
1486ba46bb Backed out changeset 9c564b61b7f8 (bug 964511) for suspicion of causing frequent rc2 orange on android 2014-01-29 12:17:22 +01:00
Ed Morley
6dda31ac44 Merge mozilla-central and fx-team 2014-01-29 10:38:55 +00:00
Ed Morley
65824f4564 Merge latest green b2g-inbound changeset and mozilla-central 2014-01-29 10:33:43 +00:00
Ed Morley
2a9e32f301 Merge latest green inbound changeset and mozilla-central 2014-01-29 10:32:34 +00:00
Panos Astithas
478bf72a6a Ignore native event listeners without a type (bug 962724); r=vporof 2014-01-29 11:23:10 +02:00
Wes Johnston
2a96ace8e5 Bug 964511 - Delay snippets initialization. r=margaret 2014-01-28 21:58:27 -08:00
Wes Johnston
55a8fa5b83 Bug 784759 - Delay database creation on startup. r=mfinkle 2014-01-28 21:58:12 -08:00
Wes Johnston
e741592938 Bug 964510 - Send a delayed startup notification in Fennec. r=mfinkle 2014-01-28 21:57:59 -08:00
B2G Bumper Bot
0b1757d3a5 Bumping manifests a=b2g-bump 2014-01-28 20:14:51 -08:00
Tim Taubert
5695dd3da3 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
e045ba48f3 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
37d54804b4 Bumping manifests a=b2g-bump 2014-01-28 19:54:44 -08:00
B2G Bumper Bot
4b602e759c 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
b813e66ff4 Bumping manifests a=b2g-bump 2014-01-28 19:44:34 -08:00
B2G Bumper Bot
5e92492b37 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
cc60a4deef 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
84571f5d92 Bumping manifests a=b2g-bump 2014-01-28 19:26:38 -08:00
B2G Bumper Bot
e872f991c0 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
a0886d0566 Bumping manifests a=b2g-bump 2014-01-28 19:03:54 -08:00
B2G Bumper Bot
6ec14e9a9a 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
2b1d8a77e4 Bumping manifests a=b2g-bump 2014-01-28 18:39:05 -08:00
B2G Bumper Bot
dc2c9ef24c 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
84dd0f8917 Bumping manifests a=b2g-bump 2014-01-28 18:30:29 -08:00
B2G Bumper Bot
a29962c02c 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
e2c537010e 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
fb5146fa00 Bumping manifests a=b2g-bump 2014-01-28 18:03:38 -08:00
B2G Bumper Bot
bc3fad27ea 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
6efeed0150 Bug 964929 - [Australis] Implement doorhanger for sync errors r=gavin 2014-01-28 17:54:36 -08:00
Robert Strong
67d6e3f2e8 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
53f8947200 Bug 963384 - Implement modal "Choose What To Sync" dialog r=markh 2014-01-28 18:57:19 -08:00