Commit Graph

187130 Commits

Author SHA1 Message Date
Ryan VanderMeulen
f2bade55ae Merge fx-team to m-c. a=merge 2014-06-08 13:15:44 -04:00
Tim Taubert
c7b1cf5924 Backed out changeset 84a0967ba12d (bug 804430) 2014-06-08 08:28:05 +02:00
Markus Stange
9ae39077a4 Bug 1022206 - Add missing include to nsChildView.mm in order to fix building with --disable-accessibility on Mac. a=npotb DONTBUILD 2014-06-08 01:59:18 +02:00
Ryan VanderMeulen
a9d2336428 Bug 567954 - Re-disable test_mixed_principals.html on B2G. a=me 2014-06-07 14:13:34 -04:00
Ryan VanderMeulen
8ad58324ce Merge m-c to inbound on a CLOSED TREE. a=me 2014-06-07 13:36:44 -04:00
Ryan VanderMeulen
b5cd9fafe9 Merge b2g-inbound to m-c. a=merge 2014-06-07 13:34:25 -04:00
Ryan VanderMeulen
90206a1002 Merge fx-team to m-c. a=merge 2014-06-07 13:32:47 -04:00
B2G Bumper Bot
c9925d1a36 Bumping manifests a=b2g-bump 2014-06-07 07:31:26 -07:00
B2G Bumper Bot
b6eab90824 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0a26eafbba1c
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Revert "Merge pull request #20011 from borjasalguero/mobileid_ui"

This reverts commit 270a833e262dfbaf855cc6954d23a55f92c60db5, reversing
changes made to 131c5cce4afe158b1db0be58f980130ccc1ab34a.

========

https://hg.mozilla.org/integration/gaia-central/rev/c9dfd4ce33e8
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Revert "Merge pull request #19559 from acperez/bug-1009633"

This reverts commit 8cee6e0e1b8037ec22c010399d7f2d06f3d9b0d2, reversing
changes made to 2cfd8e79ca6ee6bd163d3f4748e00af239cf2f23.
2014-06-07 07:25:36 -07:00
B2G Bumper Bot
6435ac27a7 Bumping manifests a=b2g-bump 2014-06-07 07:01:49 -07:00
B2G Bumper Bot
6a14ac47cb Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a2f40dcb6d96
Author: Yura Zenevich <yura.zenevich@gmail.com>
Desc: Merge pull request #20089 from yzen/bug-1021137

Bug 1021137 - added missing aria attributes the the lockscreen's passcod...

========

https://hg.mozilla.org/integration/gaia-central/rev/df230835fcec
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1021137 - added missing aria attributes the the lockscreen's passcode panel and media container. r=alive
2014-06-07 06:55:34 -07:00
B2G Bumper Bot
2766781780 Bumping manifests a=b2g-bump 2014-06-07 06:51:31 -07:00
B2G Bumper Bot
65e2676ffb Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ece1e6123344
Author: Yura Zenevich <yura.zenevich@gmail.com>
Desc: Merge pull request #20147 from yzen/bug-1021708

Bug 1021708 - [Vertical Homescreen] Making search entry screen reader ac...

========

https://hg.mozilla.org/integration/gaia-central/rev/79a166295c9e
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1021708 - [Vertical Homescreen] Making search entry screen reader acesssible.
2014-06-07 06:45:38 -07:00
ffxbld
4fe9e3ab4b No bug, Automated HSTS preload list update from host bld-linux64-spot-051 - a=hsts-update 2014-06-07 03:18:25 -07:00
ffxbld
28e4ac9470 No bug, Automated blocklist update from host bld-linux64-spot-005 - a=blocklist-update 2014-06-07 03:13:35 -07:00
B2G Bumper Bot
597883abda Bumping manifests a=b2g-bump 2014-06-07 03:06:31 -07:00
B2G Bumper Bot
7783a03f80 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/be2f82158001
Author: Borja Salguero <borjasalguero@users.noreply.github.com>
Desc: Merge pull request #20011 from borjasalguero/mobileid_ui

Bug 1003330: Mobile identity UI. r=ferjm

========

https://hg.mozilla.org/integration/gaia-central/rev/b456a5e7ae06
Author: Borja Salguero <borja.bugzilla@gmail.com>
Desc: Bug 1003330: Mobile identity UI. r=ferjm
2014-06-07 03:00:44 -07:00
B2G Bumper Bot
9be59026f4 Bumping manifests a=b2g-bump 2014-06-07 01:31:28 -07:00
B2G Bumper Bot
4a2e858a0d Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/9abc08d753dd
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #20120 from etiennesegonzac/bug-1021533

Bug 1021533 - (bug 1018836 follow up) css class cleanup. r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/ff83f8ebf58f
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 1021533 - (bug 1018836 follow up) css class cleanup.

========

https://hg.mozilla.org/integration/gaia-central/rev/97311ba85093
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #20116 from etiennesegonzac/bug-1021237

Bug 1021237 - Make the edge zones higher in landscape mode. r=21

========

https://hg.mozilla.org/integration/gaia-central/rev/d99a8e7375d1
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 1021237 - Make the edge zones higher in landscape mode.
2014-06-07 01:25:39 -07:00
B2G Bumper Bot
57f4922f6d Bumping manifests a=b2g-bump 2014-06-07 00:57:08 -07:00
B2G Bumper Bot
ffa33ea659 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/09258d9718d8
Author: Sam Foster <sam@sam-i-am.com>
Desc: Merge pull request #20107 from sfoster/bug-1019289-videos

Bug 1019289 - Final FTE videos from epang, with 1x, 1.5x and 2x res. r=fcampo

========

https://hg.mozilla.org/integration/gaia-central/rev/1ca54765672f
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1019289 - Final FTE videos from epang, with 1x, 1.5x and 2x resolutions. r=fcampo
2014-06-07 00:55:33 -07:00
B2G Bumper Bot
4290029dee Bumping manifests a=b2g-bump 2014-06-07 00:36:25 -07:00
B2G Bumper Bot
4c7e1e16fb Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/cd8ae2c66efb
Author: Albert <acperez@tid.es>
Desc: Merge pull request #19559 from acperez/bug-1009633

Bug 1009633 - Pre-polulate browser top sites by SIM

========

https://hg.mozilla.org/integration/gaia-central/rev/ff81bb898c05
Author: Albert <acperez@tid.es>
Desc: Bug 1009633 - Pre-polulate browser top sites by SIM
2014-06-07 00:30:35 -07:00
B2G Bumper Bot
436b4d7e68 Bumping manifests a=b2g-bump 2014-06-06 23:11:24 -07:00
B2G Bumper Bot
d279e39e94 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b919f497d334
Author: Sam Foster <sam@sam-i-am.com>
Desc: Merge pull request #20111 from sfoster/bug-1020435-strings

Bug 1020435 - 'Hold an' not 'Hold on an' icon in new FTU strings. r=fcampo

========

https://hg.mozilla.org/integration/gaia-central/rev/c4873736ae00
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1020435 - One word fix to finalize FTU tutorial strings
2014-06-06 23:05:36 -07:00
B2G Bumper Bot
6b244e0cef Bumping manifests a=b2g-bump 2014-06-06 22:56:23 -07:00
B2G Bumper Bot
84b350d36b Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f07e8b6a3df5
Author: Sam Foster <sam@sam-i-am.com>
Desc: Merge pull request #20087 from sfoster/bug-939174-upgrade-tutorial

Bug 939174 - Launch whats new FTU tutorial to demo edge gestures etc. r=borjasalguero,alive

========

https://hg.mozilla.org/integration/gaia-central/rev/001056cd5522
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 939174 - Launch whats new FTU tutorial to demo edge gestures etc. r=borjasalguero,alive

* Add shared VersionHelper
* Unit tests for VersionHelper, FTULauncher
* Check device.previous_os in FTULauncher/FTU app
* Launch full ftu when ftu.enabled always
* Launch ftu whats new tutorial when upgrade detected
* Add config for 1.3-2.0 upgrade tutorial
2014-06-06 22:50:33 -07:00
Ryan VanderMeulen
82493ad66d Backed out changeset 88a641ee5cbe (bug 1007057) for frequent test timeouts.
CLOSED TREE
2014-06-07 01:16:08 -04:00
Ryan VanderMeulen
7b4af4d888 Bug 984274 - Disable test_sandbox_permission.html for frequent failures on a CLOSED TREE. 2014-06-07 01:12:33 -04:00
Ryan VanderMeulen
611ba29905 Bug 891840 - Disable test_pixel_lengths.html on all platforms for intermittent crashes.
CLOSED TREE
2014-06-07 01:08:16 -04:00
Ryan VanderMeulen
c11b00c1fb Bug 953208 - Disable test_tcpserversocket.js on OSX for frequent failures. 2014-06-07 01:06:24 -04:00
Ryan VanderMeulen
0e19fde874 Bug 1019315 - Disable test_viewsource_forbidden_in_iframe.xul on all platforms for frequent intermittent failures. 2014-06-07 01:06:23 -04:00
B2G Bumper Bot
b321436c26 Bumping manifests a=b2g-bump 2014-06-06 22:01:28 -07:00
B2G Bumper Bot
a750a0ffc9 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4c7b6effecf4
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #20175 from davidflanagan/bug995540-master

Merge pull request #19409 from dmarcos/bug995540 r=dmarcos

========

https://hg.mozilla.org/integration/gaia-central/rev/4787cfb14cd1
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #19409 from dmarcos/bug995540

Bug 995540 - [Sora][camera]video recording would not stop instantly when...(cherry picked from commit 93623f6435849cc9f54d9996e8e64828ac9091d1)

Conflicts:

	apps/camera/js/app.js
	apps/camera/js/controllers/camera.js
	apps/system/js/attention_screen.js
2014-06-06 21:55:36 -07:00
Ryan VanderMeulen
c34eb2f090 No bug - Re-enable some media mochitests that no longer fail and disable a couple that fail frequently. 2014-06-07 00:54:02 -04:00
Ryan VanderMeulen
559d06da25 Backed out 3 changesets (bug 1021114, bug 988486) for GC crashes on a CLOSED TREE.
Backed out changeset f56234ba7ec7 (bug 1021114)
Backed out changeset 14a4a9062253 (bug 988486)
Backed out changeset 03eccac81e15 (bug 988486)
2014-06-07 00:03:17 -04:00
Ryan VanderMeulen
f3454be2d1 Backed out changeset abdb3afb7208 (bug 1014815) for B2G reftest failures. 2014-06-07 00:02:28 -04:00
B2G Bumper Bot
8ccb8c4277 Bumping manifests a=b2g-bump 2014-06-06 20:07:09 -07:00
B2G Bumper Bot
0e7289a793 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8ff2792c4485
Author: Sam Foster <sam@sam-i-am.com>
Desc: Merge pull request #20164 from sfoster/bug-990035-video-tutorial

Bug 990035 - Modify phone-sized tutorial to show videsteps. r=borjasalguero

========

https://hg.mozilla.org/integration/gaia-central/rev/399873247292
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 990035 - Modify phone-sized tutorial to show vertical-scroll, notifications & sheets video. r=borjasalguero

* modify phone-layout tutorial config to use new video assets and tutorial strings
* placeholder video assets
* add optional callback to _setStep and handle image/video load errors
* hide overflow in tutorial step image/video container
* fix ui test for 3 steps
* remove orphaned tutorial images
* use .step-video-base to ensure video is height:100%
* Post-backout: Refactor tests and clarify expectation in event of config load failure
2014-06-06 20:05:40 -07:00
B2G Bumper Bot
179244e807 Bumping manifests a=b2g-bump 2014-06-06 17:53:10 -07:00
B2G Bumper Bot
00c0596a0e Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/905d0801fa56
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1014616 - [Vertical] Align Icon/Divider layout to spec r=me
2014-06-06 17:53:00 -07:00
Aki Sasaki
6d9bb891ed bug 987980 - no longer need b2g_manifest_branch. r=rail 2014-06-06 17:44:58 -07:00
B2G Bumper Bot
58d20b2b16 Bumping manifests a=b2g-bump 2014-06-06 16:48:18 -07:00
B2G Bumper Bot
4150bf76ac Bumping manifests a=b2g-bump 2014-06-06 16:41:34 -07:00
B2G Bumper Bot
bc41199073 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ceaba9d0c03c
Author: Jim Porter <jporter@mozilla.com>
Desc: Merge pull request #20170 from jimporter/ringtones-fix-tests

Bug 1021994 - Fix ringtones tests

========

https://hg.mozilla.org/integration/gaia-central/rev/dc4446054c3b
Author: Jim Porter <jporter@mozilla.com>
Desc: Bug 1021994 - Fix ringtones tests; r=lightsofapollo
2014-06-06 16:36:09 -07:00
B2G Bumper Bot
4bb69ff047 Bumping manifests a=b2g-bump 2014-06-06 16:26:14 -07:00
B2G Bumper Bot
f9686cbc20 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/fb78b6585e31
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Merge pull request #20153 from millermedeiros/event-detail-963394

Bug 963394 - Visual refresh for event detail page r=gaye

========

https://hg.mozilla.org/integration/gaia-central/rev/6b1c35454e93
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 963394 - Visual refresh for event detail page
2014-06-06 16:21:13 -07:00
Wes Kocher
960f637634 Backed out changeset f4f3b1e4a0e5 (bug 1020497) for b2g debug emulator mochitest-1 failures 2014-06-06 15:17:55 -07:00
B2G Bumper Bot
558da28c80 Bumping manifests a=b2g-bump 2014-06-06 15:12:21 -07:00
B2G Bumper Bot
cab0c26168 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a4e53e1001f2
Author: Marshall Culpepper <marshall.law@gmail.com>
Desc: Merge pull request #20106 from marshall/bug995434_ftuPingSimLocked_master

Bug 999053: [FTU Ping] Handle multisim situations more gracefully when collecting network info

========

https://hg.mozilla.org/integration/gaia-central/rev/b46ac200fb89
Author: Marshall Culpepper <marshall@mozilla.com>
Desc: Bug 999053: [FTU Ping] Handle multisim situations more gracefully when collecting network info. r=fabrice

Conflicts:

	apps/system/test/unit/ftu_ping_test.js

========

https://hg.mozilla.org/integration/gaia-central/rev/fc307ae1c820
Author: gitmai <mri@tid.es>
Desc: Merge pull request #19628 from gitmai/bug-1007588-CC-iac-with-sms

Bug 1007588 -[Cost Control] Implement an IAC mechanism to warn other app...
r=salva

========

https://hg.mozilla.org/integration/gaia-central/rev/5b43cbc7469c
Author: mai <mri@tid.es>
Desc: Bug 1007588 -[Cost Control] Implement an IAC mechanism to warn other applications about sending a SMS for requiring balance or making a SMS top-up
2014-06-06 15:05:45 -07:00