375dcc04c9
Bug 1225192 - fix eslint complaints about css-logic.js; r=pbrosset
2015-12-02 08:27:25 -07:00
5d815b1193
Bug 1171863 - Define all positions and sizes in percentage for auto-resize; r=tromey
...
Instead of having the various positions and sizes of elements of the timeline
defined in pixels, this defines them in % of the total width.
This way the animations, scrubber, etc... adapt as you resize the panel.
The only complex thing here is resizing the header and background. Both of
them are generated via javascript. To do this, they are now positioned and sized
in % too, so they resize when the window is resized, and after a debounced
delay, they get re-generated too.
--HG--
extra : commitid : XRFyYaY2uz
extra : histedit_source : d2ed20a625eaf22672af9c2eb4603189d65a4145%2Cf1153001150848ace5c512e5894c3b72593dfd0d
2015-12-02 13:52:15 +01:00
5f468985d9
Merge mozilla-central to fx-team
2015-12-02 15:22:46 +01:00
5adcabb340
merge mozilla-inbound to mozilla-central a=merge
2015-12-02 15:20:57 +01:00
541bf4c5e1
merge fx-team to mozilla-central a=merge
2015-12-02 15:17:31 +01:00
65582a0685
merge b2g-inbound to mozilla-central a=merge
2015-12-02 15:14:12 +01:00
60f7f63fa5
Bug 1229492 - Hello fails on Linux as a system add-on due to trying to load platform.css that doesn't exist. r=mikedeboer
2015-12-02 13:05:39 +00:00
8230cd1d11
Backed out changeset fdbc50946db3 (bug 1223297) for test failures
...
--HG--
extra : rebase_source : 0ca7ee0d62d633bc7462fae75787050e8d6463d5
2015-12-02 11:56:45 +01:00
1e57fae9f1
Backed out changeset 720b3adb1df5 (bug 1137681) since this need to be out too on a CLOSED TREE
2015-12-02 11:50:27 +01:00
52617b5f9e
Bumping manifests a=b2g-bump
2015-12-02 02:49:58 -08:00
524a9f2bc6
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/3835ad6d95f3
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #33480 from ferjm/bug1228967.sign.in.after.empty.account
Bug 1228967 - Cannot sign back in after signing out of empty account.…
========
https://hg.mozilla.org/integration/gaia-central/rev/1179077941ea
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Bug 1228967 - Cannot sign back in after signing out of empty account. r=michielbdejong
========
https://hg.mozilla.org/integration/gaia-central/rev/bc071d10a355
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #33481 from michielbdejong/1221234-enable-sync-on-the-phone
Bug 1221234 - Enable FxSync on the phone, r=ferjm
========
https://hg.mozilla.org/integration/gaia-central/rev/ce845a05c608
Author: Michiel de Jong <mbdejong@mozilla.com>
Desc: Bug 1221234 - Enable FxSync on the phone, r=ferjm
2015-12-02 02:49:42 -08:00
44cd9f4db8
Backed out changeset 7a9e01e904b0 (bug 1137681) for test bustage on a CLOSED TREE
2015-12-02 11:28:46 +01:00
fb3c6435da
Bumping manifests a=b2g-bump
2015-12-02 02:25:13 -08:00
b89a6ac527
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/0f8a25a82566
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #33361 from michielbdejong/1224203-network-timeouts
Bug 1224203 - Update Kinto.js to version 6ea1cf5 (1 December 2015), r=ferjm
========
https://hg.mozilla.org/integration/gaia-central/rev/a1a124742e23
Author: Michiel de Jong <mbdejong@mozilla.com>
Desc: Bug 1224203 - Update Kinto.js to version 6ea1cf5 (1 Dec), r=ferjm
2015-12-02 02:24:57 -08:00
83cbdce996
Bumping manifests a=b2g-bump
2015-12-02 01:30:28 -08:00
aa40d99114
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/5aa9f72f6a50
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #33470 from ferjm/bug1225450.iac.check.sync
Bug 1225450 - Check origin for Sync Inter-App-Communication (IAC). r=…
========
https://hg.mozilla.org/integration/gaia-central/rev/f9fa9902cc2c
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Bug 1225450 - Check origin for Sync Inter-App-Communication (IAC). r=michielbdejong
========
https://hg.mozilla.org/integration/gaia-central/rev/bfbf5c5feecb
Author: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Desc: Merge pull request #33469 from azasypkin/bug-1229381-test-startup-limit
Bug 1229381 - [Raptor] "test-startup-limit" app is not included into Raptor distribution. r=eperelman
========
https://hg.mozilla.org/integration/gaia-central/rev/f476f67bddca
Author: Aleh Zasypkin <azasypkin@mozilla.com>
Desc: Bug 1229381 - [Raptor] "test-startup-limit" app is not included into Raptor distribution. r=eperelman
2015-12-02 01:30:13 -08:00
cc17273b85
Backed out changeset 1e400c0266e5 (bug 1224887) for build bustage
...
ON A CLOSED TREE
2015-12-02 14:51:30 +05:30
38aea49239
Backed out changeset df07a5d14903 (bug 1224887) for build bustage
...
Backed out changeset 0bc40a9a5804 (bug 1224887)
2015-12-02 14:51:20 +05:30
7b8ad0a1ab
Bumping manifests a=b2g-bump
2015-12-02 00:41:05 -08:00
020a242f34
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/11741fdea798
Author: Carsten Book <tomcat@mozilla.com>
Desc: Merge pull request #33211 from Phoxygen/bug1217761-edit_icon
Bug 1217761 - update gaia-icons for edit icon. r=wilsonpage
========
https://hg.mozilla.org/integration/gaia-central/rev/19d6e8ee09ba
Author: Augustin Trancart <augustin.trancart@phoxygen.com>
Desc: Bug 1217761 - update gaia-icons for edit icon.
Edit icon must be mirrored in downloads and call log view.
========
https://hg.mozilla.org/integration/gaia-central/rev/ffcbd2ee4808
Author: Carsten Book <tomcat@mozilla.com>
Desc: Merge pull request #33343 from AlekoNN/bug_1179464
Bug 1179464 - Modyfying 'start communicating' phrase. r=stas
========
https://hg.mozilla.org/integration/gaia-central/rev/0571181f6351
Author: Alexey Yakimov <Alexey.Yakimov@harman.com>
Desc: Bug 1179464 - Modyfying 'start communicating' phrase R=AlekoNN
2015-12-02 00:40:35 -08:00
cda29316d8
Backed out changeset 0d6721e243d3 (bug 1228339) for build bustage
...
CLOSED TREE
--HG--
extra : amend_source : 68000631ca959f6ac64d1ed9d01fe091f933370a
2015-12-02 14:09:40 +05:30
0df87b95e9
Bug 1224887: add OpenMax IL headers. r=jya, with actual patch
...
CLOSED TREE
--HG--
extra : amend_source : 2daf9a39d8cdc1cc972d093faf5edd4ff1c14de6
2015-12-02 13:52:56 +05:30
2fca419791
Bug 1227355 - Remove update channel environment variable from aries device config r=catlee a=b2g-otaneedsthis
...
--HG--
extra : commitid : 93Dv0XiJXIr
extra : source : a07184a2fadb9bc60929757dc1113dc262a4758a
2015-12-01 18:14:07 -06:00
541c7a5b69
Merge fx-team to central, a=merge
...
--HG--
extra : commitid : GoUn7UzWJCi
2015-12-01 16:07:14 -08:00
50e8f21d5b
Merge inbound to central, a=merge
...
--HG--
extra : commitid : 9WZlbf1Q29D
2015-12-01 15:43:33 -08:00
6644a2b74c
Merge b2g-inbound to m-c a=merge
...
--HG--
extra : commitid : FDRkxvrmyTy
2015-12-01 15:20:04 -08:00
bb9418628d
Bug 1227287 - Fix minor bug with f.arguments and lazy arguments. r=luke
2015-12-01 16:20:36 +01:00
27b63a868f
Bug 1225367 - Fix bogus asserts when storing symbols to typed arrays. r=h4writer
2015-12-01 16:17:31 +01:00
c3c17919f1
Bug 1229004 - Rename the libs directory to vendor in browser/extensions/loop/standalone/content. r=dmose
...
--HG--
rename : browser/extensions/loop/standalone/content/libs/l10n-gaia-02ca67948fe8.js => browser/extensions/loop/standalone/content/vendor/l10n-gaia-02ca67948fe8.js
rename : browser/extensions/loop/standalone/content/libs/l10n-gaia-upstream.txt => browser/extensions/loop/standalone/content/vendor/l10n-gaia-upstream.txt
2015-12-01 14:47:50 +00:00
5a4f685e97
Bug 1228317 - Fix a potential error in the replaceAll call when the path contains ?dmp. r=snorp
2015-12-01 06:34:00 +01:00
079fc09f4a
Bug 1227355 - Configure b2g-ota branch and add update channel r=wcosta a=b2g-otaneedsthis
...
--HG--
extra : commitid : LjQCJCv8ZIY
extra : source : ad64115a75ca9a2466e432ebe0149797c24c701e
2015-11-30 20:48:01 -06:00
f3e1aec951
merge mozilla-inbound to mozilla-central a=merge
2015-12-01 15:25:14 +01:00
e224f27637
merge fx-team to mozilla-central a=merge
2015-12-01 12:00:42 +01:00
fdb9a156a6
Bumping manifests a=b2g-bump
2015-11-30 19:26:34 -08:00
1d4d5e0ff1
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/09d11f2ffa29
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #33400 from KevinGrandon/bug_1228449_clock_remove_switches
Bug 1228449 - [Clock] Remove unused switches.css file
========
https://hg.mozilla.org/integration/gaia-central/rev/c30e446ed3b6
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1228449 - [Clock] Remove unused switches.css file
========
https://hg.mozilla.org/integration/gaia-central/rev/310cc8ea102d
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #33430 from KevinGrandon/bug_1147860_contacts_search_test_intermittent
Bug 1147860 - Guard test logic using promise so files are fully loaded
========
https://hg.mozilla.org/integration/gaia-central/rev/a8cfd1f8884e
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1147860 - Guard test logic using promise so files are fully loaded r=francisco
2015-11-30 19:25:12 -08:00
59f3c7f5d2
Bug 1227355 - Configure b2g-ota branch and add update channel r=wcosta
...
--HG--
extra : commitid : DtYIIbkpguT
extra : rebase_source : 8a5e0d3e0c22968c73ecb926ac03a852315641ef
2015-11-30 20:48:01 -06:00
bfe32a0e21
Bumping manifests a=b2g-bump
2015-12-01 11:35:34 -08:00
8ba6e6cc78
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/0e366e8ecec7
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #33449 from gasolin/issue-1228276-2
Bug 1228276 - refactor StorageHelper.showFormatedSize as a module, r=yzen
========
https://hg.mozilla.org/integration/gaia-central/rev/24fa316caa9e
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1228276 - refactor StorageHelper.showFormatedSize as a module, r=yzen
2015-12-01 11:35:19 -08:00
bce25699e1
Bumping manifests a=b2g-bump
2015-12-01 11:15:40 -08:00
e58d765dcb
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f13e5c6dda61
Author: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Desc: Merge pull request #33328 from azasypkin/bug-1226555-conversation-split-mode
Bug 1226555 - [Messages] The Conversation split view is not rendered anymore. r=julien
========
https://hg.mozilla.org/integration/gaia-central/rev/93090f1a769b
Author: Aleh Zasypkin <azasypkin@mozilla.com>
Desc: Bug 1226555 - [Messages] The Conversation split view is not rendered anymore. r=julien
2015-12-01 11:15:25 -08:00
a9ebe688d5
Bumping manifests a=b2g-bump
2015-12-01 10:50:04 -08:00
3c99c1edf1
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/4cc174470ff8
Author: Andreas Tolfsen <ato@mozilla.com>
Desc: Merge pull request #33443 from andreastt/bug_1229011
Bug 1229011 - Make async TCP driver protocol 3 compatible; r=aus
========
https://hg.mozilla.org/integration/gaia-central/rev/e47777c1a95a
Author: Andreas Tolfsen <ato@mozilla.com>
Desc: Bug 1229011 - Make async TCP driver protocol 3 compatible; r=aus
The asynchronous TCP driver in
tests/jsmarionette/client/marionette-client/lib/marionette/drivers/abstract.js
is not compatible with Marionette protocol level 3 that will get
introduced in bug 1211489.
This causes
tests/jsmarionette/runner/marionette-js-runner/test/integration/clientasync.js
to fail with bug 1211489 is applied to Gecko.
To fix this issue we apply the same logic from the synchronous TCP
driver to marshal and unmarshal messages when talking to a protocol
level 3 server.
========
https://hg.mozilla.org/integration/gaia-central/rev/47c3acfbb209
Author: Isabel Rios Escobar <irios@MacBook-Pro-de-Isabel.local>
Desc: Revert "Merge pull request #33392 from isabelrios/Duplicate_phone_number"
This reverts commit 68c7e4103820c3ce3de2ce3b9d8e145fdc67c0aa, reversing
changes made to 76c2dacbcff176563bfdf8068655bb438f49fe55.
2015-12-01 10:49:48 -08:00
0b5184aa46
Bumping manifests a=b2g-bump
2015-12-01 09:09:40 -08:00
d9666a876a
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/980f135a6af6
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #33210 from mikehenrty/bug-1221876-disable-root-settings-test
Bug 1221876https://hg.mozilla.org/integration/gaia-central/rev/b8898d141e40
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 1221876
2015-12-01 09:08:16 -08:00
455e7f373f
Bumping manifests a=b2g-bump
2015-12-01 08:45:36 -08:00
e4a839994f
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/c014d67432aa
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #33465 from arcturus/bug-1219641
Bug 1219641 - Implement *test_delete_all_contacts.py* as an integrati…
========
https://hg.mozilla.org/integration/gaia-central/rev/85c727c8c778
Author: Francisco Jordano <fjordano@mozilla.com>
Desc: Bug 1219641 - Implement *test_delete_all_contacts.py* as an integration test in JavaScript r=jlorenzo
2015-12-01 08:44:04 -08:00
c5da010650
Bumping manifests a=b2g-bump
2015-12-01 07:15:33 -08:00
ef39bcf02d
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/c0a9ca077eb9
Author: isabelrios <isabelrios@gmail.com>
Desc: Merge pull request #33392 from isabelrios/Duplicate_phone_number
Bug 1228294 - Verify that the duplicates found screen is shown
========
https://hg.mozilla.org/integration/gaia-central/rev/65cf787b892d
Author: Isabel Rios Escobar <irios@MacBook-Pro-de-Isabel.local>
Desc: Bug 1228294 - Verify that the duplicates found screen is shown
adding the missing file
adding the missing file
completing the test
addressing pr comments
return class and tests affected
change in tap_update
========
https://hg.mozilla.org/integration/gaia-central/rev/7ca802ed401d
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #33439 from ferjm/bug1227593.syncengine.shared
Bug 1227593 - Sync engine shared lib. r=michielbdejong
========
https://hg.mozilla.org/integration/gaia-central/rev/b3a37b948db3
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Bug 1227593 - Sync engine shared lib. r=michielbdejong
2015-12-01 07:13:59 -08:00
31b570ce3c
Merge mozilla-central to b2g-inbound
2015-12-01 15:28:29 +01:00
207c64c6c1
Backed out changeset f4348b2f5c5f (bug 1223678) for bustage
...
--HG--
extra : rebase_source : 1e7bf92b54ceff74b6eee2143a2f82434af1e8e3
2015-12-01 15:01:36 +01:00
Tom Tromey
Patrick Brosset
Carsten "Tomcat" Book
Mark Banner
B2G Bumper Bot
Nigel Babu
Alfredo Yang
Gregory Arndt
Wes Kocher
Jan de Mooij
Sylvestre Ledru