Commit Graph

174062 Commits

Author SHA1 Message Date
B2G Bumper Bot
5d7a5450f2 Bumping manifests a=b2g-bump 2014-03-19 21:41:07 -07:00
B2G Bumper Bot
c1771c1552 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
a816c6a50b Bumping manifests a=b2g-bump 2014-03-19 19:36:09 -07:00
B2G Bumper Bot
d3b121c29a 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
20b7e52cac Bumping manifests a=b2g-bump 2014-03-19 18:46:05 -07:00
B2G Bumper Bot
4fc0e9affe 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
c196b4b577 Bumping manifests a=b2g-bump 2014-03-19 17:51:28 -07:00
B2G Bumper Bot
ea18ff01c6 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
B2G Bumper Bot
5e75ee16d6 Bumping manifests a=b2g-bump 2014-03-19 14:47:11 -07:00
B2G Bumper Bot
ca773e4412 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/50872ab77f6b
Author: Fabrice Desré <fabrice@mozilla.com>
Desc: Bug 983760 - Dont show crash screen if tab is not currently active. r=daleharvey
2014-03-19 14:45:42 -07:00
Dave Hylands
d1e38d7c59 Bug 983848 - Don't use settings db in UpdatePrompt when running under xpcshell. r=bent 2014-03-19 11:58:01 -07:00
B2G Bumper Bot
e6d0a9690b Bumping manifests a=b2g-bump 2014-03-19 11:51:08 -07:00
B2G Bumper Bot
8fd481c493 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/181049c75f53
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #17223 from vingtetun/bug984151

Bug 984151 - Make the contacts image pull up effect smoother. r=arcturus

========

https://hg.mozilla.org/integration/gaia-central/rev/752987e94d55
Author: Vivien Nicolas <21@vingtetun.org>
Desc: Bug 984151 - Make the contacts image pull up effect smoother. r=arcturus

========

https://hg.mozilla.org/integration/gaia-central/rev/de18d91d9202
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #17337 from vingtetun/bug981610.shared

Bug 981610 - Remove some CSS warnings on shared/. r=arnau

========

https://hg.mozilla.org/integration/gaia-central/rev/3e386227223e
Author: Vivien Nicolas <21@vingtetun.org>
Desc: Bug 981610 - Remove some CSS warnings on shared/. r=arnau
2014-03-19 11:45:59 -07:00
B2G Bumper Bot
0a97ff23a9 Bumping manifests a=b2g-bump 2014-03-19 11:11:06 -07:00
B2G Bumper Bot
7b9c9d69b9 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ac9e11ac7ef1
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #17334 from vingtetun/bug981610.keyboards

Bug 981610 - Remove some CSS warnings on the keyboard app. r=janjongboom

========

https://hg.mozilla.org/integration/gaia-central/rev/9eb973a412fc
Author: Vivien Nicolas <21@vingtetun.org>
Desc: Bug 981610 - Remove some CSS warnings on the keyboard app. r=janjongboom

========

https://hg.mozilla.org/integration/gaia-central/rev/72858e9f347e
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #17202 from rnowm/981887

Bug 981887 - Update button design using current BB structure and "Plan B" design

========

https://hg.mozilla.org/integration/gaia-central/rev/f86b04fd966d
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 981887 - Update button design using current BB structure and "Plan B" design
2014-03-19 11:06:04 -07:00
B2G Bumper Bot
d2ee6d7518 Bumping manifests a=b2g-bump 2014-03-19 10:31:03 -07:00
B2G Bumper Bot
31adc2a986 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7b407971f5e9
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Merge pull request #17214 from qdot/983507-flight-mode-radio-off

Bug 983507 - Make airplane mode icon appear via airplaneMode setting, not RIL status

========

https://hg.mozilla.org/integration/gaia-central/rev/2f72a17e70d9
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Bug 983507 - Make airplane mode icon appear via airplaneMode setting, not RIL status
2014-03-19 10:25:51 -07:00
B2G Bumper Bot
0f251c609e Bumping manifests a=b2g-bump 2014-03-19 10:17:43 -07:00
B2G Bumper Bot
d06c15879f Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a6daf6b427d8
Author: russnicoletti <rnicoletti@mozilla.com>
Desc: Merge pull request #17215 from russnicoletti/bug982743

Bug 982743 - [B2G][Clock]Timer section's Resume button illuminates and doesn't resume timer countdown r=mcav

========

https://hg.mozilla.org/integration/gaia-central/rev/b583b37dab27
Author: Russ Nicoletti <rnicoletti@mozilla.com>
Desc: Bug 982743 - [B2G][Clock]Timer section's Resume button illuminates and doesn't resume timer countdown
2014-03-19 10:15:57 -07:00
B2G Bumper Bot
305da228ab Bumping manifests a=b2g-bump 2014-03-19 09:01:04 -07:00
B2G Bumper Bot
deeb8af8ab Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/40a8306a7319
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #17297 from etiennesegonzac/bug-982196-reflow-helper-upgrade

Bug 982196 - Upgrading the ReflowHelper to use the new devtools tooling.

========

https://hg.mozilla.org/integration/gaia-central/rev/21a7faa34a1c
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 982196 - Upgrading the ReflowHelper to use the new devtools tooling.
r=gaye,janx

========

https://hg.mozilla.org/integration/gaia-central/rev/cd4d77e23bfe
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #17290 from etiennesegonzac/bug-984882-callscreen-display-l10n-followup

Bug 984882 - 946874 l10n follow up. r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/e03df3a4285f
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 984882 - 946874 l10n follow up. r=rik
2014-03-19 08:55:58 -07:00
Carsten "Tomcat" Book
25e80771a2 Merge mozilla-central to b2g-inbound 2014-03-19 16:30:49 +01:00
Andrew Halberstadt
c5299fccd1 Bug 983262 - Remove obsolete b2g mochitest json manifests, r=jmaher 2014-03-19 11:23:29 -04:00
Carsten "Tomcat" Book
220e7cf496 merge b2g-inbound to mozilla-central 2014-03-19 16:22:07 +01:00
Carsten "Tomcat" Book
8d7a76556f merge fx-team to mozilla-central 2014-03-19 16:21:06 +01:00
Carsten "Tomcat" Book
1c1cd1a7e6 Backed out changeset 094decae8ff3 (bug 917755) for mochitest-1 bustage on a CLOSED TREE 2014-03-19 09:47:43 +01:00
Carsten "Tomcat" Book
1c59036a3b Backed out changeset 002dbc057a74 (bug 917755) 2014-03-19 09:46:13 +01:00
Carsten "Tomcat" Book
73bc975564 Backed out changeset 92e5d79ec57f (bug 917755) 2014-03-19 09:46:12 +01:00
Carsten "Tomcat" Book
de82eb9a6f Backed out changeset 3b41ab878fcd (bug 917755) 2014-03-19 09:46:09 +01:00
Carsten "Tomcat" Book
2d05ba4b43 Backed out changeset 8ad57cf09e75 (bug 917755) 2014-03-19 09:46:07 +01:00
Carsten "Tomcat" Book
cf4b10ed86 Backed out changeset 4771c2b309ad (bug 917755) 2014-03-19 09:46:04 +01:00
Carsten "Tomcat" Book
92dc706141 Backed out changeset 896bfaeab866 (bug 917755) 2014-03-19 09:46:03 +01:00
Carsten "Tomcat" Book
e1e727b8cc Backed out changeset 1b7530ddb0af (bug 917755) 2014-03-19 09:46:01 +01:00
Carsten "Tomcat" Book
3ca2210713 Backed out changeset f7e676be8fa0 (bug 918189) 2014-03-19 09:45:58 +01:00
Carsten "Tomcat" Book
174014df63 Backed out changeset e60fe593236d (bug 918189) 2014-03-19 09:45:57 +01:00
Carsten "Tomcat" Book
1a9bcfcc8e Backed out changeset 2f3187619c9e (bug 918189) 2014-03-19 09:45:48 +01:00
Jan de Mooij
6af7b5d82a Bug 984836 - Rename StackFrame to InterpreterFrame. r=luke 2014-03-19 09:28:57 +01:00
Chris Lord
e8372daeaf Bug 950050 - Allow Gralloc surfaces on the Nexus S. r=nical,lissyx 2014-03-19 08:02:39 +00:00
Shu-yu Guo
48ad465d69 Bug 983477 - Preserve scripts and the JIT code of PJS scripts across GCs for some maximum N GCs. (r=terrence,nmatsakis) 2014-03-19 00:51:55 -07:00
Paolo Amadini
cfffebdea9 Bug 984819 - Remove deprecated promise.js usage in Firefox for Android tests. r=bnicholson 2014-03-19 08:39:35 +01:00
Eitan Isaacson
d5f367f926 Bug 980522 - Move AccessFu:[Activate,MoveCaret,MoveByGranularity] to ContentControl.jsm. r=yzen 2014-03-19 00:38:26 -07:00
Eitan Isaacson
e4b1e38d0a Bug 980521 - Introduce content text tests. r=yzen 2014-03-19 00:38:25 -07:00
B2G Bumper Bot
e3806aafe0 Bumping manifests a=b2g-bump 2014-03-19 00:01:20 -07:00
B2G Bumper Bot
afa68f8fe5 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/91e5760ff948
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #17268 from RudyLu/keyboard/Bug982568-re-enable_keyboard_OOP

Bug 982568 - Re-enable keyboard OOP.
r=timdream.

========

https://hg.mozilla.org/integration/gaia-central/rev/dab8644cde59
Author: Rudy Lu <me@rudy.lu>
Desc: Bug 982568 - Re-enable keyboard OOP
2014-03-18 23:55:39 -07:00
B2G Bumper Bot
0a52536cf1 Bumping manifests a=b2g-bump 2014-03-18 23:36:04 -07:00
B2G Bumper Bot
a8bc3de5fe Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c1c4ccdb26d0
Author: evelynhung <jj.evelyn@gmail.com>
Desc: Merge pull request #16643 from svic/Bug_967345

Bug 967345 - Do a connect() after pair(), r=evelyn

========

https://hg.mozilla.org/integration/gaia-central/rev/3bea1ff66ce5
Author: Arno Puder <arno@puder.org>
Desc: Bug 967345 - Do a connect() after pair()
2014-03-18 23:30:50 -07:00
B2G Bumper Bot
74e0980658 Bumping manifests a=b2g-bump 2014-03-18 22:46:11 -07:00
B2G Bumper Bot
18094b5f15 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/44b197c0484e
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #16349 from dominickuo/bug-973086

Bug 973086 - [Music] Put nfc event registration code in ModeManager, r=jimporter

========

https://hg.mozilla.org/integration/gaia-central/rev/b8ffbd20641f
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Bug 973086 - [Music] Put nfc event registration code in ModeManager

========

https://hg.mozilla.org/integration/gaia-central/rev/1685dbbe9ad9
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #17236 from RudyLu/keyboard/Bug975970-instantiable_touchHandler

Bug 975970 - [keyboard refactor] Convert touch_handler.js to
r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/16884c4bf753
Author: Rudy Lu <me@rudy.lu>
Desc: Bug 975970 - [keyboard refactor] Convert touch_handler.js to
instantiable pattern.
2014-03-18 22:41:00 -07:00
Matt Woodrow
d17d6a7daf Bug 985302 - Make ISurfaceAllocator use AtomicRefCountedWithFinalize to avoid calling virtual functions from its destructor. r=Bas 2014-03-19 12:02:42 +08:00
Wes Kocher
95d416ec3a Merge m-c to fx-team 2014-03-18 19:50:08 -07:00