Commit Graph

385345 Commits

Author SHA1 Message Date
Paolo Amadini
f559f84c07 Bug 1038257 - Desktop client needs the ability to delete, block, and unblock contacts. r=mikedeboer 2014-09-30 13:10:24 +01:00
Paolo Amadini
64d54f95ed Bug 1038246 - Desktop client needs the ability to edit a contact locally. r=mikedeboer 2014-09-30 13:10:23 +01:00
Carsten "Tomcat" Book
293f52a08f Backed out changeset d42938fd0288 (bug 1002855) for web-platform-4 test failures 2014-09-30 10:04:11 +02:00
Kyle Huey
ca92abc824 Back out Bug 1071359 for using 8 MB (!?!) of memory per process on b2g. r=me a=me 2014-09-29 15:43:04 -07:00
Ryan VanderMeulen
2168d239a4 Merge b2g-inbound to m-c. a=merge 2014-09-29 15:55:33 -04:00
Ryan VanderMeulen
1491d70afe Merge fx-team to m-c. a=merge 2014-09-29 15:06:48 -04:00
Ryan VanderMeulen
96d0cf28e6 Merge inbound to m-c. a=merge 2014-09-29 14:57:26 -04:00
Ryan VanderMeulen
50b8cbb594 Bug 1022862 - Revert test ordering changes because it apparently made Mnw perma-fail. 2014-09-29 14:56:57 -04:00
Ed Morley
d2440bad17 Backed out changeset 50220dbf59ed (bug 1064258) for xpcshell failures; CLOSED TREE 2014-09-29 17:43:10 +01:00
Ed Morley
fad1e475af Backed out changeset 318fa507832d (bug 1073086) 2014-09-29 17:42:34 +01:00
B2G Bumper Bot
118347f266 Bumping manifests a=b2g-bump 2014-09-29 09:01:58 -07:00
B2G Bumper Bot
7fe0409aa4 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/fb5a4aa15e26
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #24444 from julienw/1073139-fix-settings-test-newer-mocha

Bug 1073139 - [Settings] fix settings tests with a newer mocha r=arthurc...

========

https://hg.mozilla.org/integration/gaia-central/rev/887d961bfb39
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1073139 - [Settings] fix settings tests with a newer mocha r=arthurcc
2014-09-29 08:55:47 -07:00
B2G Bumper Bot
22def3c5c7 Bumping manifests a=b2g-bump 2014-09-29 08:47:03 -07:00
B2G Bumper Bot
76a82011d2 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/eab8f4f9ef71
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #24499 from KevinGrandon/bug_1073728_bookmark_icon_race

Bug 1073728 - Reset favicons object after location change

========

https://hg.mozilla.org/integration/gaia-central/rev/06275ba36fee
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1073728 - Reset favicons object after location change r=alive r=daleharvey
2014-09-29 08:40:48 -07:00
B2G Bumper Bot
65ff96ae18 Bumping manifests a=b2g-bump 2014-09-29 08:37:41 -07:00
B2G Bumper Bot
2562a289d9 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 1071983 - fixing regression with hidden status bar icons when switch...

========

https://hg.mozilla.org/integration/gaia-central/rev/51683d4ddc61
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1071983 - fixing regression with hidden status bar icons when switching to previous app. r=etienne
2014-09-29 08:36:02 -07:00
Matt Brubeck
5c19faccb1 Bug 731865 - Show blocked popups when clicking 'Allow popups' [r=florian] 2014-09-29 08:00:32 -07:00
Ryan VanderMeulen
ade52f2a46 Merge m-c to b2g-inbound. a=merge
CLOSED TREE
2014-09-29 10:46:00 -04:00
Ed Morley
33d7b690ac Backed out changeset 49b1465d3e5e (bug 1044020) for compilation failures 2014-09-29 15:41:54 +01:00
Ed Morley
9f1335b46d Backed out changeset dade62440f97 (bug 1044020) 2014-09-29 15:41:32 +01:00
Carsten "Tomcat" Book
369aa43021 Merge m-c to fx-team 2014-09-29 16:19:41 +02:00
Ryan VanderMeulen
016db92102 Bug 1044020 - Remove accidentally-added PHONY file. r=derp 2014-09-29 10:15:28 -04:00
B2G Bumper Bot
5906860256 Bumping manifests a=b2g-bump 2014-09-29 07:12:03 -07:00
B2G Bumper Bot
24fd1b406e Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/fa7cf88688b1
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #24423 from mancas/bug1071382

Bug 1071382 - [Settings] 2 Icons of brightness level out of place r=arthurcc

========

https://hg.mozilla.org/integration/gaia-central/rev/64ff6fcd2a8f
Author: Manuel Casas Barrado <manuel.casasbarrado@telefonica.com>
Desc: Bug 1071382 - [Settings] 2 Icons of brightness level out of place.r=arthurcc
2014-09-29 07:05:53 -07:00
Carsten "Tomcat" Book
85d6d4633a merge b2g-inbound to mozilla-central a=merge 2014-09-29 16:03:01 +02:00
Carsten "Tomcat" Book
9d31360549 merge mozilla-inbound to mozilla-central a=merge 2014-09-29 15:42:55 +02:00
Tim Taubert
bb57cb7051 merge m-c to fx-team; a=merge
--HG--
extra : amend_source : d5fc0736172ed22bc792e03fe69d0f67531b6273
2014-09-29 02:16:43 -07:00
B2G Bumper Bot
01d49d94b6 Bumping manifests a=b2g-bump 2014-09-29 02:11:58 -07:00
B2G Bumper Bot
7883dce522 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4c52c3164207
Author: Albert <alberto.crespellperez@telefonica.com>
Desc: Merge pull request #24095 from acperez/bug-935103

Bug 935103 - Remove confirmation popup after PIN screen.

========

https://hg.mozilla.org/integration/gaia-central/rev/58f937364133
Author: Albert <alberto.crespellperez@telefonica.com>
Desc: Bug 935103 - Remove confirmation popup after PIN screen.
2014-09-29 02:05:48 -07:00
B2G Bumper Bot
946a6f4a82 Bumping manifests a=b2g-bump 2014-09-29 01:43:23 -07:00
B2G Bumper Bot
678593e224 Bumping gaia.json for 8 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c1728515a190
Author: Carsten Book <tomcat@mozilla.com>
Desc: Merge pull request #23747 from robertbindar/custom_behavior

Bug 912645 - ability to indicate notification modes. r=jrburke

========

https://hg.mozilla.org/integration/gaia-central/rev/0a4dc50598c3
Author: robertbindar <robertbindar@gmail.com>
Desc: Bug 912645: ability to indicate notification modes

========

https://hg.mozilla.org/integration/gaia-central/rev/7eed1079e859
Author: Carsten Book <tomcat@mozilla.com>
Desc: Merge pull request #24247 from ddrmanxbxfr/bug_1062803

Bug 1062803 - Replace the custom functions used to load JSON files with ...r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/08fb5519add7
Author: Mathieu Rhéaume <mathieu@codingrhemes.com>
Desc: Bug 1062803 - Replace the custom functions used to load JSON files with the new shared helper in the system app.

========

https://hg.mozilla.org/integration/gaia-central/rev/d642ff3999ab
Author: Carsten Book <tomcat@mozilla.com>
Desc: Merge pull request #24287 from ddrmanxbxfr/bug_1005331

Bug 1005331 - JSHint fixes for shared/js/media/. r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/bc6c0bbd0fff
Author: Mathieu Rhéaume <mathieu@codingrhemes.com>
Desc: Bug 1005331 - JSHint fixes for shared/js/media/

========

https://hg.mozilla.org/integration/gaia-central/rev/6298aad7dd61
Author: albertopq <albert.pastor@gmail.com>
Desc: Merge pull request #24464 from albertopq/1073032-call-log-notif

Bug 1073032 - Clear ambient indicator when removing notification r=mhenretty

========

https://hg.mozilla.org/integration/gaia-central/rev/6cd05fe9478a
Author: albertopq <apastor@mozilla.com>
Desc: Bug 1073032 - Clear ambient indicator when removing notification
2014-09-29 01:35:49 -07:00
B2G Bumper Bot
1813f572d7 Bumping manifests a=b2g-bump 2014-09-29 00:27:03 -07:00
B2G Bumper Bot
862903f667 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6ac9087ee6e6
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1073157 - [System] fix wallpaper_manager.js tests with a newer mocha r=djf
2014-09-29 00:20:50 -07:00
B2G Bumper Bot
2f433e0340 Bumping manifests a=b2g-bump 2014-09-28 23:42:04 -07:00
B2G Bumper Bot
6f88f72683 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a98d7e35e673
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #23192 from snowmantw/issue1057198-as-iframe

Bug 1057198 - [LockScreen] Decoupling LockScreen with System before it becomes an iframe

========

https://hg.mozilla.org/integration/gaia-central/rev/0e802b40b42b
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 1057198 - [LockScreen] Decoupling LockScreen with System before it becomes an iframe
2014-09-28 23:35:46 -07:00
B2G Bumper Bot
d899822864 Bumping manifests a=b2g-bump 2014-09-28 20:07:00 -07:00
B2G Bumper Bot
ed327c9255 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4c362fcebca8
Author: RickyChien <ricky060709@gmail.com>
Desc: Merge pull request #24276 from RickyChien/bug-963009

Bug 963009 - [Gaia][Build] Test coverage r=@yurenju

========

https://hg.mozilla.org/integration/gaia-central/rev/5d228139d199
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 963009 - [Gaia][Build] Test coverage
2014-09-28 20:00:49 -07:00
Brian R. Bondy
f7cb749319 Bug 958554 - Fix about window sometimes saying nightly is being updatd by another instance. r=rstrong
Note that if the process is hung, or there is another instance running in a  different user instance,
or another profile is running, the message is perfectly normal.  But this should prevent the bad case
of getting this message.

This handling was first added specifically for Metro and Firefox running the same intallation at the
same time.  Metro isn't being released but there are still other very valid reasons for having this
handling as noted above.
2014-09-28 21:26:34 -04:00
B2G Bumper Bot
a39075d11c Bumping manifests a=b2g-bump 2014-09-27 23:22:06 -07:00
B2G Bumper Bot
06fe910ec9 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c8323e3e024a
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #24231 from KevinGrandon/bug_1062048_part_2_day_view_test_wait_settings

Bug 1062048 - Wait for time format settings change

========

https://hg.mozilla.org/integration/gaia-central/rev/d9d69c56aecd
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1062048 - Wait for time format settings change r=kgrandon
2014-09-27 23:15:55 -07:00
B2G Bumper Bot
9d5ef37ccc Bumping manifests a=b2g-bump 2014-09-27 17:11:58 -07:00
B2G Bumper Bot
88c8025dbd Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d93a319ad5e5
Author: Gregor Wagner <anygregor@gmail.com>
Desc: Merge pull request #24340 from gregorwagner/1071529

Bug 1071529 - Remove deprecated-hwvideo permissions. r=djf

========

https://hg.mozilla.org/integration/gaia-central/rev/70304513f177
Author: Gregor Wagner <anygregor@gmail.com>
Desc: Bug 1071529 - Remove deprecated-hwvideo permissions. r=djf
2014-09-27 17:05:48 -07:00
B2G Bumper Bot
e0ab8c2324 Bumping manifests a=b2g-bump 2014-09-27 14:37:35 -07:00
B2G Bumper Bot
01fa968b0c Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b344581e017d
Author: sv99 <sv99@inbox.ru>
Desc: Bug 1069150 - [sms] unittest threads_test.js incorrect using assert.include for testing existing object property r=julien
2014-09-27 14:35:47 -07:00
B2G Bumper Bot
bc21faf8b3 Bumping manifests a=b2g-bump 2014-09-27 14:26:57 -07:00
B2G Bumper Bot
c480fad29e Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a36b8771b1c0
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 956192 - Follow-up, Remove old reference to nonexistent file r=kgrandon
2014-09-27 14:20:47 -07:00
B2G Bumper Bot
6c6fa57fe1 Bumping manifests a=b2g-bump 2014-09-27 10:26:58 -07:00
B2G Bumper Bot
318e6adcaa Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0c5b194a7893
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #24407 from jrburke/bug1069412-email-xoauth2-reauth

Bug 1069412 - Email constantly asks me to reauthenticate r=asuth

========

https://hg.mozilla.org/integration/gaia-central/rev/53c10e0ea8c6
Author: jrburke <jrburke@gmail.com>
Desc: Bug 1069412 - Email constantly asks me to reauthenticate
2014-09-27 10:20:47 -07:00
B2G Bumper Bot
b93a1a8698 Bumping manifests a=b2g-bump 2014-09-27 10:12:30 -07:00
Cykesiopka
3ac8cb4ccb Bug 1073865 - Add missing SSL_ERROR l10n strings v1. r=dkeeler 2014-09-27 14:02:00 +02:00