Commit Graph

148105 Commits

Author SHA1 Message Date
Gijs Kruitbosch
fc6c455c77 Merge mozilla-central and ux 2013-09-19 09:09:59 +02:00
Wes Kocher
12a0d733f4 Merge fx-team to m-c 2013-09-18 18:00:34 -07:00
Wes Kocher
3d4714451c Merge b2g-inbound to m-c 2013-09-18 17:09:39 -07:00
Wes Kocher
774f802d10 Merge inbound to m-c 2013-09-18 16:48:24 -07:00
Gijs Kruitbosch
46b5d45e19 Bug 917271 - Fix race condition in browser_bug624734.js by checking for the completion of the async places call, r=dao 2013-09-18 23:49:31 +02:00
Gaia Pushbot
7b7d9951c2 Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/8547bf51868f
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #11995 from bobsilverberg/settings_bluetooth_test

Bug 917946 - Add Gaia-marionette tests for the settings app

========

https://hg.mozilla.org/integration/gaia-central/rev/6eedcfd6ddca
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 917946 - Add Gaia-marionette tests for the settings app
Create base app object
Create settings app object
Create bluetooth and do not track panel regions
Create sample tests for bluetooth and do not track settings
2013-09-18 12:40:22 -07:00
Lucas Rocha
0be3f9db55 Bug 910191/913402 - Don't use OnPreDrawObserver on pre-HC devices (r=sriram) 2013-09-18 14:50:22 -04:00
Chris Kitching
660e5c4dff Bug 916588 - Show default favicon when we bail in FaviconView.formatImage. r=margaret 2013-09-18 13:47:35 -04:00
Patrick Brosset
cedae86e47 Bug 835808 - Navigate with arrow keys in computed view; r=harth 2013-09-18 10:43:11 -07:00
Alexandre Poirot
c2459674ae Bug 917310 - Fix app install path for b2g r=fabrice
--HG--
extra : transplant_source : i3%A2%FD%A5c%BDc%F7%AA%3AP%98%D5%F3%E3Okr%09
2013-09-18 10:25:06 -07:00
Paul Rouget
1333ecaa76 Backed out changeset 184a0076278b (bug 890195). Almost-perma orange 2013-09-18 17:53:15 +02:00
Gijs Kruitbosch
0170a75b83 Merge mozilla-central and ux 2013-09-18 14:54:29 +02:00
Mike de Boer
4df12f8124 Bug 885086: constrain max width of overflowItems, correct layout and centering of elements and update zoom/ edit controls in overflow panel. r=jaws 2013-09-18 14:48:19 +02:00
Carsten "Tomcat" Book
28859189f7 merge b2g-inbound to mozilla-central 2013-09-18 12:14:05 +02:00
Carsten "Tomcat" Book
e02754c485 merge fx-team to mc 2013-09-18 12:12:28 +02:00
Gijs Kruitbosch
2d2aef1247 Merge m-c to UX 2013-09-18 10:31:05 +02:00
Gaia Pushbot
3b9fb6558e Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/d9e4d98a9fba
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #12246 from crdlc/bug-916782

Bug 916782 - Remove progress_activity.css and status.css from homescreen (it is only needed for ev.me)

========

https://hg.mozilla.org/integration/gaia-central/rev/7aefd8280725
Author: crdlc <crdlc@tid.es>
Desc: Bug 916782 - Remove progress_activity.css and status.css from homescreen (it is only needed for ev.me)
2013-09-17 23:50:26 -07:00
Robert Strong
2c1282fde0 Most entries in removed-files.in are no longer needed - Bug 649607 - Update removed-files.in after requiring update to the version with bug 563318. r=bbondy 2013-09-17 22:15:53 -07:00
Mark Hammond
63b8d6ba93 Bug 914615 - use http://mochi.test:8888 instead of http://foo.bar to test same origin in social tests. r=gavin 2013-09-18 15:08:22 +10:00
Phil Ringnalda
cf0ab675da Back out 2e69de47685e (bug 896291) on suspicion of timing out browser_homeDrop.js 2013-09-17 21:49:31 -07:00
Gaia Pushbot
ed039ff760 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/ebb38d4126d0
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12287 from lightsofapollo/reallyreallyhide-keyboard-tets

[really] per bug 917523 disable test on tbpl

========

https://hg.mozilla.org/integration/gaia-central/rev/290853690b8c
Author: James Lal <james@lightsofapollo.com>
Desc: [really] per bug 917523 disable test on tbpl
2013-09-17 21:40:27 -07:00
Patrick Wang
f14ecaebb3 Bug 912861 - don't assert mActor when getting a remote blob in GetOrCreateActorForBlob(). r=khuey 2013-09-18 12:04:20 +08:00
Fabrice Desré
b16364d8ec Bug 917602 - Fix some shutdown crashes r=bent 2013-09-18 10:53:07 -07:00
Fabrice Desré
acedadd2e8 Bug 915626 - Add a way to restart gecko into a clean state r=vingtetun 2013-09-18 10:42:06 -07:00
Alexandre Poirot
3ec9a59336 Bug 917310 - Fix app install path for b2g r=fabrice 2013-09-18 10:25:06 -07:00
Gaia Pushbot
93fb4291ac Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/e596a7138422
Author: ochameau <poirot.alex@gmail.com>
Desc: Merge pull request #12299 from ochameau/build-exceptions

Bug 917793 - Ensure printing exceptions in js build scripts r=yurenju

========

https://hg.mozilla.org/integration/gaia-central/rev/6465882eb932
Author: Alexandre Poirot <poirot.alex@gmail.com>
Desc: Bug 917793 - Ensure printing exceptions in js build scripts r=yurenju
2013-09-18 08:30:22 -07:00
Gaia Pushbot
7ed9a6dd0d Bumping gaia.json for 1 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/e77a67b02714
Author: Corey Frang <gnarf37@gmail.com>
Desc: Bug 917337 - [Clock] Implement Scrolling for Timer Settings

https://bugzilla.mozilla.org/show_bug.cgi?id=917337

- Adds overflow-y: auto to #timer-dialog
- Adds a event.preventDefault() on touchstart on the time picker to stop user from scrolling while spinning inputs

r=jugglinmike
2013-09-18 08:05:24 -07:00
Jim Chen
edfdc92c0a Bug 916205 - Add and package UA override list; r=fabrice r=glandium 2013-09-18 10:57:08 -04:00
Jessica Jong
2d263a8ebc Bug 909688: B2G RIL - tests cases for data loss. r=vicamo 2013-09-18 22:06:03 +08:00
Kartikaya Gupta
428dc56fa0 Bug 880024 - Extract some useful code for implementing GeckoContentController into a helper class. r=k17e 2013-09-18 09:56:16 -04:00
Gaia Pushbot
463f709b98 Bumping gaia.json for 4 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/5cf9abd14f7e
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Merge pull request #12296 from gtorodelvalle/contacts-bug-910170-export-button-not-disabled

Bug 910170 - [CONTACTS] The export button isn't disabled when no contact is selected (r=jmcanterafonseca).

========

https://hg.mozilla.org/integration/gaia-central/rev/ae1bb0ba69c5
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Bug 910170 - [CONTACTS] The export button isn't disabled when no contact is selected.

========

https://hg.mozilla.org/integration/gaia-central/rev/81b0bdb11125
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Merge pull request #12295 from gtorodelvalle/contacts-bug-916100-footer-button-not-disabled

Bug 916100 - [Contacts] Taapping on the disabled merge button when there are not contacts selected to be merged make it to change its colour (r=jmcanterafonseca)

========

https://hg.mozilla.org/integration/gaia-central/rev/5ea89914d834
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Bug 916100 - [Contacts] Taapping on the disabled merge button when there are not contacts selected to be merged make it to change its colour.
2013-09-18 06:40:22 -07:00
Carsten "Tomcat" Book
8d8dbd09da Merge m-c to b2g-inbound 2013-09-18 12:38:46 +02:00
Jessica Jong
cdcaedf1e5 Bug 909688: B2G RIL - handle data connection state changes properly. r=vicamo 2013-09-18 18:07:14 +08:00
Mark Capella
0d0b24b314 Bug 770101 - about:config should label integer fields correctly so keyboard uses numerical mode, r=wesj 2013-09-17 23:54:48 -04:00
Mark Capella
4d3c71bac5 Bug 913214 - Create StringUtils method to provide readable URL / title string, r=wesj, sriram 2013-09-17 23:54:48 -04:00
Nicholas Cameron
e240d81f2e Bug 902591. Check for Azure in ContentClientIncremental. r=mattwoodrow
--HG--
extra : rebase_source : 134ddc6a2fd891179b7531cea4222188b518f19a
2013-09-18 15:47:23 +12:00
Jesse Ruderman
ff2ad80f10 Crashtest for bug 861489. 2013-09-17 20:46:17 -07:00
L. David Baron
fb8c5120b6 Bug 861489: Fix SkipAnimationRule to do the right thing in the presence of new cascading rules. r=bzbarsky 2013-09-17 20:46:17 -07:00
Phil Ringnalda
20955f5101 Backed out changeset 505e8f8480d2 (bug 913597) for Android failure
--HG--
extra : rebase_source : d9ffe836559fb5a63d895d40b4f89324c2932216
2013-09-17 20:45:48 -07:00
Joshua Cranmer
b511ee58c5 Bug 904985 - Use Char16.h in favor of NS_LL, Part 3: kill NS_LL. r=dbaron
--HG--
extra : rebase_source : bc105a8cbb87cc9b6b2db0734d9841fe599e794b
2013-09-17 22:43:21 -05:00
Joshua Cranmer
821f9d62df Bug 904985, part 2: Use char16_t for NS_LITERAL_STRING, r=glandium, dbaron.
--HG--
extra : rebase_source : b4c9def93d907724fb4a1bc3f6279db87a11fb1f
2013-09-17 22:43:12 -05:00
Joshua Cranmer
4a4a5f9a8d Bug 904985, part 1: Add better support for char16_t in type traits, r=Waldo.
--HG--
extra : rebase_source : 45cb9155312ead0b8164e1e460c9fd2e39f0d6fc
2013-09-17 22:43:04 -05:00
Nicholas Cameron
427925dcb8 Backed out changeset: 0ae388d62a87. r=me 2013-09-18 15:43:26 +12:00
Nicholas Cameron
9fd5d6415b Bug 907463. Backout OP_SOURCE optimisation from bug 907926. r=mattwoodrow
--HG--
extra : rebase_source : eac66979f88c7801bc19646cf81d7c94a77281c0
2013-09-18 15:39:34 +12:00
Chris Pearce
7fb506d1f8 Bug 915957 - Move MediaDecoder::NotifyBytesConsumed() calls into MediaResource, so we don't need to remember to do them in all decoder backends. r=kinetik 2013-09-18 15:37:23 +12:00
Gaia Pushbot
6228d556c4 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/31d028bfcc44
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #12236 from gasolin/issue-911696

Bug 911696 - [Dialer] [Flatfish] hide dialer app in homescreen if no tel..., r=crdlc

========

https://hg.mozilla.org/integration/gaia-central/rev/c0226574c7ea
Author: gasolin <gasolin@gmail.com>
Desc: Bug 911696 - [Dialer] [Flatfish] hide dialer app in homescreen if no telephony support
2013-09-17 20:20:22 -07:00
Ryan VanderMeulen
bb60520efd Merge m-c to fx-team. 2013-09-17 22:49:31 -04:00
Ryan VanderMeulen
13384c7908 Merge m-c to inbound. 2013-09-17 22:47:28 -04:00
Ryan VanderMeulen
36ebd04340 Merge b2g-inbound to m-c. 2013-09-17 22:46:32 -04:00
Marco Castelluccio
a80ef481d4 Bug 917310 - Apps install path is broken on b2g desktop for windows and mac r=fabrice 2013-09-17 17:36:36 -07:00