Wes Kocher
4760eeb7be
Merge inbound to m-c a=merge
2015-02-23 16:05:13 -08:00
Wes Kocher
c0f5e99f5a
Merge fx-team to m-c a=merge
2015-02-23 16:00:36 -08:00
Ehsan Akhgari
d59e287524
Bug 1135745 - Disable the reserved-id-macro macro in security/pkix; r=briansmith
2015-02-23 13:40:09 -05:00
Richard Newman
c0ef02aa1a
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
5b61fd66f4
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
e40d242fcc
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
7efe3bc3c9
Bug 1123111 - Fix a typo
2015-02-23 13:13:29 -05:00
William Chen
1fecc3ee71
Bug 1134021 - Use composed document when getting nsDOMWindowUtils from shadow DOM content. r=kats
2015-02-23 10:10:23 -08:00
Jared Wein
40ac49c659
Bug 1047040 - Add browser-specific graphic of GUM prompt to the media-wait message. r=dmose
2015-02-23 13:00:03 -05:00
Ms2ger
0e666da362
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
dfdd36c714
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
7f6c9d55b4
Backed out changeset 45d4cc092de1 (bug 1134598) for WinXP reftest leaks.
2015-02-23 12:37:04 -05:00
Ryan VanderMeulen
07473d5c3c
Merge m-c to inbound. a=merge
2015-02-23 12:33:38 -05:00
Ryan VanderMeulen
7caeade153
Merge b2g-inbound to m-c. a=merge
2015-02-23 12:32:53 -05:00
Ryan VanderMeulen
b9a237cfde
Merge fx-team to m-c. a=merge
2015-02-23 12:28:02 -05:00
Tom Schuster
8b0b19285c
Bug 1131531 - Ion GetElement IC should handle dense element holes. r=jandem
2015-02-23 18:21:51 +01:00
Tom Schuster
2c54b810d8
Bug 1127629 - Handle void in ExpressionDecompiler. r=jandem
2015-02-23 18:21:51 +01:00
Botond Ballo
d0f6504d5a
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
13ed134b36
Bumping manifests a=b2g-bump
2015-02-23 07:52:41 -08:00
B2G Bumper Bot
c0ce544b95
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
940b3be96c
Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release
2015-02-23 10:22:56 -05:00
B2G Bumper Bot
3e92aef5ad
Bumping manifests a=b2g-bump
2015-02-23 07:22:43 -08:00
ffxbld
e6670ac973
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
582b7039f6
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
39e3cc88b9
Bumping manifests a=b2g-bump
2015-02-23 05:27:45 -08:00
B2G Bumper Bot
607e54288a
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
288dd910e9
Bumping manifests a=b2g-bump
2015-02-23 05:01:46 -08:00
B2G Bumper Bot
a02613adeb
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
1d788f3de7
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
78740ce3b7
Merge mozilla-central to b2g-inbound
2015-02-23 13:47:02 +01:00
B2G Bumper Bot
7397b98ee5
Bumping manifests a=b2g-bump
2015-02-23 04:41:36 -08:00
Carsten "Tomcat" Book
bbbb0cf83b
Merge mozilla-central to fx-team
2015-02-23 13:41:24 +01:00
B2G Bumper Bot
1ba8407ab2
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
0f61ee5c48
merge mozilla-inbound to mozilla-central a=merge
2015-02-23 13:30:28 +01:00
Carsten "Tomcat" Book
74c9d1c268
merge fx-team to mozilla-central a=merge
2015-02-23 13:19:15 +01:00
Carsten "Tomcat" Book
7e6fde5952
merge b2g-inbound to mozilla-central a=merge
2015-02-23 13:12:12 +01:00
Blair McBride
63f682e7af
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
d0900ce518
Bumping manifests a=b2g-bump
2015-02-23 02:22:41 -08:00
B2G Bumper Bot
a3889ff7ff
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
895524c276
Bug 1133673 - Pre-land strings for ReadingList v1. r=markh a=Tomcat
2015-02-23 22:45:40 +13:00
B2G Bumper Bot
d496cd0902
Bumping manifests a=b2g-bump
2015-02-23 01:01:28 -08:00
B2G Bumper Bot
9ff95917cc
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
df7488022c
Backed out changeset 19757b673ffc;r=me
2015-02-23 09:45:39 +01:00
Eddy Bruël
cbba2c460f
Bug 1129834 - Store BreakpointActors by original location;r=jlong
2015-02-23 09:43:08 +01:00
Eddy Bruël
ccc393f10c
Bug 1131643 - Implement a Location object;r=jlong
2015-02-23 09:36:58 +01:00
Phil Ringnalda
2a884ecd82
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
6735b07792
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
8bdecb1c77
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
ab58c7938d
Back out 21e812742b52 (bug 1134598) for unexpected assertions
2015-02-22 15:56:44 -08:00
Phil Ringnalda
dca7efea7c
Merge m-c to f-t
2015-02-22 15:18:41 -08:00
