Wes Kocher
3520083deb
Merge m-c to inbound a=merge
2014-08-20 18:13:40 -07:00
Ryan VanderMeulen
296ec7fc20
Merge m-c to b2g-inbound. a=merge
2014-08-20 16:21:52 -04:00
Ryan VanderMeulen
556b135ea8
Merge inbound to m-c. a=merge
2014-08-20 16:14:23 -04:00
B2G Bumper Bot
d05d238e69
Bumping manifests a=b2g-bump
2014-08-20 11:02:14 -07:00
B2G Bumper Bot
bf74d93f7d
Bumping manifests a=b2g-bump
2014-08-20 10:51:56 -07:00
B2G Bumper Bot
a353c6e2a9
Bumping manifests a=b2g-bump
2014-08-20 10:47:09 -07:00
B2G Bumper Bot
ff85627591
Bumping manifests a=b2g-bump
2014-08-20 10:26:25 -07:00
B2G Bumper Bot
04188f8298
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/ecfb83057457
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert " Bug 1055972 - disable keyboard uninstallation test."
This reverts commit e276b38a14e89c8b5bb36052f475d37716656d2a.
2014-08-20 10:20:32 -07:00
B2G Bumper Bot
98133facb4
Bumping manifests a=b2g-bump
2014-08-20 08:42:11 -07:00
B2G Bumper Bot
2852abd3d0
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/839bc16aa4da
Author: Sergi Mansilla <sergi.mansilla@gmail.com>
Desc: Merge pull request #21831 from sergi/blank_screen
Bug 1038815 - Contacts can get into a 'frozen' state in some cases r=francisco
========
https://hg.mozilla.org/integration/gaia-central/rev/71757326ac8c
Author: Sergi Mansilla <sergi.mansilla@gmail.com>
Desc: Bug 1038815 - Contacts can get into a 'frozen' state in some cases
2014-08-20 08:40:32 -07:00
Ed Morley
3580355329
Merge mozilla-central and b2g-inbound
2014-08-20 15:19:45 +01:00
B2G Bumper Bot
c76b6c51f7
Bumping manifests a=b2g-bump
2014-08-20 07:01:57 -07:00
Ed Morley
acd103862f
Merge latest green b2g-inbound changeset and mozilla-central; a=merge
2014-08-20 14:46:55 +01:00
B2G Bumper Bot
e5ec4cc74a
Bumping manifests a=b2g-bump
2014-08-20 06:21:50 -07:00
B2G Bumper Bot
754fbda8ac
Bumping gaia.json for 7 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/07bbb7902390
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #23041 from aosmond/fix_record_error_display
Bug 1055619
========
https://hg.mozilla.org/integration/gaia-central/rev/83bd19b9d82b
Author: Andrew Osmond <aosmond@gmail.com>
Desc: Add brief comment clarifying why we ignore err param
========
https://hg.mozilla.org/integration/gaia-central/rev/ca35d90b391d
Author: Andrew Osmond <aosmond@gmail.com>
Desc: Fix copy and paste error (and source) for error callback prototype
========
https://hg.mozilla.org/integration/gaia-central/rev/3f2a07a4e861
Author: Andrew Osmond <aosmond@gmail.com>
Desc: Make gecko recording errors display a generic error message instead of nothing
========
https://hg.mozilla.org/integration/gaia-central/rev/49fb677abe5b
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #23047 from eliperelman/bug-1048593
Bug 1048593 - Changing system confirm dialogs to account for software home button
========
https://hg.mozilla.org/integration/gaia-central/rev/01eb2885d83a
Author: Eli Perelman <eli@eliperelman.com>
Desc: Bug 1048593 - Changing system confirm dialogs to account for software home button
========
https://hg.mozilla.org/integration/gaia-central/rev/a957930ad1d2
Author: Ed Morley <emorley@mozilla.com>
Desc: Revert "Bug 1052503 - [Rocketbar] Update loading progress bar r=benfrancis" for B2G debug emulator xpcshell timeouts
This reverts commit 3a31d1317cffb14fb0636467ce2dcca15c9b19d3.
2014-08-20 06:15:36 -07:00
B2G Bumper Bot
e6e7f226f9
Bumping manifests a=b2g-bump
2014-08-20 06:08:45 -07:00
B2G Bumper Bot
bba5cd4223
Bumping manifests a=b2g-bump
2014-08-20 02:56:30 -07:00
B2G Bumper Bot
f85b01e5d2
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/03a4bc3b7d10
Author: Min-Zhong "John" Lu <jlu@mozilla.com>
Desc: Merge pull request #23064 from mnjul/bug_1055908_add_missing_test_for_1035117
Bug 1055908 - Add missing unit-tests for bug 1035117. r=timdream
========
https://hg.mozilla.org/integration/gaia-central/rev/524d27f447db
Author: John Lu [:mnjul] <jlu@mozilla.com>
Desc: Bug 1055908 - Add missing unit-tests for bug 1035117
2014-08-20 02:50:32 -07:00
B2G Bumper Bot
7b21d1e3c4
Bumping manifests a=b2g-bump
2014-08-20 02:26:23 -07:00
B2G Bumper Bot
49957b3970
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/8974079e1168
Author: chirarobert <robert.chira@softvision.ro>
Desc: Merge pull request #23068 from viorelaioia/bug_1055951
Bug 1055951 - [Flame][v2.1] test_settings_wifi.py :: Element cannot be f...
========
https://hg.mozilla.org/integration/gaia-central/rev/7dbf664df58e
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 1055951 - [Flame][v2.1] test_settings_wifi.py :: Element cannot be found and cannot connect to specific network failed
========
https://hg.mozilla.org/integration/gaia-central/rev/38a3ade25fde
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #23016 from gasolin/issue-973449
Bug 973449 - [settings] refactor Do not track panel with AMD pattern, r=eragon
========
https://hg.mozilla.org/integration/gaia-central/rev/77681751a267
Author: gasolin <gasolin@gmail.com>
Desc: Bug 973449 - [settings] refactor Do not track panel with AMD pattern
2014-08-20 02:20:31 -07:00
B2G Bumper Bot
f9d68af085
Bumping manifests a=b2g-bump
2014-08-20 01:52:01 -07:00
B2G Bumper Bot
01f04eaaf4
Bumping manifests a=b2g-bump
2014-08-20 00:16:27 -07:00
B2G Bumper Bot
66f5944d24
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/4dbb8c044590
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #23027 from crdlc/bug-1047276
Bug 1047276 - [Vertical Home-screen] Change in position of smart collect...
========
https://hg.mozilla.org/integration/gaia-central/rev/77c25b87768c
Author: crdlc <crdlc@tid.es>
Desc: Bug 1047276 - [Vertical Home-screen] Change in position of smart collections in default-Homescreen json doesnt reflect on screen
2014-08-20 00:10:31 -07:00
Kyle Machulis
e4ee574673
Backed out 82bed38ff50a (bug 900551, bug 1015518, bug 846200) due to marionette webapi test bustage on ICS Emulator
2014-08-19 22:33:36 -07:00
Nick Thomas
fbe4723bf6
Bug 1049930, add in-tree files for dolphin on master, r=catlee DONTBUILD
2014-08-20 16:22:21 +12:00
Kyle Machulis
9bdf69a3d2
Backed out c4c490f3b301, previous backout of bug 900551, bug 1011518, bug 846200, now fixed by bug 1055898 (51afb4de4a25)
2014-08-19 21:05:50 -07:00
Roberto A. Vitillo
3eb77a08ed
Bug 559505 - Deprecate localstore.rdf and replace it with xulstore. r=enn, sr=bsmedberg
...
CLOSED TREE
2014-08-19 10:31:00 -04:00
B2G Bumper Bot
881a16d231
Bumping manifests a=b2g-bump
2014-08-20 05:36:29 -07:00
B2G Bumper Bot
fabc7ec957
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a098afe913e3
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #23032 from ADLR-es/fix-bug-1045236
Bug 1045236 - contacts import screen has a strange notion of "TODAY", which includes yesterday
========
https://hg.mozilla.org/integration/gaia-central/rev/3653d2105f35
Author: Adrián de la Rosa <hola@adlr.es>
Desc: Bug 1045236 - contacts import screen has a strange notion of "TODAY", which includes yesterday
2014-08-20 05:30:30 -07:00
B2G Bumper Bot
e6379fb636
Bumping manifests a=b2g-bump
2014-08-20 05:11:31 -07:00
B2G Bumper Bot
3cf458ed1e
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/c825faf613ce
Author: Ed Morley <emorley@mozilla.com>
Desc: Revert "Bug 1043892 - [LockScreen] Solve the visual regression caused by Bug 1043821, with panel switching refactoring" for test failures
This reverts commit a47e7934f4793d24723d1d340608bd6e0bc1fc8d.
2014-08-20 05:05:32 -07:00
B2G Bumper Bot
f4ed64f96b
Bumping manifests a=b2g-bump
2014-08-20 04:41:23 -07:00
B2G Bumper Bot
96f0db4418
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/bac0d2577cf0
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #22923 from zacc/bug_1049489_contacts_api
Bug 1049489 - gaiatest: execute all ContactsAPI calls in chrome context
========
https://hg.mozilla.org/integration/gaia-central/rev/611b2073d924
Author: Zac <zcampbell@mozilla.com>
Desc: Bug 1049489 - gaiatest: execute all ContactsAPI calls in chrome context
========
https://hg.mozilla.org/integration/gaia-central/rev/3df222b83197
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #23069 from RudyLu/keyboard/Bug1055972-disable_keyboard_uninstallation_test
Bug 1055972 - disable keyboard uninstallation test.
r=test-only
========
https://hg.mozilla.org/integration/gaia-central/rev/7317e2fd901c
Author: Rudy Lu <me@rudy.lu>
Desc: Bug 1055972 - disable keyboard uninstallation test.
- apps/keyboard/test/marionette/uninstallation_test.js
========
https://hg.mozilla.org/integration/gaia-central/rev/5f63abfdea18
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #22195 from zacc/bug_1044484
Bug 1044484 - Re-jig the gaia-ui-tests manifests to obsolete tbpl-manife...
========
https://hg.mozilla.org/integration/gaia-central/rev/5af1c31c2088
Author: Zac <zcampbell@mozilla.com>
Desc: Bug 1044484 - Add an external tag to gaiatest manifests to denote tests use of external internet resources
2014-08-20 04:35:31 -07:00
B2G Bumper Bot
43339bb1b1
Bumping manifests a=b2g-bump
2014-08-20 03:56:21 -07:00
B2G Bumper Bot
cc0a0ad35a
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/797dfb9325a4
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #23037 from gregarndt/gaia_sanity_tests
Bug 1054333https://hg.mozilla.org/integration/gaia-central/rev/661d6674c7c4
Author: Greg Arndt <garndt@mozilla.com>
Desc: Bug 1054333
2014-08-20 03:50:30 -07:00
B2G Bumper Bot
838f57b041
Bumping manifests a=b2g-bump
2014-08-20 03:37:01 -07:00
B2G Bumper Bot
d54f76dd25
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/6a6a9878f8a9
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Merge pull request #23058 from asutherland/email-unread-msgs-backend
Bug 800402 - [email/backend] UI: Show the number of unread messages in the message-list header after the folder name. r=asuth
========
https://hg.mozilla.org/integration/gaia-central/rev/310a982044cb
Author: Alex Wissmann <awiss@wharton.upenn.edu>
Desc: Bug 800402 - [email/backend] UI: Show the number of unread messages in the message-list header after the folder name. r=asuth
Land the back-end parts of bug 800402 and bug 888955 which it depends on.
The UI parts are separable and we're landing the back-end stuff on its own to
avoid back-end bit-rot.
The changes in here exactly correspond to those in:
https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/328
2014-08-20 03:35:28 -07:00
B2G Bumper Bot
aa4c5cf4e8
Bumping manifests a=b2g-bump
2014-08-20 03:11:24 -07:00
B2G Bumper Bot
ccea6d8b6e
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/13bc1de946da
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #22800 from snowmantw/issue1043892-rev2
Bug 1043892 - [LockScreen] Solve the visual regression caused by Bug 104...
========
https://hg.mozilla.org/integration/gaia-central/rev/db5a66a953f9
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 1043892 - [LockScreen] Solve the visual regression caused by Bug 1043821, with panel switching refactoring
2014-08-20 03:05:32 -07:00
Wes Kocher
151bce9c7d
Merge m-c to inbound a=merge
2014-08-19 18:25:36 -07:00
B2G Bumper Bot
28a6cdcb51
Bumping manifests a=b2g-bump
2014-08-19 15:47:01 -07:00
B2G Bumper Bot
b17ac7c3f1
Bumping manifests a=b2g-bump
2014-08-19 14:53:22 -07:00
B2G Bumper Bot
72610da91b
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/0aa0d2ae3f0e
Author: Ghislain 'Aus' Lacroix <aus@noiseport.org>
Desc: Merge pull request #23050 from nullaus/bug1055228
bug 1055228 - Add download notification icon for states other than "down...
========
https://hg.mozilla.org/integration/gaia-central/rev/02002c395d85
Author: Ghislain 'Aus' Lacroix <aus@mozilla.com>
Desc: bug 1055228 - Add download notification icon for states other than "downloading" and use it. r=qDot
========
https://hg.mozilla.org/integration/gaia-central/rev/e9c7fb71fdaf
Author: Jim Porter <jporter@mozilla.com>
Desc: Merge pull request #22543 from jimporter/ringtones-mimetype
Bug 1045186 - [B2G][Ringtones] The user can not share ringtone through MMS
========
https://hg.mozilla.org/integration/gaia-central/rev/09e4910acb8e
Author: Jim Porter <jporter@mozilla.com>
Desc: Bug 1045186 - [B2G][Ringtones] The user can not share ringtone through MMS
2014-08-19 14:53:11 -07:00
Wes Kocher
837c4a980c
Backed out 8 changesets (bug 1015518, bug 900551, bug 1011518, bug 846200) for build bustage
...
Backed out changeset 59eb7edaa6ed (bug 1015518)
Backed out changeset 04a531d5647e (bug 1011518)
Backed out changeset 9ac939654549 (bug 1011518)
Backed out changeset 2f707489d892 (bug 900551)
Backed out changeset f2a0a448e563 (bug 900551)
Backed out changeset f130f54ea09a (bug 900551)
Backed out changeset 9d38e8901847 (bug 846200)
Backed out changeset 744da032a2de (bug 846200)
2014-08-19 14:49:02 -07:00
Kyle Machulis
4def0bc0ae
Bug 900551 - Settings API OOP; r=bent
2014-08-19 13:43:57 -07:00
B2G Bumper Bot
b9408847e8
Bumping manifests a=b2g-bump
2014-08-19 13:41:32 -07:00
B2G Bumper Bot
f696ad1814
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f446053df7cc
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #23008 from KevinGrandon/bug_1052503_system_progress_bar
Bug 1052503 - [Rocketbar] Update loading progress bar
========
https://hg.mozilla.org/integration/gaia-central/rev/76b7bd1e82c9
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1052503 - [Rocketbar] Update loading progress bar r=benfrancis
2014-08-19 13:35:46 -07:00
B2G Bumper Bot
6816715a3f
Bumping manifests a=b2g-bump
2014-08-19 13:21:59 -07:00
B2G Bumper Bot
09013368c8
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f77fe1adb0cd
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #22876 from pivanov/bug-1035664
Bug 1035664 - [Camera] - check missing images
========
https://hg.mozilla.org/integration/gaia-central/rev/b1f22f770e27
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 1035664 - [Camera] - check missing images
2014-08-19 13:20:29 -07:00
B2G Bumper Bot
5c178f8e93
Bumping manifests a=b2g-bump
2014-08-19 13:07:55 -07:00
