Commit Graph

352609 Commits

Author SHA1 Message Date
B2G Bumper Bot
cfba9026e1 Bumping manifests a=b2g-bump 2014-03-26 07:56:45 -07:00
B2G Bumper Bot
c89bb09981 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a5b57b3a8a5b
Author: DouglasSherk <github@sherk.me>
Desc: Bug 985888 - [DSDS] Display currently in-use SIM cards on call buttons. r=rik
2014-03-26 07:50:34 -07:00
B2G Bumper Bot
af1ed8d047 Bumping manifests a=b2g-bump 2014-03-26 07:37:34 -07:00
B2G Bumper Bot
65471cf073 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

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

Bug 986047 - [B2G][Dialer]Cannot select Add Comment when creating a new ...

========

https://hg.mozilla.org/integration/gaia-central/rev/d2e978b18a15
Author: crdlc <crdlc@tid.es>
Desc: Bug 986047 - [B2G][Dialer]Cannot select Add Comment when creating a new contact through the dialer app

========

https://hg.mozilla.org/integration/gaia-central/rev/82d76e2bc50c
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #17632 from jmcanterafonseca/fix_date_l10n

Bug 987966 - [contacts] placeholder for date fields in add/edit mode is ...

========

https://hg.mozilla.org/integration/gaia-central/rev/ae2b21121627
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 987966 - [contacts] placeholder for date fields in add/edit mode is always in English: 'Date'
2014-03-26 07:35:55 -07:00
B2G Bumper Bot
8bbf2d62cc Bumping manifests a=b2g-bump 2014-03-26 07:26:10 -07:00
B2G Bumper Bot
412ad1c691 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/48000b91778c
Author: Carsten Book -Tomcat- <cbook@mozilla.com>
Desc: Revert "Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps" windows bustage

This reverts commit fdd45a31b8372e0f58de51af1856e0a381fe99fa.
2014-03-26 07:21:01 -07:00
B2G Bumper Bot
619ae00f80 Bumping manifests a=b2g-bump 2014-03-26 06:32:38 -07:00
B2G Bumper Bot
5ab3709f6a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/50b59c2116fa
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Merge pull request #17448 from comoyo/bug986484

Bug 986484 - Make the outer div of contact details unscrollable. r=arcturus

========

https://hg.mozilla.org/integration/gaia-central/rev/a9bab45a7f6a
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Bug 986484 - Make the outer div of contact details unscrollable
2014-03-26 06:31:33 -07:00
Carsten "Tomcat" Book
93952458ba Merge mozilla-central to b2g-inbound on a CLOSED TREE 2014-03-26 14:03:43 +01:00
B2G Bumper Bot
a5b2be0923 Bumping manifests a=b2g-bump 2014-03-26 03:17:46 -07:00
B2G Bumper Bot
742c917561 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
061be48b00 Backed out changeset 81f230994acd (bug 980502) for hopefully fixing gi tests 2014-03-26 11:09:34 +01:00
Carsten "Tomcat" Book
6eaebb92de Backed out changeset 246f001547ac (bug 981085) 2014-03-26 11:09:16 +01:00
Carsten "Tomcat" Book
1316ba06d8 Backed out changeset 7e0f13fbecd3 (bug 983610) 2014-03-26 11:09:13 +01:00
B2G Bumper Bot
6463e5ddd1 Bumping manifests a=b2g-bump 2014-03-26 02:01:08 -07:00
B2G Bumper Bot
0a4373be8d 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
f3e68d08f7 Bumping manifests a=b2g-bump 2014-03-26 01:36:07 -07:00
B2G Bumper Bot
7cb45aa876 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
46e6c21b16 Bumping manifests a=b2g-bump 2014-03-26 01:11:06 -07:00
B2G Bumper Bot
8cbb4f5284 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
a4d77cea5c Bumping manifests a=b2g-bump 2014-03-26 00:56:05 -07:00
B2G Bumper Bot
ac16504819 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
91a30ca731 Bumping manifests a=b2g-bump 2014-03-26 00:31:06 -07:00
B2G Bumper Bot
424ed7ff2a 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
4134f38a60 Bumping manifests a=b2g-bump 2014-03-25 23:51:10 -07:00
B2G Bumper Bot
3f598afbc5 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
b5c81cea33 Bumping manifests a=b2g-bump 2014-03-25 22:21:10 -07:00
B2G Bumper Bot
14a0c9dd9c 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é
874f87e5ff 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
e1dce7953a Bumping manifests a=b2g-bump 2014-03-25 21:31:12 -07:00
B2G Bumper Bot
d4f6f89846 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
05f118b4e6 Merge m-c to b2g-inbound despite the CLOSED TREE 2014-03-25 20:22:16 -07:00
Wes Kocher
618b2c258b Merge fx-team to m-c 2014-03-25 20:03:13 -07:00
Wes Kocher
6b9908e2fe Merge inbound to m-c 2014-03-25 19:54:55 -07:00
Botond Ballo
87be28b145 Bug 987993 - Change name of ThebesLayerComposite back to 'ThebesLayerComposite'. r=bjacob 2014-03-25 17:12:31 -04:00
David Keeler
299f77a203 Backed out changeset d9e136a02980 (bug 986171) for build bustage r=backout 2014-03-25 14:02:42 -07:00
David Keeler
a5607957c9 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
5e8b893a0b 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
a251db2c8c Bumping manifests a=b2g-bump 2014-03-25 13:07:32 -07:00
B2G Bumper Bot
08bfb7a8b2 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
2c0586ce93 Bumping manifests a=b2g-bump 2014-03-25 12:21:13 -07:00
B2G Bumper Bot
e190a5f8e5 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
4a75df92a9 Bumping manifests a=b2g-bump 2014-03-25 12:06:27 -07:00
B2G Bumper Bot
4d3afdfaae 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
da4c64ffca Bumping manifests a=b2g-bump 2014-03-25 11:56:43 -07:00
B2G Bumper Bot
c0686387d3 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
4940965a5e Bumping manifests a=b2g-bump 2014-03-25 11:41:05 -07:00
Jim Chen
c027695dfb Bug 987284 - Make "copy JNI files" message easier to read. r=mshal 2014-03-25 14:40:36 -04:00
B2G Bumper Bot
134795226d 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
29c693fc1f Bumping manifests a=b2g-bump 2014-03-25 11:16:17 -07:00