Commit Graph

175075 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
1f5510b09f Merge mozilla-central to b2g-inbound on a CLOSED TREE 2014-03-26 14:03:43 +01:00
B2G Bumper Bot
3276067b96 Bumping manifests a=b2g-bump 2014-03-26 03:17:46 -07:00
B2G Bumper Bot
acdeba2d02 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2ee76f2dca4a
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #17635 from viorelaioia/bug_986531

Bug 986531 - Xfail test_sms_with_attachments due to Bug 987809

========

https://hg.mozilla.org/integration/gaia-central/rev/98769c29e5a4
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 986531 - Xfail test_sms_with_attachments due to Bug 987809

========

https://hg.mozilla.org/integration/gaia-central/rev/69fdb5d342f6
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #17634 from yurenju/stage-windows-squash-2

Bug 897352 - [gaia build system] Transition to a build_stage for assembl...

========

https://hg.mozilla.org/integration/gaia-central/rev/b23875db386f
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps

Conflicts:
	Makefile
	apps/communications/build/build.js
	build/copy-build-stage-manifest.js
	build/test/integration/distribution.test.js
	build/utils-xpc.js
	build/utils.js
	build/webapp-manifests.js
2014-03-26 03:15:54 -07:00
Carsten "Tomcat" Book
c798708834 Backed out changeset 81f230994acd (bug 980502) for hopefully fixing gi tests 2014-03-26 11:09:34 +01:00
Carsten "Tomcat" Book
9cb216684f Backed out changeset 246f001547ac (bug 981085) 2014-03-26 11:09:16 +01:00
Carsten "Tomcat" Book
750b518eb5 Backed out changeset 7e0f13fbecd3 (bug 983610) 2014-03-26 11:09:13 +01:00
B2G Bumper Bot
aed3bd9585 Bumping manifests a=b2g-bump 2014-03-26 02:01:08 -07:00
B2G Bumper Bot
943a53c4fb Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/33d54d467505
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #17527 from nucliweb/985938-Contacts-Facebook-Export

Bug 985938 - [Contacts] Select mode checkbox is being overlaped by facebook indicator

========

https://hg.mozilla.org/integration/gaia-central/rev/8fb4fd39b515
Author: Joan Leon <joan.leon@gmail.com>
Desc: Bug 985938 - [Contacts] Select mode checkbox is being overlaped by facebook indicator
2014-03-26 01:56:03 -07:00
B2G Bumper Bot
63f6ff5e17 Bumping manifests a=b2g-bump 2014-03-26 01:36:07 -07:00
B2G Bumper Bot
c8286688dd Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c044e7d1a266
Author: Yuren Ju <yurenju@gmail.com>
Desc: Revert "Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps"

This reverts commit 30a501409cbe9dce0ee318a8bb9341d2dcc10427.
2014-03-26 01:30:52 -07:00
B2G Bumper Bot
c9c049f0fd Bumping manifests a=b2g-bump 2014-03-26 01:11:06 -07:00
B2G Bumper Bot
29a76fb5a2 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/32b20a270495
Author: Carsten Book -Tomcat- <cbook@mozilla.com>
Desc: Revert "Bug 986753 - [Tarako] Alarm Clock can get killed in the background and never ring." for suspicion of breaking gaia integration tests

This reverts commit 77b9f9e9b55801fec784dc20167c9d2a40e5346b.
2014-03-26 01:05:56 -07:00
B2G Bumper Bot
c8ecce7344 Bumping manifests a=b2g-bump 2014-03-26 00:56:05 -07:00
B2G Bumper Bot
7069e7b491 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ab71593de598
Author: dwi2 <dwi2@dwi2.com>
Desc: Merge pull request #17420 from dwi2/merge_bubbletea_971498_979212

Bubble-merge 971498 979212

========

https://hg.mozilla.org/integration/gaia-central/rev/a8564c770b76
Author: Tzu-Lin Huang <tzhuang@mozilla.com>
Desc: Bug 971498 - [System2] Instantiable HomescreenLauncher

Conflicts:
	apps/system/js/homescreen_launcher.js
	apps/system/test/unit/app_window_manager_test.js
	apps/system/test/unit/bootstrap_test.js
	apps/system/test/unit/homescreen_window_test.js

Bug 979212 - Require MockHomescreenLauncher in unit test of EdgeSwipeDetector

Conflicts:
	apps/system/test/unit/bootstrap_test.js
2014-03-26 00:50:55 -07:00
B2G Bumper Bot
74fb8ced6a Bumping manifests a=b2g-bump 2014-03-26 00:31:06 -07:00
B2G Bumper Bot
4d0f70cddd Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/91de5ff4f474
Author: GaryChen,PYChen <mmm198219@gmail.com>
Desc: Merge pull request #17504 from mpizza/Bug_961563_build_system

Bug 961563 - [TABLET] Support specifying target device type in Gaia build script. r=yurenju.

========

https://hg.mozilla.org/integration/gaia-central/rev/bfc5f924e3bd
Author: mpizza <mmm198219@gmail.com>
Desc: Bug 961563 - [TABLET] Support specifying target device type in Gaia build script.
2014-03-26 00:25:57 -07:00
B2G Bumper Bot
9d50842ab8 Bumping manifests a=b2g-bump 2014-03-25 23:51:10 -07:00
B2G Bumper Bot
e9f2cae5a0 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c0e933be736e
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #17622 from yurenju/stage-windows-squash

Bug 897352 - [gaia build system] Transition to a build_stage for assembl... r=@ochameau

========

https://hg.mozilla.org/integration/gaia-central/rev/4748617b9e23
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps

Conflicts:
	Makefile
	apps/communications/build/build.js
	build/copy-build-stage-manifest.js
	build/test/integration/distribution.test.js
	build/utils-xpc.js
	build/utils.js
	build/webapp-manifests.js
2014-03-25 23:46:00 -07:00
B2G Bumper Bot
e31d8f694b Bumping manifests a=b2g-bump 2014-03-25 22:21:10 -07:00
B2G Bumper Bot
f4c14b6cfe Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/04670a88b75f
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #17562 from crh0716/974253_v2

Bug 974253 - Set preferred network type on startup based on the user preference r=jaoo

========

https://hg.mozilla.org/integration/gaia-central/rev/91262c8a4d8c
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 974253 - Set preferred network type on startup based on the user preference
2014-03-25 22:16:03 -07:00
Fabrice Desré
564fd419ad Bug 982491 - Group apps in activities chains in the same process r=cervantes,gene 2014-03-25 21:56:35 -07:00
B2G Bumper Bot
ab8953f213 Bumping manifests a=b2g-bump 2014-03-25 21:31:12 -07:00
B2G Bumper Bot
75c89322d0 Bumping gaia.json for 8 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4476a9df53ab
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #17571 from RudyLu/keyboard/Bug983012_master

Bug 983012 - [Sora][Message][Input method]The virtual keyboard is
r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/9cade1438d30
Author: Rudy Lu <me@rudy.lu>
Desc: Bug 983012 - [Sora][Message][Input method]The virtual keyboard is
disable after switching the keyboard as pinyin.
 - Remove the touchmove event listeners from the touched keys when
   switching layouts.

========

https://hg.mozilla.org/integration/gaia-central/rev/d3885fb8715c
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #17600 from zacc/bug_987847

Bug 987847 - Debug test_settings_wallpaper.py

========

https://hg.mozilla.org/integration/gaia-central/rev/19e8381a68ca
Author: Zac <zcampbell@mozilla.com>
Desc: Bug 987847 - Resolve timing in test_settings_wallpaper.py and re-enable

========

https://hg.mozilla.org/integration/gaia-central/rev/791c8ca23c3c
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #17619 from KevinGrandon/revert_camera_features

Revert "Merge pull request #17599 from dmarcos/camera-new-features-master"

========

https://hg.mozilla.org/integration/gaia-central/rev/d64c49a74f0c
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Merge pull request #17599 from dmarcos/camera-new-features-master"

This reverts commit 2f48cfaf3dcc1732c57dbc0706819e9359d79fce, reversing
changes made to ede2b2488f467a0b8bddf5a741e07464cd15f735.

========

https://hg.mozilla.org/integration/gaia-central/rev/e5cddba3a31a
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #17615 from gaye/backout-marionette-client-bump

Revert "Merge pull request #17609 from KevinGrandon/bug_985112_marionett...

========

https://hg.mozilla.org/integration/gaia-central/rev/a6dfca16d815
Author: Gareth Aye <gaye@mozilla.com>
Desc: Revert "Merge pull request #17609 from KevinGrandon/bug_985112_marionette_client_1_1_x"

This reverts commit d19a7fb3efa74c479be7f0b24f030e9895eb4b7a, reversing
changes made to 732a35447c7da220578fc21e10fe119c2552d662.
2014-03-25 21:21:45 -07:00
Wes Kocher
462eacf4b2 Merge m-c to b2g-inbound despite the CLOSED TREE 2014-03-25 20:22:16 -07:00
Wes Kocher
0d58e41dd9 Merge fx-team to m-c 2014-03-25 20:03:13 -07:00
Wes Kocher
622986d217 Merge inbound to m-c 2014-03-25 19:54:55 -07:00
Botond Ballo
1def2233a2 Bug 987993 - Change name of ThebesLayerComposite back to 'ThebesLayerComposite'. r=bjacob 2014-03-25 17:12:31 -04:00
David Keeler
1ea866dced Backed out changeset d9e136a02980 (bug 986171) for build bustage r=backout 2014-03-25 14:02:42 -07:00
David Keeler
d56c7b6534 bug 986171 - mozilla::pkix: telemetry for what cert validation library is in use r=cviecco 2014-03-25 13:43:01 -07:00
Josh Aas
b72a98810f Bug 987923: Add autorelease pool locally in GetTempDir on OS X, and also to non-main-thread event loop. r=smichaud,bent 2014-03-25 15:27:12 -05:00
B2G Bumper Bot
f073987159 Bumping manifests a=b2g-bump 2014-03-25 13:07:32 -07:00
B2G Bumper Bot
da01f44fbe Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1bd0f38add91
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 987133 - Unxfail and fix test_cards_view_with_two_apps.py"

This reverts commit af238e5e64057a0bbf99227cffc36bf8b37135cc.

========

https://hg.mozilla.org/integration/gaia-central/rev/3ef7be23c879
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 985498 - Disable intermittent failing test, test_homescreen_delete_app.py
2014-03-25 13:05:31 -07:00
B2G Bumper Bot
17a93515a1 Bumping manifests a=b2g-bump 2014-03-25 12:21:13 -07:00
B2G Bumper Bot
c2d324e95e Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/299929cec781
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #17534 from DouglasSherk/987018-dsds-sms-focus

Bug 987018 - [DSDS] Fix focus() method calling on SIM picker to hide the keyboard. r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/25c4d82d1f6e
Author: DouglasSherk <github@sherk.me>
Desc: Bug 987018 - [DSDS] Fix focus() method calling on SIM picker to hide the keyboard. r=julienw
2014-03-25 12:16:03 -07:00
B2G Bumper Bot
63b9de33ef Bumping manifests a=b2g-bump 2014-03-25 12:06:27 -07:00
B2G Bumper Bot
7ae9089c20 Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/740334658f4d
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #17544 from DouglasSherk/984793-voicemail-1

Bug 984793 - [Dialer] Strip out the 1 from the phone number when long pressing voicemail. r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/3c6fa0ebf544
Author: DouglasSherk <github@sherk.me>
Desc: Bug 984793 - [Dialer] Strip out the 1 from the phone number when long pressing voicemail. r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/14f1ff56e162
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 987389 - [Clock] Make time picker for timer accessible."

This reverts commit c07e2bfd66037dcb57e8981df72d6e6dd65b58b5.
2014-03-25 12:01:07 -07:00
B2G Bumper Bot
0784f50331 Bumping manifests a=b2g-bump 2014-03-25 11:56:43 -07:00
B2G Bumper Bot
b0efdea79d Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/318f2018b8b6
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #17564 from chirarobert/unxfail_fix_cards_view_test_master

Bug 987133 - Unxfail and fix test_cards_view_with_two_apps.py

========

https://hg.mozilla.org/integration/gaia-central/rev/f61e798a3652
Author: chirarobert <robert.chira@softvision.ro>
Desc: Bug 987133 - Unxfail and fix test_cards_view_with_two_apps.py
2014-03-25 11:50:36 -07:00
B2G Bumper Bot
c36de72d7c Bumping manifests a=b2g-bump 2014-03-25 11:41:05 -07:00
Jim Chen
20e6314399 Bug 987284 - Make "copy JNI files" message easier to read. r=mshal 2014-03-25 14:40:36 -04:00
B2G Bumper Bot
15c31d636b Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0b1687927faa
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #17400 from eeejay/bug-986165

Bug 986165 - [keyboard] Hide button bubbles properly. r=rudyl

========

https://hg.mozilla.org/integration/gaia-central/rev/c638652ee12f
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 986165 - [keyboard] Hide button bubbles properly.
2014-03-25 11:35:55 -07:00
B2G Bumper Bot
7abcecccb2 Bumping manifests a=b2g-bump 2014-03-25 11:16:17 -07:00
B2G Bumper Bot
e355efe49b Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ffd44471fdef
Author: gitmai <mri@tid.es>
Desc: Merge pull request #17586 from gitmai/bug-987761-jshint-fix-followup-965512

Bug 987761 - Folloup up toBug 965512 - [CostControl] jshint fixes
r=jmcf

========

https://hg.mozilla.org/integration/gaia-central/rev/bfb9fe686b5d
Author: mai <mri@tid.es>
Desc: Bug 987761 - Folloup up toBug 965512 - [CostControl] jshint fixes
2014-03-25 11:11:08 -07:00
B2G Bumper Bot
4e2f248421 Bumping manifests a=b2g-bump 2014-03-25 11:01:12 -07:00
B2G Bumper Bot
aa4b23e4e4 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4c3cf4d40f5e
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #17537 from DouglasSherk/987024-contacts-bustage

Bug 987024 - [DSDS] Cache ril.xxx.defaultServiceId in MSAB to avoid IO thrashing. Fixed after being backed out in bug 980982. r=Rik, francisco

========

https://hg.mozilla.org/integration/gaia-central/rev/a022e25a73b8
Author: DouglasSherk <github@sherk.me>
Desc: Bug 987024 - [DSDS] Cache ril.xxx.defaultServiceId in MSAB to avoid IO thrashing. Fixed after being backed out in bug 980982. r=Rik, francisco
2014-03-25 10:56:08 -07:00
B2G Bumper Bot
71135430c6 Bumping manifests a=b2g-bump 2014-03-25 10:47:46 -07:00
B2G Bumper Bot
94f6f5ec0e Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/824714d8201a
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #17549 from eeejay/bug-987389

Bug 987389 - [Clock] Make time picker for timer accessible. r=mcav

========

https://hg.mozilla.org/integration/gaia-central/rev/60d178981dbb
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 987389 - [Clock] Make time picker for timer accessible.
2014-03-25 10:45:58 -07:00
B2G Bumper Bot
c996b7c28a Bumping manifests a=b2g-bump 2014-03-25 10:36:09 -07:00
B2G Bumper Bot
3c9102eff1 Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a68d91bb1d07
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 987847 - Disable intermittent failing test: test_settings_wallpaper.py

========

https://hg.mozilla.org/integration/gaia-central/rev/1ff8fe737799
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 987604 - Bump gaiatest version to 0.21.9. r=bsilverberg

========

https://hg.mozilla.org/integration/gaia-central/rev/15e0906e7c16
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #17550 from eeejay/bug-987397

Bug 987397 - [Clock] Hide timer edit dialog. r=mcav

========

https://hg.mozilla.org/integration/gaia-central/rev/6271176c97a2
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 987397 - [Clock] Hide timer edit dialog.

========

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

Bug 985132 - [B2G][Homescreen]Input overlap with confirmation prompt whe...

========

https://hg.mozilla.org/integration/gaia-central/rev/64a173867c48
Author: crdlc <crdlc@tid.es>
Desc: Bug 985132 - [B2G][Homescreen]Input overlap with confirmation prompt when deleting apps from the dock
2014-03-25 10:30:57 -07:00
B2G Bumper Bot
a18e877d67 Bumping manifests a=b2g-bump 2014-03-25 09:08:25 -07:00