Commit Graph

407898 Commits

Author SHA1 Message Date
Wes Kocher
a72a85f6e2 Merge m-c to fx-team a=merge 2015-02-23 17:03:56 -08:00
Wes Kocher
530c4a09f9 Merge inbound to m-c a=merge 2015-02-23 16:05:13 -08:00
Wes Kocher
a2295b58c5 Merge fx-team to m-c a=merge 2015-02-23 16:00:36 -08:00
Ehsan Akhgari
baf73d756f Bug 1135745 - Disable the reserved-id-macro macro in security/pkix; r=briansmith 2015-02-23 13:40:09 -05:00
Richard Newman
7baddf9574 Bug 1130461 - Part 3: disable ReadingListHelper's background fetch triggers to avoid test problems. r=margaret 2015-02-23 10:35:11 -08:00
Richard Newman
b4c36f7f5d Bug 1130461 - Part 2: correct value setting in AddToReadingList. r=margaret
It turns out we were using bookmark columns here, which was wrong. We also need to specify ADDED_ON etc.
2015-02-23 10:35:11 -08:00
Richard Newman
aa7371af28 Bug 1130461 - Part 1: change schema for reading list. r=margaret
This patch does several things, all in one commit because of a schema update:

* Uses _id instead of guid when referring to reading list items, allowing the guid column to be null.
* Reworks schema upgrading.
* Completely revises the reading list schema itself.
* Fixes the tests.
* Cleans up how we do deletion: if an item hasn't yet been synced, it's simply deleted immediately. We can do this because the server allocates GUIDs.
* Adds columns to manage sync-related metadata.
2015-02-23 10:35:11 -08:00
Ehsan Akhgari
c666513656 Bug 1123111 - Fix a typo 2015-02-23 13:13:29 -05:00
William Chen
46214bb09f Bug 1134021 - Use composed document when getting nsDOMWindowUtils from shadow DOM content. r=kats 2015-02-23 10:10:23 -08:00
Jared Wein
fe221f3402 Bug 1047040 - Add browser-specific graphic of GUM prompt to the media-wait message. r=dmose
--HG--
extra : rebase_source : 53512e75b501e3e486e48828c41d7a2ea492d9b4
2015-02-23 13:00:03 -05:00
Ms2ger
2649263bed Bug 1135138 - Remove UNICODE from DEFINES in moz.build rather than Makefile.in; r=mshal
This was made possible by bug 928709.
2015-02-23 18:46:55 +01:00
Robert Strong
e793fd04f4 Bug 1135319 - Fix several javascript warnings when for mochitest-chrome app update tests and cleanup style. r=spohl 2015-02-23 09:45:03 -08:00
Ryan VanderMeulen
fe6e64f262 Backed out changeset 45d4cc092de1 (bug 1134598) for WinXP reftest leaks. 2015-02-23 12:37:04 -05:00
Ryan VanderMeulen
8979effb6c Merge m-c to inbound. a=merge 2015-02-23 12:33:38 -05:00
Ryan VanderMeulen
e522eacb94 Merge b2g-inbound to m-c. a=merge 2015-02-23 12:32:53 -05:00
Ryan VanderMeulen
46cf692211 Merge fx-team to m-c. a=merge 2015-02-23 12:28:02 -05:00
Tom Schuster
affc0dee90 Bug 1131531 - Ion GetElement IC should handle dense element holes. r=jandem 2015-02-23 18:21:51 +01:00
Tom Schuster
5189e1f281 Bug 1127629 - Handle void in ExpressionDecompiler. r=jandem 2015-02-23 18:21:51 +01:00
Botond Ballo
19a974637b Bug 1135591 - Fix build breakage from bug 1132153 in code conditional on '--enable-ipdl-tests'. r=dholbert 2015-02-23 11:42:16 -05:00
B2G Bumper Bot
abaafc0608 Bumping manifests a=b2g-bump 2015-02-23 07:52:41 -08:00
B2G Bumper Bot
587b28da93 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ee02227b3451
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #27977 from julienw/1128093-remove-active-color-for-links-without-href-v3

Bug 1128093 - [Messages] It's impossible to scroll participants list in ...

========

https://hg.mozilla.org/integration/gaia-central/rev/d9664042afc2
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1128093 - [Messages] It's impossible to scroll participants list in group MMS report panel r=schung

========

https://hg.mozilla.org/integration/gaia-central/rev/6d3089277b99
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #26892 from julienw/1089920-use-fixed-gaia-header

Bug 1089920 - use fixed gaia header

========

https://hg.mozilla.org/integration/gaia-central/rev/6969bef6aa52
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1089920 - fix gaia-header in Messages app r=schung
2015-02-23 07:50:17 -08:00
ffxbld
26cdf50eea Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2015-02-23 10:22:56 -05:00
B2G Bumper Bot
b9f28fd351 Bumping manifests a=b2g-bump 2015-02-23 07:22:43 -08:00
ffxbld
f412f60c81 No bug - Tagging mozilla-central 98086da94ccd with FIREFOX_AURORA_38_BASE a=release DONTBUILD CLOSED TREE 2015-02-23 10:20:53 -05:00
B2G Bumper Bot
b8f98a60a2 Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a0f2572109f0
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1134871 - merge pull request #28332 from gabrielesvelto:bug-1134871-speed-dial-delete to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/3a6200b95120
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 1134871 - Address review comments

========

https://hg.mozilla.org/integration/gaia-central/rev/9e8a136e6714
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 1134871 - Abbreviated dialing codes should be activated only by tapping the '#' key r=thills
2015-02-23 07:20:18 -08:00
B2G Bumper Bot
3805e998ab Bumping manifests a=b2g-bump 2015-02-23 05:27:45 -08:00
B2G Bumper Bot
8fffa1bd2c Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3e2fa1ecc4f7
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1127300 - merge pull request #27879 from arcturus:bug-1127300 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/5eaec9527c9e
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Bug 1127300 - [RTL] Custom tag input is left aligned and its delete button is misplaced r=sergi
2015-02-23 05:25:22 -08:00
B2G Bumper Bot
10a6ac25cc Bumping manifests a=b2g-bump 2015-02-23 05:01:46 -08:00
B2G Bumper Bot
06027a009d Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/04dba2866155
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1112586 - merge pull request #28330 from Cwiiis:bug1112586-volume-warning to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/65290db5adef
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1112586 - Don't reset the volume when doing volume warning. r=alive
2015-02-23 04:59:08 -08:00
Florian Quèze
e1a848b02c Bug 1124400 - [ReadingList] Add section to bookmarks popup for reading list items and actions, r=Unfocussed. 2015-02-23 13:58:36 +01:00
Carsten "Tomcat" Book
d030c614a4 Merge mozilla-central to b2g-inbound 2015-02-23 13:47:02 +01:00
B2G Bumper Bot
1eb9156eda Bumping manifests a=b2g-bump 2015-02-23 04:41:36 -08:00
Carsten "Tomcat" Book
f633fa7bf2 Merge mozilla-central to fx-team 2015-02-23 13:41:24 +01:00
B2G Bumper Bot
87d3ef51af Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3ead456b9eba
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1131039 - merge pull request #28268 from Cwiiis:bug1131039-fix-group-drag-first-row-highlight to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/75156f752126
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1131039 - Fix allowing group drop on first row of icons. r=kgrandon
2015-02-23 04:39:05 -08:00
Carsten "Tomcat" Book
f7354d5f41 merge mozilla-inbound to mozilla-central a=merge 2015-02-23 13:30:28 +01:00
Carsten "Tomcat" Book
5d8221ec4c merge fx-team to mozilla-central a=merge 2015-02-23 13:19:15 +01:00
Carsten "Tomcat" Book
3fa6b195b9 merge b2g-inbound to mozilla-central a=merge 2015-02-23 13:12:12 +01:00
Blair McBride
3ce3c917f3 Bug 1133673 - Fix PluralForm string in ReadingList string pre-landing. rs=flod a=tomcat 2015-02-24 00:03:54 +13:00
B2G Bumper Bot
2be704dcd5 Bumping manifests a=b2g-bump 2015-02-23 02:22:41 -08:00
B2G Bumper Bot
11042ff50a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/28750d4fb5b5
Author: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Desc: Merge pull request #27638 from azasypkin/bug-1122501-unify-discard-dialogs

Bug 1122501 - [Messages][Drafts] Unsaved draft is silently discarded when user tries to forward message. r=schung

========

https://hg.mozilla.org/integration/gaia-central/rev/6b69a85ed967
Author: Aleh Zasypkin <azasypkin@mozilla.com>
Desc: Bug 1122501 - [Messages][Drafts] Unsaved draft is silently discarded when user tries to forward message. r=schung
2015-02-23 02:19:17 -08:00
Blair McBride
c5f0cdb8f6 Bug 1133673 - Pre-land strings for ReadingList v1. r=markh a=Tomcat 2015-02-23 22:45:40 +13:00
B2G Bumper Bot
440138c8f8 Bumping manifests a=b2g-bump 2015-02-23 01:01:28 -08:00
B2G Bumper Bot
dbcf0084ab Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8f31030bb6d1
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1131509 - merge pull request #28207 from mancas:bug1131509 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/6be5169d1ed4
Author: Manuel <manuel.casasbarrado@telefonica.com>
Desc: Bug 1131509 - [Flame][First Time Experience]SIM 2 PIN page's "<" button can't be used in FTU. r=fcampo
2015-02-23 00:59:05 -08:00
Eddy Bruël
611427f3bf Backed out changeset 19757b673ffc;r=me 2015-02-23 09:45:39 +01:00
Eddy Bruël
bb275828a7 Bug 1129834 - Store BreakpointActors by original location;r=jlong 2015-02-23 09:43:08 +01:00
Eddy Bruël
b5d64e8bb1 Bug 1131643 - Implement a Location object;r=jlong 2015-02-23 09:36:58 +01:00
Phil Ringnalda
e3c03410ef Back out 66cf24f275b7 (bug 1124011) for frequent ASan crashes in test_memoryReporters.xul 2015-02-22 22:00:56 -08:00
Giovanny Andres Gongora Granada
71c7a6c45c Bug 974435 - Remove inline scripts and styles usage via JavaScript for shell.html and shell.js r=fabrice 2015-02-22 18:17:31 -08:00
Randell Jesup
1d16a313f3 Bug 1128116: Fix decoding H264 in webrtc where SPS & PPS aren't in a STAP-A packet r=ehugg
FF 37 and before didn't encode SPS/PPS into a STAP-A packet, and the
webrtc.org in branch 40 code doesn't handle that (common) case.
2015-02-22 19:10:59 -05:00
Phil Ringnalda
fdc2ff6cb9 Back out 21e812742b52 (bug 1134598) for unexpected assertions 2015-02-22 15:56:44 -08:00