Commit Graph

4387 Commits

Author SHA1 Message Date
Phil Ringnalda
f676c9d65c Backed out 5 changesets (bug 944665, bug 922465, bug 930282) for b2g xpcshell crashes
CLOSED TREE

Backed out changeset c4f970dd2a4f (bug 930282)
Backed out changeset 625f5303fc68 (bug 930282)
Backed out changeset bf8e90edd152 (bug 922465)
Backed out changeset a21b57c78253 (bug 944665)
Backed out changeset 9275a2efc9e3 (bug 944665)

--HG--
extra : rebase_source : bfbe3786e0db2073e26dc383b89525d22be0b3bd
2013-12-08 15:32:15 -08:00
Jonathan Watt
b9c0b3f28e Bug 947718 - Work around bug 946184 for Aurora. r=bz 2013-12-08 21:27:28 +00:00
Gaia Pushbot
5e288dcb2c Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7343851c97c2
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Revert "Bug 907177 - [Clock] Add integration tests"

This reverts commit bddf28e63207e30e0cec38c60a98490117b32c89.
2013-12-06 22:15:24 -08:00
Patrick Wang
af0d9984ac Bug 930282: Part 1: Enable Nuwa by default. r=khuey 2013-12-07 10:27:32 +08:00
Gaia Pushbot
6a332bb42c Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a695e3b85d81
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #13820 from hotzenklotz/932919_remove_border

Bug 932919 remove borders from image editor r=davidflanagan

========

https://hg.mozilla.org/integration/gaia-central/rev/1904547858df
Author: Tom Herold <therold@mozilla.com>
Desc: Bug 932919 remove borders from image editor
2013-12-06 15:45:24 -08:00
Alfredo Yang
e36a238d1e Bug 853356 - Part1 Add new permissions and prompt for mutiple permissions request. r=fabrice, felipc, wjohnston, mrbkap, jimm 2013-12-06 17:38:51 -05:00
Gaia Pushbot
1c4faf61bb Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/acba8a7d5451
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #14473 from davidflanagan/bug945376

Bug 945376: correctly handle the None alert tone setting r=pdahiya

========

https://hg.mozilla.org/integration/gaia-central/rev/e416cc78aeea
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 945376: correctly handle the None alert tone setting
2013-12-06 13:30:25 -08:00
Gaia Pushbot
a7c5b0278d Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/961def304c06
Author: Eric O'Connor <eric@bocoup.com>
Desc: Bug 944271 - [OTA][Data Migration][Clock] The alarm events will...
   be lost after update from v1.1 to v1.2

Adds a routine to startup.js to convert old Alarm entries to the
new format.
2013-12-06 12:55:23 -08:00
Gaia Pushbot
6543373cca Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/aff9f1707f87
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #13887 from davidflanagan/bug939962

Bug 939962: attempt to reduce memory requirements for saving an edited i...

========

https://hg.mozilla.org/integration/gaia-central/rev/02e03d210e37
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 939962: attempt to reduce memory requirements for saving an edited image
2013-12-06 12:40:23 -08:00
Gaia Pushbot
d358449f7e Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/637037f23216
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #14381 from davidflanagan/bug927286

Bug 927286: Change keyboard word suggestions so we never display the use...

========

https://hg.mozilla.org/integration/gaia-central/rev/9c54a1f2a74b
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 927286: Change keyboard word suggestions so we never display the user's actual input and instead have an X icon to dismiss the suggestions and prevent autocorrection

address review comments

update tests to match new word suggestions behavior

fix merge conflict with bug 929361
2013-12-06 12:05:23 -08:00
Gaia Pushbot
fee8e93035 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7c86ea51249f
Author: John Ford <john@johnford.info>
Desc: Merge pull request #12111 from PinZhang/bug912317_add_speaker

Bug 912317: Add speaker switcher

========

https://hg.mozilla.org/integration/gaia-central/rev/165c032e0c47
Author: pzhang <pzhang@mozilla.com>
Desc: Bug 912317: Add speaker switcher
2013-12-06 11:26:28 -08:00
Gaia Pushbot
132cbaea62 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/63d432c3395f
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #14375 from mcav/land-939375

Bug 939375 - [email] POP3: UX for when there are too many messages in the spool. r=asuth

========

https://hg.mozilla.org/integration/gaia-central/rev/d78f61233a85
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 939375 - [email] POP3: UX for when there are too many messages in the spool. r=asuth
2013-12-06 09:50:24 -08:00
Gaia Pushbot
f92740b005 Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/333b17dfea2d
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Bug 922746 - Mark this test as intermittent
2013-12-06 08:40:23 -08:00
Gaia Pushbot
863b1e04b3 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f0c7f6367ac1
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #14414 from arcturus/bug-940294

Bug 940294 - [Download Manager] Implement the flow when the user opens a file and this action fails from notifications

========

https://hg.mozilla.org/integration/gaia-central/rev/08e29ec41fa0
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Bug 940294 - [Download Manager] Implement the flow when the user opens a file and this action fails from notifications
2013-12-06 08:00:31 -08:00
Gaia Pushbot
f66b40194b Bumping gaia.json for 6 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/349124ab318b
Author: Hubert Figuière <hub@figuiere.net>
Desc: Merge pull request #13497 from hfiguiere/node-switch-over

Bug 915156 - make test-perf work again. r=jwajsberg,jlal

========

https://hg.mozilla.org/integration/gaia-central/rev/698c0f288946
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 915156 - Part 5: Fix nits.

========

https://hg.mozilla.org/integration/gaia-central/rev/f16f5302fd2c
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 915156 - Part 4 - more cleanups / review / feedback

untabify

Add missing ;

Use a "constant" for the helper atom object

Rename write() to json_proxy_write() to avoid confusion until bug 944494 is fixed.

mozPerfDurations was persisted between run. All we do is collect
and report.

Missing > in the test title.

========

https://hg.mozilla.org/integration/gaia-central/rev/5e8da3b2e041
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 915156 - Part 3 - more cleanups

Move perf.js to tests/performance

Small cleanup variables and such post review.

Remove useless comment

Fix linter errors

fix details in test to be more test-ish
split out the integration to a separate app specific file

Move some non performance marionette stuff to a helper.

Move unlock screen to the helper.

Remove extraneous console.log

Fix linter issue

Get the RUNS env for number of runs

Make sure to reset mozPerfDurations for each test.

Fix perf event observer

========

https://hg.mozilla.org/integration/gaia-central/rev/23154e8f8fbc
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 915156 - Part 2: finish it.

Add a 'requireGaia()'

Fix gjslint error (whitespace)

Revert some change on how we get the defaultCallback.

Remove unused code block.

This follow Bug 915158 - Allow setting a marionette runner host at runtime.

Re-add the performance reporter for Mocha.

Fix the screen unlock

Rename PerfApp to PerfTestApp.

Support entry point for launching apps.

introduce gaia-perf-marionette to perform the loop and only do npm once.
also skip profile building unless we run b2gdesktop

Really exit on excluded apps

gjslint whitespace fixes

Fix PerformanceHelper.delay()

re-implement "element" for the PerfApp helper.

Fix test iteration

Add "setringtones" to the exclusion list.

Check whitelist earlier in the tests

Get the event source - This replaces PR #13752

Pass the test data to the reporter.

Fix the marionette action.

Finally the rendering test work

========

https://hg.mozilla.org/integration/gaia-central/rev/52635133c8c1
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 915156 - Port the test-perf to node with the new marionette-client.
2013-12-06 07:50:25 -08:00
Gaia Pushbot
1dd6920e2c Bumping gaia.json for 3 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2dfd32e4bdbf
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Revert "Bug 945261 - [v1.2] Investigate intermittent fail in test_cards_view_launch_app.py"

This reverts commit 2ec0ab380aefd59765859d6bf1129c54699eab74.

========

https://hg.mozilla.org/integration/gaia-central/rev/a4c363ca2e18
Author: AndreiH <andrei.hutusoru@gmail.com>
Desc: Merge pull request #14393 from viorelaioia/bug_945261

Bug 945261 - [v1.2] Investigate intermittent fail in test_cards_view_launch_app.py

========

https://hg.mozilla.org/integration/gaia-central/rev/ca39c55d1dce
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 945261 - [v1.2] Investigate intermittent fail in test_cards_view_launch_app.py
2013-12-06 06:25:24 -08:00
Carsten "Tomcat" Book
8f4455ec6e No Bug fix gaia.json on a CLOSED TREE DONTBUILD
--HG--
extra : amend_source : d2d501fe7a52269d99dfe9c4509afbd63deeef35
2013-12-06 15:06:38 +01:00
Carsten "Tomcat" Book
b3b75486b0 merge m-c to b2g-inbound on a CLOSED TREE 2013-12-06 15:04:15 +01:00
Carsten "Tomcat" Book
0c709fb258 merge b2g-inbound to mozilla-central 2013-12-06 13:32:27 +01:00
Gaia Pushbot
01692bffe6 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/da380c144e33
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #14442 from steveck-chung/DSDS-sim_switch_for_MMS

Bug 945649 - [DSDS][MMS] Switching data call message is wrong when try to switch data call to SIM 2. r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/fe5457b0c35a
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 945649 - [DSDS][MMS] Switching data call message is wrong when try to switch data call to SIM 2
2013-12-06 04:10:24 -08:00
Gaia Pushbot
636bcddb66 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1ca1ba9e5a87
Author: evanxd <itoyxd@gmail.com>
Desc: Merge pull request #14434 from evanxd/bug-945611

Bug 945611 - Run marionette tests for a specific app.

========

https://hg.mozilla.org/integration/gaia-central/rev/a5e0fbfb25a4
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 945611 - Run marionette tests for a specific app.
2013-12-06 04:01:42 -08:00
Gaia Pushbot
53e3f15621 Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3a4081c12033
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Revert "Merge pull request #13989 from ian-liu/settings/Bug926334_To_support_EAP-SIM_and_WPA-EAP_option_in_WLAN_settin"

This reverts commit 7c568287adbf97e3b1454512f0028ec273467bd1, reversing
changes made to 22f7ea4e7fa50d16834b838f3c356ca86810db24.

This is breaking test_settings_do_not_track.TestSettingsDoNotTrack.test_enable_do_not_track_via_settings_app
2013-12-06 04:01:20 -08:00
Gaia Pushbot
cfdc953a5b Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-central/rev/711ae2e13d7e
Author: Trif Andrei-Alin <trifandreialin@gmail.com>
Desc: Merge pull request #14417 from zacc/bug_946665

Bug 946665 - Address intermittent test_keyboard.py with stronger wait in...

========

https://hg.mozilla.org/integration/gaia-central/rev/a54c2e63f29a
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 946665 - Address intermittent test_keyboard.by with stronger wait in contacts app object
2013-12-06 04:00:57 -08:00
Gaia Pushbot
f128c979bf Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4bb99e10153c
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #14372 from Joshua-S/bug-945545

[Bug 945545] - [FTE] Update background color to #F4F4F4

========

https://hg.mozilla.org/integration/gaia-central/rev/19d131b94277
Author: Joshua Smith <joshua-smith@verizon.net>
Desc: [Bug 945545] - [FTE] Update background color to #F4F4F4
2013-12-06 01:45:23 -08:00
Gaia Pushbot
1e95a667ac Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/04edeef7ae58
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #14324 from pivanov/bug-945768

Bug 945768 - [Shared] Follow up: Update shared action icons

========

https://hg.mozilla.org/integration/gaia-central/rev/c30f1eac514c
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 945768 - [Shared] Follow up: Update shared action icons

========

https://hg.mozilla.org/integration/gaia-central/rev/5af16cd83c93
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #13775 from Gioyik/patch-1

Bug 846541 - Enable "Word suggestion,"Auto Correction","Vibration" by default, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/b9c53f2acdb4
Author: Giovanny Andres Gongora Granada <gioyik@gmail.com>
Desc: Bug 846541 - [B2G][settings][keyboard]:Keyboard settings like "Word suggestion,"Auto Correction","Vibration" are disabled by default
2013-12-06 00:55:23 -08:00
Gaia Pushbot
48591deb96 Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f27a899758c2
Author: Ran Ben Aharon <ran@ranbena.com>
Desc: Bug 929668 - [everything.me] Runaway allocations in homescreen app [r=crdlc,evyatron]
2013-12-05 23:45:23 -08:00
Carsten "Tomcat" Book
de9161a59f Merge m-c to b2g-inbound 2013-12-06 07:54:35 +01:00
Gaia Pushbot
b1000bfc63 Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/9a7dca09500f
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #14429 from snowmantw/issue943237

Bug 943237 - [LockScreen][ScreenReader] Would non-clickable icons break the accessibility on LockScreen

========

https://hg.mozilla.org/integration/gaia-central/rev/6697c54f767e
Author: Greg Weng (snowmantw) <gweng@mozilla.com>
Desc: Bug 943237 - [LockScreen][ScreenReader] Would non-clickable icons break the accessibility on LockScreen

========

https://hg.mozilla.org/integration/gaia-central/rev/44f7f83d855b
Author: Ian Liu <iliu@mozilla.com>
Desc: Merge pull request #13989 from ian-liu/settings/Bug926334_To_support_EAP-SIM_and_WPA-EAP_option_in_WLAN_settin

Bug 926334 - [Gaia] To support WPA-EAP options(PEAP, TLS, TTLS) and manage certificate in WLAN setting. r=@crh0716

========

https://hg.mozilla.org/integration/gaia-central/rev/be9617c438c8
Author: ian-liu <iliu@mozilla.com>
Desc: Bug 926334 - [Gaia] To support WPA-EAP options(PEAP, TLS, TTLS) and manage certificate in WLAN setting.
2013-12-05 22:45:23 -08:00
Gaia Pushbot
885604a544 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3250702fbdc0
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #14385 from gasolin/issue-935828

Bug 935828 - [hamachi][fugu]Volume warning in FM app do not disappear af..., r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/6753784f25e5
Author: gasolin <gasolin@gmail.com>
Desc: Bug 935828 - [hamachi][fugu]Volume warning in FM app do not disappear after click home key
2013-12-05 22:05:24 -08:00
Gaia Pushbot
b621944e32 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/10421ab443a8
Author: Casey Yee <cyee@mozilla.com>
Desc: Merge pull request #14437 from caseyyee/bug-929361

Bug 929361 - [Keyboard] Update Keyboard Visual Design

========

https://hg.mozilla.org/integration/gaia-central/rev/1e479159a8ba
Author: Casey Yee <casey@caseyyee.com>
Desc: Bug 929361 - [Keyboard] Update Keyboard Visual Design
2013-12-05 21:20:23 -08:00
Gaia Pushbot
59b965033f Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d10e0357c63b
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #14391 from huchengtw-moz/gallery/Bug_945355-2

Bug 945355 - [B2G][Gallery] Viewing picture recieved in email or MMS sho..., r=djf

========

https://hg.mozilla.org/integration/gaia-central/rev/484481236fb7
Author: John Hu <johu@mozilla.com>
Desc: Bug 945355 - [B2G][Gallery] Viewing picture recieved in email or MMS shows invalid error after zooming in on picture in gallery
2013-12-05 19:30:23 -08:00
Gaia Pushbot
cbc805366b Bumping gaia.json for 3 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ae420ed62320
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #14431 from mikehenrty/revert-keyboard

Revert "Merge pull request #14148 from caseyyee/bug-929361"

========

https://hg.mozilla.org/integration/gaia-central/rev/36f8d80d9306
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Revert "Merge pull request #14148 from caseyyee/bug-929361"

This reverts commit 215febd4fcfda2f417b17437bf884459340cbf6f, reversing
changes made to 69ce560b82cc65078246d168e0ca4efb09888000.

========

https://hg.mozilla.org/integration/gaia-central/rev/43c885109217
Author: Evan Xd <itoyxd@gmail.com>
Desc: Revert "Bug 945611 - Run marionette tests for a specific app."

This reverts commit 88fdb98e896bf5974fc6bc5ab2b5204097cee800.
2013-12-05 19:15:24 -08:00
Gaia Pushbot
52fa113a6b Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/83e7499ae354
Author: evanxd <itoyxd@gmail.com>
Desc: Merge pull request #14347 from evanxd/bug-945611

Bug 945611 - Run marionette tests for a specific app.

========

https://hg.mozilla.org/integration/gaia-central/rev/248194f26768
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 945611 - Run marionette tests for a specific app.

========

https://hg.mozilla.org/integration/gaia-central/rev/ea2fa67f2104
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #13791 from gasolin/issue-914028

Bug 914028 - Display video (camera) device list in permission acquisitio...r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/1a34d0502708
Author: gasolin <gasolin@gmail.com>
Desc: Bug 914028 - Display video (camera) device list in permission acquisition prompt
2013-12-05 19:05:23 -08:00
Gaia Pushbot
5c77dc9eb0 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/88b5bd1fd338
Author: Casey Yee <cyee@mozilla.com>
Desc: Merge pull request #14148 from caseyyee/bug-929361

Bug 929361 - [Keyboard] Update Keyboard Visual Design

========

https://hg.mozilla.org/integration/gaia-central/rev/a1b176fc9123
Author: Casey Yee <casey@caseyyee.com>
Desc: Bug 929361 - [Keyboard] Update Keyboard Visual Design
2013-12-05 18:00:24 -08:00
Ryan VanderMeulen
a9a3e63e48 Merge m-c to b2g-inbound. 2013-12-05 17:55:47 -05:00
Ryan VanderMeulen
b2f54fc850 Merge b2g-inbound to m-c. 2013-12-05 17:53:41 -05:00
Ryan VanderMeulen
a91fbf0361 Merge fx-team to m-c. 2013-12-05 17:35:21 -05:00
Gaia Pushbot
9d6d5dfd22 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d785455ac94f
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #14023 from jugglinmike/907177-add-integration-tests-4

Bug 907177 - [Clock] Add integration tests

========

https://hg.mozilla.org/integration/gaia-central/rev/e557f51eadae
Author: Mike Pennisi <mike@mikepennisi.com>
Desc: Bug 907177 - [Clock] Add integration tests

r=lightsofapollo
2013-12-05 14:10:23 -08:00
Gaia Pushbot
8f10b4ee73 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2f52419acd2e
Author: Malini Das <thehyperballad@gmail.com>
Desc: Merge pull request #14424 from malini/master

Revert "Merge pull request #14138 from malini/mixin"

========

https://hg.mozilla.org/integration/gaia-central/rev/c3c6303cc33d
Author: Malini Das <mdas@mozilla.com>
Desc: Revert "Merge pull request #14138 from malini/mixin"

This reverts commit 091161997bebfc0c2d053339b1c9891c57216920, reversing
changes made to 50c75716ce9740ac1443e02140ae85b4885d47c5.
2013-12-05 13:20:30 -08:00
Gaia Pushbot
bf91c47dda Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/167b71d6d97b
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #14400 from crdlc/bug-toaster-no-downloading

Bug 946660 - [Download Manager] Downloading notifications should not be ...

========

https://hg.mozilla.org/integration/gaia-central/rev/4a79cf2b48ac
Author: crdlc <crdlc@tid.es>
Desc: Bug 946660 - [Download Manager] Downloading notifications should not be displayed in the toaster
2013-12-05 13:11:29 -08:00
Gaia Pushbot
6f33fe2757 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-central/rev/e33eea638f98
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #14304 from RudyLu/keyboard/Bug930358-use_manifestURL_to_indentify_keyboardApp

Bug 930358 - Use manifestURL instead of app origin to identify a
r=gnarf, gary, arthur

========

https://hg.mozilla.org/integration/gaia-central/rev/a4854f794649
Author: Rudy Lu <left.lu@gmail.com>
Desc: Bug 930358 - Use manifestURL instead of app origin to identify a
keyboard (IME) app.
2013-12-05 13:11:07 -08:00
Gaia Pushbot
7db0fde37d Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a0459d28e262
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 946445 - preventDefault when we handle the context menu. r=benfrancis
2013-12-05 10:10:27 -08:00
Gaia Pushbot
4dd83b7ef4 Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5ef0c4bb4ffa
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #14250 from rnowm/contacts-highlight

Bug 917824 - [Contacts] Use Full Line Highlights

========

https://hg.mozilla.org/integration/gaia-central/rev/30d53d9e096e
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 917824 - [Contacts] Use Full Line Highlights

========

https://hg.mozilla.org/integration/gaia-central/rev/829777169c50
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #14403 from rnowm/lists-highlight

Bug 946682 - fix lists [BB] to allow proper highlight in [Contacts] app

========

https://hg.mozilla.org/integration/gaia-central/rev/0515dbcf7ab7
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 946682 - fix lists [BB] to allow proper highlight in [Contacts] app
2013-12-05 09:45:34 -08:00
Gaia Pushbot
0f9bdaad93 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/dce78731174c
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #14413 from crdlc/bug-946728

Bug 946728 - DragDrop unit tests are very slow and sometimes fires timeo...

========

https://hg.mozilla.org/integration/gaia-central/rev/e38729b963fe
Author: crdlc <crdlc@tid.es>
Desc: Bug 946728 - DragDrop unit tests are very slow and sometimes fires timeouts
2013-12-05 09:30:23 -08:00
Gaia Pushbot
549e06dead Bumping gaia.json for 3 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3d9924575466
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #14321 from etiennesegonzac/bug-945299-call-screen-missing-transitions

Bug 945299 - Making sure we don't skip frames during the call screen opening transition.

========

https://hg.mozilla.org/integration/gaia-central/rev/26444ea94dc4
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 945299 - Making sure we don't skip frames during the call screen
opening transition.

========

https://hg.mozilla.org/integration/gaia-central/rev/b0ec0e5ccc1f
Author: mai <mri@tid.es>
Desc: Bug 944718 - [Cost Control] Broken access to usage widget from utility tray
2013-12-05 09:20:23 -08:00
Ryan VanderMeulen
ba9861a512 Bug 940045 - s/foreach/forEach. 2013-12-05 12:08:26 -05:00
Gaia Pushbot
57afa4f3a9 Bumping gaia.json for 22 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/bad81381cd06
Author: Malini Das <thehyperballad@gmail.com>
Desc: Merge pull request #14138 from malini/mixin

 Bug 925398: Refactor Gaia-ui-tests to use Marionette mixins, r=davehunt

========

https://hg.mozilla.org/integration/gaia-central/rev/af2a095e49b2
Author: Malini Das <mdas@mozilla.com>
Desc: Merge branch 'master' of git://github.com/mozilla-b2g/gaia into mixin

========

https://hg.mozilla.org/integration/gaia-central/rev/4b533646c1f9
Author: Malini Das <mdas@mozilla.com>
Desc: Merge branch 'master' of git://github.com/mozilla-b2g/gaia into mixin

========

https://hg.mozilla.org/integration/gaia-central/rev/540a8fdf4fd2
Author: Malini Das <mdas@mozilla.com>
Desc: Merge branch 'master' of git://github.com/mozilla-b2g/gaia into mixin

========

https://hg.mozilla.org/integration/gaia-central/rev/1952fd9fa38e
Author: Malini Das <mdas@mozilla.com>
Desc: Merge branch 'master' of git://github.com/mozilla-b2g/gaia into mixin

========

https://hg.mozilla.org/integration/gaia-central/rev/0965afa4bb03
Author: Malini Das <mdas@mozilla.com>
Desc: use specific imports for Bug 943313

========

https://hg.mozilla.org/integration/gaia-central/rev/09cd0bfddc46
Author: Malini Das <mdas@mozilla.com>
Desc: remove extra whitespace

========

https://hg.mozilla.org/integration/gaia-central/rev/7c00005a1b77
Author: Malini Das <mdas@mozilla.com>
Desc: Merge branch 'master' of git://github.com/mozilla-b2g/gaia into mixin

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/runtests.py

========

https://hg.mozilla.org/integration/gaia-central/rev/51b8913663fc
Author: Malini Das <mdas@mozilla.com>
Desc: accidentally removed close_app

========

https://hg.mozilla.org/integration/gaia-central/rev/e6e61f8bde3e
Author: Malini Das <mdas@mozilla.com>
Desc: bad merge

========

https://hg.mozilla.org/integration/gaia-central/rev/1adda13809d7
Author: Malini Das <mdas@mozilla.com>
Desc: Merge branch 'master' of git://github.com/mozilla-b2g/gaia into mixin

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/gaia_test.py
	tests/python/gaia-ui-tests/gaiatest/runtests.py

========

https://hg.mozilla.org/integration/gaia-central/rev/db289d4bf1c5
Author: Malini Das <mdas@mozilla.com>
Desc: Merge branch 'master' of git://github.com/mozilla-b2g/gaia into mixin

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/gaia_test.py
	tests/python/gaia-ui-tests/gaiatest/runtests.py

========

https://hg.mozilla.org/integration/gaia-central/rev/8ec00f4142cd
Author: Malini Das <mdas@mozilla.com>
Desc: use b2g and endurance mixins

========

https://hg.mozilla.org/integration/gaia-central/rev/887913940107
Author: Malini Das <mdas@mozilla.com>
Desc: remove unnecessary imports

========

https://hg.mozilla.org/integration/gaia-central/rev/b9fe55df7fea
Author: Malini Das <mdas@mozilla.com>
Desc: use the html test result mixin

========

https://hg.mozilla.org/integration/gaia-central/rev/9912d20a5998
Author: Malini Das <mdas@mozilla.com>
Desc: use HTMLReportingTestResult

========

https://hg.mozilla.org/integration/gaia-central/rev/b09871d7180a
Author: Malini Das <mdas@mozilla.com>
Desc: remove report directory. It has moved to marionette

========

https://hg.mozilla.org/integration/gaia-central/rev/b1e22496fe52
Author: Malini Das <mdas@mozilla.com>
Desc: Merge branch 'mixin' of https://github.com/malini/gaia into mixin

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/runtests.py

========

https://hg.mozilla.org/integration/gaia-central/rev/eb761b3c37f1
Author: Malini Das <mdas@mozilla.com>
Desc: use mixin pattern

========

https://hg.mozilla.org/integration/gaia-central/rev/838b222ae9d6
Author: Malini Das <mdas@mozilla.com>
Desc: move gaia mixins to gaia-ui-tests

========

https://hg.mozilla.org/integration/gaia-central/rev/e2129a9a157a
Author: Malini Das <mdas@mozilla.com>
Desc: use mixin pattern

========

https://hg.mozilla.org/integration/gaia-central/rev/a3117082d61f
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Revert "Bug 944718 - [Cost Control] Broken access to usage widget from utility tray"

This reverts commit 0fd00a3977999c89193f576e8f32973cfb185a58.
2013-12-05 09:06:24 -08:00
Gaia Pushbot
0b9e070350 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6434a9e432b5
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #14410 from rnowm/946718

Bug 946718 - [SMS] When there's no messages, the header shows a shadow below

========

https://hg.mozilla.org/integration/gaia-central/rev/30b0978059d5
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 946718 - [SMS] When there's no messages, the header shows a shadow below
2013-12-05 08:40:23 -08:00
Gaia Pushbot
01a5183941 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1ab9ef0530a5
Author: Ian Liu <iliu@mozilla.com>
Desc: Merge pull request #14352 from ian-liu/bluetooth/Bug946134_No_need_to_use_filenames

Bug 946134 - [Bluetooth File Transfer] No need to use filename for checking the numbers of sending files in schedule, r=@alivedise

========

https://hg.mozilla.org/integration/gaia-central/rev/dfb7e25b9066
Author: ian-liu <iliu@mozilla.com>
Desc: Bug 946134 - [Bluetooth File Transfer] No need to use filename for checking the numbers of sending files in schedule
2013-12-04 22:45:24 -08:00
Gaia Pushbot
956aa42903 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/eb3375b96956
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #14350 from snowmantw/issue946139

Bug 946139 - [LockScreen] Make lockscreen unlocking strategy customizable

========

https://hg.mozilla.org/integration/gaia-central/rev/bbc0e5695321
Author: Greg Weng (snowmantw) <gweng@mozilla.com>
Desc: Bug 946139 - [LockScreen] Make lockscreen unlocking strategy customizable.
2013-12-04 22:20:23 -08:00