Commit Graph

7557 Commits

Author SHA1 Message Date
Doug Turner
bd8979b3cf Bug 977725 - MLS Geolocation seeding GONK GPS Provider. r=kanru 2014-03-22 00:42:55 -07:00
B2G Bumper Bot
cae4a262ec Bumping manifests a=b2g-bump 2014-03-21 11:02:34 -07:00
B2G Bumper Bot
4208b0e065 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1265e2a0f500
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #17372 from gtorodelvalle/contacts-bug-982260-intermittent-failure

Bug 982260 - Gaia-integration tests on TBPL fail with: TEST-UNEXPECTED-FAIL | Contacts > Details Merging 15 contacts

========

https://hg.mozilla.org/integration/gaia-central/rev/123b19d43034
Author: German Toro del Valle <gtorodelvalle@gmail.com>
Desc: Bug 982260 - Gaia-integration tests on TBPL fail with: TEST-UNEXPECTED-FAIL | Contacts > Details Merging 15 contacts
2014-03-21 11:01:09 -07:00
B2G Bumper Bot
88c95dce56 Bumping manifests a=b2g-bump 2014-03-21 06:06:07 -07:00
B2G Bumper Bot
00f34a330b Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/84a3ccb6f415
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #17423 from timdream/keyboard-mempressure-race-master

Bug 984238 - Don't kill the keyboard when when it's being launched +shepherd

========

https://hg.mozilla.org/integration/gaia-central/rev/ebd5fc74f4a1
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984238 - Don't kill the keyboard when when it's being launched
2014-03-21 06:00:58 -07:00
B2G Bumper Bot
c0bfedd0a7 Bumping manifests a=b2g-bump 2014-03-21 05:56:07 -07:00
B2G Bumper Bot
fb1b17e02a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3bb28013057e
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #17250 from eliperelman/bug-979396-homescreen-swipe-velocity

Bug 979396 - Converting homescreen swipe animation to be velocity-sensitive

========

https://hg.mozilla.org/integration/gaia-central/rev/e6d4335cf06a
Author: Eli Perelman <eli@eliperelman.com>
Desc: Converting homescreen swipe animation to be velocity-sensitive
2014-03-21 05:50:56 -07:00
B2G Bumper Bot
fb170c809d Bumping manifests a=b2g-bump 2014-03-21 04:11:09 -07:00
B2G Bumper Bot
d75d0a2514 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2f64eeaddcd8
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - [keyboard refactor] Add test/unit/.jshintrc
2014-03-21 04:05:56 -07:00
B2G Bumper Bot
3217c97a36 Bumping manifests a=b2g-bump 2014-03-21 02:17:41 -07:00
B2G Bumper Bot
a99814930e Bumping manifests a=b2g-bump 2014-03-21 00:11:20 -07:00
B2G Bumper Bot
e1e3f70a3a Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3045bf73d5cc
Author: Carsten Book -Tomcat- <cbook@mozilla.com>
Desc: Revert "Bug 983663 - [Contacts] JSHint fixes for contact unit tests r=arcturus" for Gaia Unit Test Bustage

This reverts commit 4de450bb6f1a6407aa9a23bf211a7e8e9742b913.
2014-03-21 00:06:01 -07:00
B2G Bumper Bot
d8e42c6fa2 Bumping manifests a=b2g-bump 2014-03-20 19:49:40 -07:00
B2G Bumper Bot
4b89499999 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/9f7ea9db8ff2
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #17203 from KevinGrandon/bug_983663_contacts_unit_test_lint

Bug 983663 - [Contacts] JSHint fixes for contact unit tests

========

https://hg.mozilla.org/integration/gaia-central/rev/2c99aceb1b7f
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 983663 - [Contacts] JSHint fixes for contact unit tests r=arcturus
2014-03-20 19:49:29 -07:00
B2G Bumper Bot
6bab98e345 Bumping manifests a=b2g-bump 2014-03-20 17:46:05 -07:00
B2G Bumper Bot
1f0fb798b3 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/38ce454dc452
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #17398 from zacc/bug_986117

Bug 986117 - Debug intermittents in test_settings_app_permissions.py, r=mhenretty

========

https://hg.mozilla.org/integration/gaia-central/rev/7cd0d3ae228b
Author: Zac <zcampbell@mozilla.com>
Desc: Bug 986117 - Resolve intermittents in test_settings_app_permissions.py with enhanced wait for Settings app initialisation r=mhenrtty
2014-03-20 17:35:41 -07:00
Ryan VanderMeulen
a5e0e0ab4a Merge fx-team to m-c. 2014-03-20 16:49:14 -04:00
B2G Bumper Bot
490ae21fca Bumping manifests a=b2g-bump 2014-03-20 12:17:44 -07:00
B2G Bumper Bot
305d59adcc Bumping manifests a=b2g-bump 2014-03-20 11:51:15 -07:00
B2G Bumper Bot
5aa944c469 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a9008fd903e2
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Revert "Bug 983777 - [B2G][Contacts] Tapping the Favorite button on an imported facebook contact will break the Edit Contact button"

This reverts commit a9b63fa5001dfe7e1fa8bdffe2e4bdc5d5221027.
2014-03-20 11:46:03 -07:00
B2G Bumper Bot
40f6bdd877 Bumping manifests a=b2g-bump 2014-03-20 10:48:11 -07:00
B2G Bumper Bot
4e9f876ec6 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/596d2a4031c3
Author: Fernando Campo <fernando.campo@o2.com>
Desc: Merge pull request #16960 from fcampo/fix-jshint-fte

[FTE] Fixed some jshint errors (r=arcturus, f=julienw)

========

https://hg.mozilla.org/integration/gaia-central/rev/d91a3f5b5bae
Author: Fernando Campo <fernando.campo@o2.com>
Desc: Bug 980344 - [FTE] Fixed some jshint errors
2014-03-20 10:48:00 -07:00
B2G Bumper Bot
d4ddbfba89 Bumping manifests a=b2g-bump 2014-03-20 10:27:39 -07:00
B2G Bumper Bot
2e490017be Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a8200cb53abe
Author: Michal Budzynski <michal@virtualdesign.pl>
Desc: Merge pull request #17390 from michalbe/polish-button-content

Bug 984315 - Fixing flexboxes in contact button

========

https://hg.mozilla.org/integration/gaia-central/rev/ca3d95ce0e95
Author: Michal Budzynski <michal@virtualdesign.pl>
Desc: [Bug 984315] Fixing flexboxes in contact button

[Bug 984315] Add "carrier" class to the element

[Bug 984315] Proper HTML & styles for the carrier

[Bug 984315] Displaying coma when needed

[Bug 984315] Console logs removed

[Bug 984315] Contact button flex fix

[Bug 984315] Call icon padding fix

[Bug 984315] Moving styles to CSS

[Bug 984315] Last polishing

[Bug 984315] Tests update

[Bug 984315] Use L10N instead of plain text

[Bug 984315] New tests for contact details

[Bug 984315] Lint fixes

[Bug 984315] CSS fix for button padding

[Bug 984315] Merge fix
2014-03-20 10:26:13 -07:00
B2G Bumper Bot
258cd3c02e Bumping manifests a=b2g-bump 2014-03-20 10:20:59 -07:00
B2G Bumper Bot
59f08033a2 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/06b2c2b7e8d6
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #17190 from rnowm/981882

Bug 981882 - Update input field design

========

https://hg.mozilla.org/integration/gaia-central/rev/dfd3d3277253
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 981882 - Update input field design
2014-03-20 10:16:19 -07:00
B2G Bumper Bot
23613b44e2 Bumping manifests a=b2g-bump 2014-03-20 09:41:50 -07:00
B2G Bumper Bot
6d670069a7 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/07b71c055adc
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #17326 from azasypkin/sms

Bug 962659 - [B2G][Contacts] Adjust Remove and Cancel button's position and style in contact deletion confirm for better use experience. r=schung.

========

https://hg.mozilla.org/integration/gaia-central/rev/a9a9d800857b
Author: Aleh Zasypkin <azasypkin@mozilla.com>
Desc: Bug 962659 - [B2G][Contacts] Adjust Remove and Cancel button's position and style in contact deletion confirm for better use experience.
2014-03-20 09:35:45 -07:00
B2G Bumper Bot
46baf2a741 Bumping manifests a=b2g-bump 2014-03-20 08:36:08 -07:00
B2G Bumper Bot
477b3fc2d2 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7d606b46ba63
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #17287 from DouglasSherk/983054-dsds-suggestions

Bug 983054 - [DSDS][Dialer] Only fill active number instead of calling from suggestions bar on dual SIM devices. r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/42a0fd576e41
Author: DouglasSherk <github@sherk.me>
Desc: Bug 983054 - [DSDS][Dialer] Only fill active number instead of calling from suggestions bar on dual SIM devices. r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/5dadca23b7b3
Author: RickyChien <ricky060709@gmail.com>
Desc: Merge pull request #17361 from RickyChien/bug-984251

Bug 984251 - ./bin/gaia-test and Travis-CI unit tests should be working with test_apps r=@yurenju

========

https://hg.mozilla.org/integration/gaia-central/rev/e3a1c9660ec0
Author: Ricky Chien <ricky060709@gmail.com>
Desc: Bug 984251 - ./bin/gaia-test and Travis-CI unit tests should be working with test_apps
2014-03-20 08:31:01 -07:00
B2G Bumper Bot
3a5ab6ebbc Bumping manifests a=b2g-bump 2014-03-20 08:11:24 -07:00
B2G Bumper Bot
72fcaf1c49 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/418829c93f09
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #17385 from AndreiH/bug_985927

Bug 985927 - Button locator changed for test_window_open_inside_iframe.T...

========

https://hg.mozilla.org/integration/gaia-central/rev/b36e1e1e4b63
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 985927 - Button locator changed for test_window_open_inside_iframe.TestWindowOpenInsideIframe
2014-03-20 08:05:47 -07:00
B2G Bumper Bot
502c25763f Bumping manifests a=b2g-bump 2014-03-20 07:23:01 -07:00
B2G Bumper Bot
7b62fd6ddb Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ac70186f8d7e
Author: Carsten Book -Tomcat- <cbook@mozilla.com>
Desc: Revert "Bug 961800 - Implement Child Window Factory" for Gaia UI Test Bustage

This reverts commit 0cd5228663d8563831f0156e85ae8225d2004a3c.
2014-03-20 07:21:10 -07:00
Carsten "Tomcat" Book
a04233feb4 Merge mozilla-central to b2g-inbound 2014-03-20 14:21:13 +01:00
Carsten "Tomcat" Book
e9c7dd6611 merge b2g-inbound to mozilla-central 2014-03-20 14:07:58 +01:00
Carsten "Tomcat" Book
69fa5d77b5 merge mozilla-inbound to mozilla-central 2014-03-20 13:56:02 +01:00
B2G Bumper Bot
8f41ae3770 Bumping manifests a=b2g-bump 2014-03-19 22:56:16 -07:00
B2G Bumper Bot
3dcc7a2429 Bumping gaia.json for 18 gaia revision(s) a=gaia-bump
========

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

This reverts commit 22a4d4f8065af46d23097bbaf898831d5c031ce3.

========

https://hg.mozilla.org/integration/gaia-central/rev/c898bac8e399
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #17311 from timdream/keyboard2-jshint

Bug 984718 - [keyboard refactor] Fix jshint errors, r=rudyl

========

https://hg.mozilla.org/integration/gaia-central/rev/81b608b07b34
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Add test/unit/.jshintrc

========

https://hg.mozilla.org/integration/gaia-central/rev/50c5e595decc
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for shiftkey_test.js

========

https://hg.mozilla.org/integration/gaia-central/rev/f47914733adf
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for page_test.js

========

https://hg.mozilla.org/integration/gaia-central/rev/551cd52291a0
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for doublespace_test.js

========

https://hg.mozilla.org/integration/gaia-central/rev/cd3add8bf7a6
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for touch_handler.js

========

https://hg.mozilla.org/integration/gaia-central/rev/9e3bc170b4dd
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for suggestions.js

========

https://hg.mozilla.org/integration/gaia-central/rev/8e66c29fe26d
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for shiftkey.js

========

https://hg.mozilla.org/integration/gaia-central/rev/9452db9378f7
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for settings.js

========

https://hg.mozilla.org/integration/gaia-central/rev/d02f5491ce03
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for pageview.js

========

https://hg.mozilla.org/integration/gaia-central/rev/487771ef78f9
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for page.js

========

https://hg.mozilla.org/integration/gaia-central/rev/5f4e55f0b705
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for layout.js

========

https://hg.mozilla.org/integration/gaia-central/rev/551fccef9224
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for key.js

========

https://hg.mozilla.org/integration/gaia-central/rev/9d57fcda4c16
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for input_field.js

========

https://hg.mozilla.org/integration/gaia-central/rev/53c23e9f2880
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for doublespace.js

========

https://hg.mozilla.org/integration/gaia-central/rev/56a516351ac1
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for boot.js

========

https://hg.mozilla.org/integration/gaia-central/rev/7b1506bd4160
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for autocorrect.js
2014-03-19 22:55:19 -07:00
B2G Bumper Bot
10a2f9c9ff Bumping manifests a=b2g-bump 2014-03-19 21:56:07 -07:00
B2G Bumper Bot
301e3ae796 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e10dad3943a5
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #17067 from crh0716/975265

Bug 975265 - Add the support for LTE network types r=jaoo

========

https://hg.mozilla.org/integration/gaia-central/rev/d73ed53163d1
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 975265 - Add the support for LTE network types
2014-03-19 21:50:12 -07:00
B2G Bumper Bot
0c190372a6 Bumping manifests a=b2g-bump 2014-03-19 21:41:07 -07:00
B2G Bumper Bot
d5f85f2c58 Bumping gaia.json for 15 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/536b0405f97c
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Merge pull request #17263 from gasolin/bubble-merge225" for possibly breaking gaia-ui tests on TBPL

This reverts commit 27c414d178694a17e7a2967fa377938163ac44ae, reversing
changes made to e592ec99013a43002171d1bd4be2f497c12ada88.

========

https://hg.mozilla.org/integration/gaia-central/rev/158472d7dba4
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Revert "Bug 985787 - Change requireApp to require to make includes work in search unit test" for possibly breaking gaia-ui tests on tbpl" because I didn't mean to revert this patch with everything else I reverted

This reverts commit b3564260d93fcf7d5127de26bb7f45d13b893a42.

========

https://hg.mozilla.org/integration/gaia-central/rev/864ab4a193de
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #17356 from yurenju/stage2

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

========

https://hg.mozilla.org/integration/gaia-central/rev/3726337a624c
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

========

https://hg.mozilla.org/integration/gaia-central/rev/b92ea9307a62
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Bug 971546 - [System2] Instantiable Screenshot" for possibly breaking gaia-ui tests on TBPL

This reverts commit ec5be24bd877588f60f6c64715b894157a20c603.

========

https://hg.mozilla.org/integration/gaia-central/rev/78c3bf7a1577
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Bug 971577 - [System] Make visibility manager instantiable" for possibly breaking gaia-ui tests on TBPL

This reverts commit 73f3addd228aded613347bed46bd03a5941323d4.

========

https://hg.mozilla.org/integration/gaia-central/rev/fe177281e210
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Bug 961800 - Implement Child Window Factory" for possibly breaking gaia-ui tests on TBPL

This reverts commit 439b23a04c6dba788293f577b1efe8c5d8843b78.

========

https://hg.mozilla.org/integration/gaia-central/rev/9ec410c953e8
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Bug 971556 - [System2] Instantiable SourceView." for possibly breaking gaia-ui tests on TBPL

This reverts commit 0611fa4704a77acfe2001c80afe56a98a081df77.

========

https://hg.mozilla.org/integration/gaia-central/rev/df7f69246d85
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Bug 970028 - Nicer activity opener animation" for possibly breaking gaia-ui tests on tbpl

This reverts commit 870a91032c9d6bd84713618df0e80f0b50962488.

========

https://hg.mozilla.org/integration/gaia-central/rev/ca4be0a3a1e7
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Bug 974828 - [Settings][dsds] Outgoing data confirmation is wrong" for possibly breaking gaia-ui tests on tbpl

This reverts commit e592ec99013a43002171d1bd4be2f497c12ada88.

========

https://hg.mozilla.org/integration/gaia-central/rev/371d7310fbd4
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Bug 985787 - Change requireApp to require to make includes work in search unit test" for possibly breaking gaia-ui tests on tbpl

This reverts commit 2e388f26d4a1b484d1fcfded068bc82d18ca4bf9.

========

https://hg.mozilla.org/integration/gaia-central/rev/eb1509d301d6
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #17347 from qdot/985787-search-unit-test-fix

Bug 985787 - Change requireApp to require to make includes work in search unit test

========

https://hg.mozilla.org/integration/gaia-central/rev/f07f5d82deee
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Bug 985787 - Change requireApp to require to make includes work in search unit test

========

https://hg.mozilla.org/integration/gaia-central/rev/73e7584ac6cd
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #17314 from yurenju/big920431-2

Bug 920431 - [keyboard] keyboard_layout.json should be customizable r=@yurenju

========

https://hg.mozilla.org/integration/gaia-central/rev/fd6275559f57
Author: Rudy Lu <me@rudy.lu>
Desc: Bug 920431 - [keyboard] keyboard_layout.json should be customizable

Conflicts:
	build/settings.js
	build/test/integration/distribution.test.js
	build/webapp-manifests.js
2014-03-19 21:40:12 -07:00
B2G Bumper Bot
f68a32d905 Bumping manifests a=b2g-bump 2014-03-19 19:36:09 -07:00
B2G Bumper Bot
0da4b0cb09 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 981626 - [Sora][gallery]Can't be shared when select picture and video simultaneously, r=@dominickuo

========

https://hg.mozilla.org/integration/gaia-central/rev/7c91fc678b71
Author: ian-liu <iliu@mozilla.com>
Desc: Bug 981626 - [Sora][gallery]Can't be shared when select picture and video simultaneously
2014-03-19 19:31:01 -07:00
B2G Bumper Bot
07dd0ec625 Bumping manifests a=b2g-bump 2014-03-19 18:46:05 -07:00
B2G Bumper Bot
f90b6ada98 Bumping gaia.json for 7 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ec735620fcff
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #17263 from gasolin/bubble-merge225

cherry-pick Bubble-tea

========

https://hg.mozilla.org/integration/gaia-central/rev/94c37dafac4e
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 974828 - [Settings][dsds] Outgoing data confirmation is wrong

- update test
- change the way about how we show confirm window

========

https://hg.mozilla.org/integration/gaia-central/rev/cda9fc54ec17
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 970028 - Nicer activity opener animation

========

https://hg.mozilla.org/integration/gaia-central/rev/1ef05f8d675f
Author: Cédric de Saint Martin <cedric.dsm@tiolive.com>
Desc: Bug 971556 - [System2] Instantiable SourceView.

========

https://hg.mozilla.org/integration/gaia-central/rev/671cfdfc031b
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 961800 - Implement Child Window Factory

Conflicts:
	apps/system/js/app_transition_controller.js
	apps/system/js/app_window.js
	apps/system/js/app_window_manager.js
	apps/system/js/cards_view.js
	apps/system/style/window.css

========

https://hg.mozilla.org/integration/gaia-central/rev/79679041e3f0
Author: Rex Lee <rexboy@mozilla.com>
Desc: Bug 971577 - [System] Make visibility manager instantiable

========

https://hg.mozilla.org/integration/gaia-central/rev/9573ca6d00fa
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 971546 - [System2] Instantiable Screenshot
2014-03-19 18:40:48 -07:00
B2G Bumper Bot
3376b30479 Bumping manifests a=b2g-bump 2014-03-19 17:51:28 -07:00
B2G Bumper Bot
4a58348747 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c123cdbc24cb
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #17344 from mcav/apop

Bug 983167 - [email/POP3] broken node-crypto.js shim causes auth failure...

========

https://hg.mozilla.org/integration/gaia-central/rev/fc451944db53
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 983167 - [email/POP3] broken node-crypto.js shim causes auth failure when attempting APOP auth. r=asuth
2014-03-19 17:46:17 -07:00
Wes Kocher
847958cbab Backed out 3 changesets (bug 980027) for causing a serious race in hal with the pref service
Backed out changeset 5cd05df56f67 (bug 980027)
Backed out changeset 6344d6606517 (bug 980027)
Backed out changeset 098a43b537e9 (bug 980027)
2014-03-19 15:36:13 -07:00