Matthew Noorenberghe
a60bb60a2e
Merge mozilla-central to UX
2013-09-06 00:10:05 -07:00
Phil Ringnalda
35b74519ff
Back out 997672af6fc8:8a34b197be1d (bug 885169) for Win64 bustage
2013-09-05 20:24:20 -07:00
Ryan VanderMeulen
4a441f3db3
Merge inbound to m-c.
2013-09-05 15:42:49 -04:00
Ryan VanderMeulen
e888aa1cd7
Backed out changeset 9d9e289013de (bug 899213) due to various regressions caused by it.
2013-09-05 15:39:56 -04:00
Ryan VanderMeulen
a7732af543
Merge fx-team to m-c.
2013-09-05 15:37:00 -04:00
Ryan VanderMeulen
6bb118da51
Merge b2g-inbound to m-c.
2013-09-05 15:36:26 -04:00
Gaia Pushbot
084c6bafa5
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/1bb5a08dd1a7
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #11572 from gitmai/bug-905946-autocorrect-punctuation
Bug 905946 - keeping the punctuation character when reverting autofixing r=davidflanagan
========
https://hg.mozilla.org/integration/gaia-central/rev/43f6ddd0c0bf
Author: mai <mri@tid.es>
Desc: Bug 905946 - keeping the punctuation character when reverting autofixing
2013-09-05 11:30:22 -07:00
Gaia Pushbot
573b5cc537
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/817c28709daf
Author: Ben Francis <ben@tola.me.uk>
Desc: Merge pull request #11945 from RudyLu/Bug912906_extend_timeout_forBrowserDBTest
Bug 912906 - Extend the unit test timeout to 5 seconds for r=benfrancis
========
https://hg.mozilla.org/integration/gaia-central/rev/4d879c638593
Author: Rudy Lu <left.lu@gmail.com>
Desc: Bug 912906 - Extend the unit test timeout to 5 seconds for
browser_db_test.
2013-09-05 10:55:21 -07:00
Gaia Pushbot
766742c0ce
Bumping gaia.json for 4 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/9486207b6a2e
Author: Jonathan Griffin <jgriffin@mozilla.com>
Desc: Merge pull request #11929 from jonallengriffin/unitdir
Bug 911395 - Only run tests in 'unit' directories, r=Rik, a=test-only
========
https://hg.mozilla.org/integration/gaia-central/rev/776f07313f92
Author: Jonathan Griffin <jgriffin@mozilla.com>
Desc: Bug 911395 - Only run tests in 'unit' directories, r=Rik, a=test-only
========
https://hg.mozilla.org/integration/gaia-central/rev/6bc8c4774c6d
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #9403 from pivanov/bug-798696
Bug 798696 - When viewing single image in Gallery, extremely hard to find button to go back to thumbnail view
========
https://hg.mozilla.org/integration/gaia-central/rev/bd17634f54b0
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 798696 - When viewing single image in Gallery, extremely hard to find button to go back to thumbnail view
2013-09-05 10:40:22 -07:00
Ehsan Akhgari
22fac42fb0
Backed out changeset 2f15518f566e (bug 912702) because of B2G JB Emulator build bustage
...
--HG--
extra : rebase_source : 6c01ad3bc2f91b0e7e3edab84aedbfe064310a8b
2013-09-05 13:29:38 -04:00
Gaia Pushbot
ce46096190
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/440d939f26d2
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #11957 from gaye/bump-marionette-helper
Bump marionette-helper to 0.0.6
========
https://hg.mozilla.org/integration/gaia-central/rev/73d18f581157
Author: gaye <gaye@mozilla.com>
Desc: Bump marionette-helper to 0.0.6
2013-09-05 10:10:23 -07:00
Fabrice Desré
70beab38db
Bug 912065 - tapping the" Change wallpaper" icon has no action in the settings app r=vingtetun
2013-09-05 09:45:16 -07:00
Gijs Kruitbosch
56a8d54e69
Bug 912976 - Remove makefile.in boilerplate, r=jaws
2013-09-05 18:41:14 +02:00
Nick Alexander
dee5837400
Merge m-c to s-c.
2013-09-05 09:07:12 -07:00
Fabrice Desré
e2d26cf176
Bug 912840 - Preload the appcache manifest properly in OfflineCacheInstaller.jsm r=ochameau
2013-09-05 09:00:14 -07:00
Gaia Pushbot
d30f5aa68b
Bumping gaia.json for 8 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/86636c1797f4
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #11941 from jmcanterafonseca/bug-912554
Bug 912554 - [Contacts] Preserve givenName and familyName of the new or ...
========
https://hg.mozilla.org/integration/gaia-central/rev/ac397c5e0f7c
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 912554 - [Contacts] Preserve givenName and familyName of the new or being edited contact when merging.
========
https://hg.mozilla.org/integration/gaia-central/rev/1d145503388b
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #11921 from jmcanterafonseca/bug-906756
Bug 906756 - Algorithms for merging givenName and familyName. Master Con...
========
https://hg.mozilla.org/integration/gaia-central/rev/2948f46fcda1
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 906756 - Algorithms for merging givenName and familyName. Master Contact takes precedence
========
https://hg.mozilla.org/integration/gaia-central/rev/5d876cf397fa
Author: Michael Vines <mvines@codeaurora.org>
Desc: Bug 911357 - Enable build-time overriding of default Gaia wallpaper via GAIA_DISTRIBUTION_DIR. r=yurenju
========
https://hg.mozilla.org/integration/gaia-central/rev/b2867a27e8ba
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #11849 from wanderview/shared-zero-timeout
Bug 910876: Import NobleJS setImmediate polyfill - r=timdream
========
https://hg.mozilla.org/integration/gaia-central/rev/b86f7a2a0aa6
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 910876: Customize NobleJS setImmediate polyfill
========
https://hg.mozilla.org/integration/gaia-central/rev/4887ebab34ab
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 910876: Import NobleJS setImmediate() polyfill
2013-09-05 08:55:21 -07:00
Gaia Pushbot
c9e6127282
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a1c1f6a82005
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #11954 from wanderview/settings-ignore-network-json
Bug 913035: add network.json to .gitignore - r=me
========
https://hg.mozilla.org/integration/gaia-central/rev/8b2361a04fb1
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 913035: add network.json to .gitignore
2013-09-05 08:45:29 -07:00
Mike Conley
cb9e730fc8
Automated merge with https://hg.mozilla.org/mozilla-central
2013-09-05 09:59:00 -04:00
Gaia Pushbot
006922b3f6
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/037bc2345d2c
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Merge pull request #11931 from Rik/second-call-871127
Bug 871127 - [dialer] cannot make a second call through dialer r=etienne
========
https://hg.mozilla.org/integration/gaia-central/rev/f18ffe112788
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Bug 871127 - [dialer] cannot make a second call through dialer
- Refactor the CSS for the icons
- Add a place-new-call button
- Show the dialer toolbar with a smaller height
- New tests for modified functions
2013-09-05 06:55:31 -07:00
Ed Morley
5806f3fb9f
Merge mozilla-central and b2g-inbound
2013-09-05 14:53:25 +01:00
Ed Morley
bfb67c6517
Merge latest green b2g-inbound changeset and mozilla-central
2013-09-05 14:48:30 +01:00
Gaia Pushbot
ea76c0b289
Bumping gaia.json for 3 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f86f5fac1f5a
Author: Ran Ben Aharon <ran@ranbena.com>
Desc: Revert "Bug 910316 - [e.me] Everything.me features in enhanced branch for Firefox OS 1.2 r=crdlc"
This reverts commit df5b866b163df32ba946bc73fe5f73891817111a.
========
https://hg.mozilla.org/integration/gaia-central/rev/8f0d63a6dc9c
Author: Ran Ben Aharon <ran@ranbena.com>
Desc: Revert "Bug 911767 - [e.me][bug] Long press on pinned cloud apps doesn't toggle edit mode [r=crdlc]"
This reverts commit 5cc1098e3c96e1d62b1f6867348072da10669f4c.
========
https://hg.mozilla.org/integration/gaia-central/rev/f03cc4a05f1c
Author: Ran Ben Aharon <ran@ranbena.com>
Desc: Revert "[Bug 912386] fix long-tap on app won't prevent normal click [r=crdlc]"
This reverts commit ccf3a2028158f817a5ec78ff6217e2b002d17be0.
2013-09-05 06:20:25 -07:00
Gaia Pushbot
6994188876
Bumping gaia.json for 1 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/0d33302396ee
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 911752 - Use window.open instead of a mozbrowser iframe to display external url r=arcturus
2013-09-05 06:00:22 -07:00
Gaia Pushbot
53ebb2e925
Bumping gaia.json for 1 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/4de2ce1d55bd
Author: b2gautomation <jonallengriffin@gmail.com>
Desc: Update gaia-ui-tests.json; Merge pull request #1326 from bebef1987/xfail-video
xfail Bug 912957 - Film strip not visible after taking a video
2013-09-05 05:50:22 -07:00
Gaia Pushbot
97b3f1a525
Bumping gaia.json for 4 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/0f411d4bad6b
Author: Ran Ben Aharon <ran@everything.me>
Desc: Merge pull request #11950 from EverythingMe/912386-apps-hold-click
[Bug 912386] fix long-tap on app won't prevent normal click [r=crdlc]
========
https://hg.mozilla.org/integration/gaia-central/rev/a071d00e2d13
Author: Evyatar Amitay <evyatron@gmail.com>
Desc: [Bug 912386] fix long-tap on app won't prevent normal click [r=crdlc]
========
https://hg.mozilla.org/integration/gaia-central/rev/95ba2782a041
Author: Ran Ben Aharon <ran@everything.me>
Desc: Merge pull request #11951 from EverythingMe/911767-cloudapps-editmode
Bug 911767 - [e.me][bug] Long press on pinned cloud apps doesn't toggle edit mode [r=crdlc]
========
https://hg.mozilla.org/integration/gaia-central/rev/f3b22b43db28
Author: Amir Nissim <amirn@everything.me>
Desc: Bug 911767 - [e.me][bug] Long press on pinned cloud apps doesn't toggle edit mode [r=crdlc]
2013-09-05 05:35:22 -07:00
Ed Morley
4d7caef9c0
Merge latest green fx-team changeset and mozilla-central
2013-09-05 12:07:58 +01:00
Ed Morley
acf12bb912
Backed out changeset a638e7261ac3 (bug 864485) for not having build peer review
2013-09-05 11:53:03 +01:00
Ed Morley
68c08025d5
Backed out changeset 5f709b46eebc (bug 864485)
2013-09-05 11:52:35 +01:00
Ed Morley
e098679148
Backed out changeset f6b637a621ac (bug 864485)
2013-09-05 11:52:32 +01:00
Gaia Pushbot
aa93a7bd20
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/57210698c630
Author: Albert <acperez@tid.es>
Desc: Merge pull request #11922 from acperez/bug-911809
Bug 911809 - Copy variant.json at build-time to ftu. r=yurenju
========
https://hg.mozilla.org/integration/gaia-central/rev/db5682948b30
Author: Albert <acperez@tid.es>
Desc: Bug 911809 - Copy variant.json at build-time to ftu. r=yurenju
2013-09-05 03:40:21 -07:00
Gaia Pushbot
41de978dd9
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f76db748e12b
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Merge pull request #11853 from Rik/attention-screen-size-908186
Bug 908186 - Listen to mozbrowserresize events to hide or show the atten... r=etienne
========
https://hg.mozilla.org/integration/gaia-central/rev/564bd1d934b1
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Bug 908186 - Listen to mozbrowserresize events to hide or show the attention screen
2013-09-05 03:30:21 -07:00
Gaia Pushbot
1a76bc8e82
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/22d72f1cfb07
Author: Rudy Lu <left.lu@gmail.com>
Desc: Merge pull request #11901 from luke-chang/911903_keyboard_not_load_engine
Bug 911903 - [Keyboard] Keyboard app doesn't load the layout engine. r=rudylu
========
https://hg.mozilla.org/integration/gaia-central/rev/ef42d30bc26d
Author: Luke Chang <lchang@mozilla.com>
Desc: Bug 911903 - [Keyboard] Keyboard app doesn't load the layout engine
2013-09-05 03:20:24 -07:00
Gaia Pushbot
c6fdf498e8
Bumping gaia.json for 1 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/9556171f268e
Author: b2gautomation <jonallengriffin@gmail.com>
Desc: Update gaia-ui-tests.json; Merge pull request #1303 from sashakruglov/issue_1217_gallery
migrate gallery share test to use actions
2013-09-05 03:05:22 -07:00
Gaia Pushbot
8c73af1800
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/9a54d8a5f9e8
Author: Rudy Lu <left.lu@gmail.com>
Desc: Merge pull request #11923 from RudyLu/Bug897393-sampleKeyboardApp
Bug 897393 - Add a sample 3rd-party keyboard app for
r=timdream
========
https://hg.mozilla.org/integration/gaia-central/rev/5d64fe253b8c
Author: Rudy Lu <left.lu@gmail.com>
Desc: Bug 897393 - Add a sample 3rd-party keyboard app for
testing.
2013-09-05 01:15:22 -07:00
Gaia Pushbot
d9cf8a37fb
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/67aa1abb73ff
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #11940 from cctuan/883565
Bug 883565 - [Settings] Settings interface for SIM PIN unusable due to UI misplacement
========
https://hg.mozilla.org/integration/gaia-central/rev/6d78de0dabce
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 883565 - Settings interface for SIM PIN unusable due to UI misplacement, fix: focus on input once panelready
2013-09-05 00:30:22 -07:00
Shawn Ku
231d6715cc
Bug 911006 - B2G RIL: Improve the flow of requestNetworkInfo in ril_worker.js. r=hsinyi
2013-09-05 14:51:48 +08:00
Yuan Xulei
b3682128d6
Bug 904530 - endComposition should commit text before cursor. r=masayuki
2013-09-05 08:20:25 -04:00
Paul Rouget
1faf8908fb
Bug 913045 - getWallpaper doesn't work. r=ochameau
2013-09-05 08:43:00 +02:00
Matthew Noorenberghe
3d7d1a0ddb
Merge mozilla-central to UX
2013-09-04 23:31:53 -07:00
Phil Ringnalda
3914af6be4
Back out 4537337759b7 (bug 910517) because nobody expects the talos inquisition
...
--HG--
rename : content/canvas/src/WebGLMemoryReporterWrapper.h => content/canvas/src/WebGLMemoryMultiReporterWrapper.h
2013-09-04 22:42:06 -07:00
Paul Rouget
4ecc5de17e
Bug 912910 - [app manager] add a menuitem to the devtools menu. r=mossop
2013-09-05 07:37:00 +02:00
Gaia Pushbot
1e9be39124
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/92480849c983
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #11595 from cctuan/903919
Bug 903919 - [Flatfish][Gallery] add support for large device
========
https://hg.mozilla.org/integration/gaia-central/rev/bc53a5c1b075
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 903919 - [Flatfish][Gallery] add support for large device
2013-09-04 20:55:22 -07:00
Askeing Yen
b98610d2b6
Bug 891766 - Add gecko's git commit info in B2G build. r=gps
2013-09-05 11:31:31 +08:00
Gaia Pushbot
333eeeaf0b
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/001d6a92c6d7
Author: Ran Ben Aharon <ran@everything.me>
Desc: Merge pull request #11844 from EverythingMe/enhanced-squashed
Bug 910316 - [e.me] Everything.me features in enhanced branch for Firefox OS 1.2 r=crdlc & ran
========
https://hg.mozilla.org/integration/gaia-central/rev/908a4344fcb6
Author: Amir Nissim <amirn@everything.me>
Desc: Bug 910316 - [e.me] Everything.me features in enhanced branch for Firefox OS 1.2 r=crdlc
2013-09-05 04:05:21 -07:00
Gaia Pushbot
a193646a0d
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/be996b54a6b9
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #11934 from cvan/mkt-icons
Bug 901134 - Add higher-res Marketplace icon, r=timdream
========
https://hg.mozilla.org/integration/gaia-central/rev/31d1637b109b
Author: Chris Van <cvan@mozilla.com>
Desc: add higher-res Marketplace icon (bug 901134)
2013-09-04 19:45:23 -07:00
Gaia Pushbot
dab4bda93c
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/ab89af5179c8
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #11779 from huchengtw-moz/video/Bug_908531_move_dummy_file_filter_to_video
Bug 908531 - [MediaDB] move the dummy file filter out of mediadb and use..., r=djf
========
https://hg.mozilla.org/integration/gaia-central/rev/d9edf0e82d68
Author: John Hu <johu@mozilla.com>
Desc: Bug 908531 - [MediaDB] move the dummy file filter out of mediadb and use options to supply it.
2013-09-04 19:35:22 -07:00
Gaia Pushbot
2c552f3b1e
Bumping gaia.json for 4 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a34f4a8e36c1
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #11919 from huchengtw-moz/camera/Bug_911669_flash_state_is_different
Bug 911669 - [B2G][Helix][Camera][ouyangming] The flash's state is diffe..., r=djf
========
https://hg.mozilla.org/integration/gaia-central/rev/3842b9126a1a
Author: John Hu <johu@mozilla.com>
Desc: Bug 911669 - [B2G][Helix][Camera][ouyangming] The flash's state is different between the android device when do the same operation
========
https://hg.mozilla.org/integration/gaia-central/rev/9bd509c6a180
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #11918 from huchengtw-moz/video/Bug_909374_improve_view_activity_saving_feature_robustness
Bug 909374 - [Video] Improve view activity saving feature robustness, r=djf
========
https://hg.mozilla.org/integration/gaia-central/rev/42ab4bf5b07b
Author: John Hu <johu@mozilla.com>
Desc: Bug 909374 - [Video] Improve view activity saving feature robustness
2013-09-04 19:20:27 -07:00
Richard Newman
9915a1a630
Merge m-c to s-c.
2013-09-04 18:27:37 -07:00
Gaia Pushbot
a6df207b66
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/4162cfae8bcd
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #11865 from julienw/902497-use-asynchronous-updateSmsSegmentLimit
Bug 902497 - [sms][mms] use the new asynchronous getSegmentInfoText from...
========
https://hg.mozilla.org/integration/gaia-central/rev/7556e1af5335
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 902497 - [sms][mms] use the new asynchronous getSegmentInfoText from bug 903403 for updateSmsSegmentLimit r=schung
* we don't call getSegmentInfoForText more than once every 500ms
* getSegmentInfoForText is now asynchronous and the new code is handling this
* we now do the composeForm dataset type change in ThreadUI. As a result, the
"type" event, sent by Compose, is not cancelable anymore, because we don't use
this anymore.
2013-09-04 18:23:26 -07:00
Gaia Pushbot
d44f001e87
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/bbe5de455a64
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #11935 from dmarcos/master
Bug 894826 - [Buri][Gallery] Multiple taps on image edit ok button...
========
https://hg.mozilla.org/integration/gaia-central/rev/65c12d1ba3f1
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 894826 - WIP - [Buri][Gallery] Multiple taps on image edit ok button causes gallery to crash
2013-09-04 18:12:34 -07:00