Ms2ger
03028689d0
Bug 909003 - Part e: Remove some includes from SpeechGrammarList.h; r=bz
2013-09-06 08:43:19 +02:00
Ms2ger
93af66a4c0
Bug 909003 - Part d: Remove some includes from nsHistory.h; r=bz
2013-09-06 08:43:16 +02:00
Ms2ger
d26ff949c8
Bug 909003 - Part c: Remove some includes from WebSocket.h; r=bz
2013-09-06 08:43:12 +02:00
Ms2ger
fe1a809153
Bug 909003 - Part b: Sort includes in WebSocket.h; r=bz
2013-09-06 08:43:07 +02:00
Ms2ger
42636e8184
Bug 909003 - Part a: Add missing includes to TypedArray.h; r=bz
2013-09-06 08:43:04 +02:00
Ms2ger
d3cbd67bde
Bug 903772 - Add a license header to AtomList.h; r=khuey
2013-09-06 08:42:57 +02:00
Ms2ger
6eef18d6d4
Bug 909028 - Remove dead chromium code; r=ehsan, rs=bent
2013-09-06 08:42:41 +02:00
Ms2ger
cc64d2432b
Bug 909953 - Introduce a HTMLAllCollection class; r=smaug
2013-09-06 08:41:42 +02:00
Ms2ger
28665d82a2
Bug 903080 - Move CSP tests in content/base/test into a subdir; r=ddahl+mshal
...
--HG--
rename : content/base/test/file_CSP.css => content/base/test/csp/file_CSP.css
rename : content/base/test/file_CSP.sjs => content/base/test/csp/file_CSP.sjs
rename : content/base/test/file_CSP_bug663567.xsl => content/base/test/csp/file_CSP_bug663567.xsl
rename : content/base/test/file_CSP_bug663567_allows.xml => content/base/test/csp/file_CSP_bug663567_allows.xml
rename : content/base/test/file_CSP_bug663567_allows.xml^headers^ => content/base/test/csp/file_CSP_bug663567_allows.xml^headers^
rename : content/base/test/file_CSP_bug663567_blocks.xml => content/base/test/csp/file_CSP_bug663567_blocks.xml
rename : content/base/test/file_CSP_bug663567_blocks.xml^headers^ => content/base/test/csp/file_CSP_bug663567_blocks.xml^headers^
rename : content/base/test/file_CSP_bug802872.html => content/base/test/csp/file_CSP_bug802872.html
rename : content/base/test/file_CSP_bug802872.html^headers^ => content/base/test/csp/file_CSP_bug802872.html^headers^
rename : content/base/test/file_CSP_bug802872.js => content/base/test/csp/file_CSP_bug802872.js
rename : content/base/test/file_CSP_bug802872.sjs => content/base/test/csp/file_CSP_bug802872.sjs
rename : content/base/test/file_CSP_bug885433_allows.html => content/base/test/csp/file_CSP_bug885433_allows.html
rename : content/base/test/file_CSP_bug885433_allows.html^headers^ => content/base/test/csp/file_CSP_bug885433_allows.html^headers^
rename : content/base/test/file_CSP_bug885433_blocks.html => content/base/test/csp/file_CSP_bug885433_blocks.html
rename : content/base/test/file_CSP_bug885433_blocks.html^headers^ => content/base/test/csp/file_CSP_bug885433_blocks.html^headers^
rename : content/base/test/file_CSP_bug888172.html => content/base/test/csp/file_CSP_bug888172.html
rename : content/base/test/file_CSP_bug888172.sjs => content/base/test/csp/file_CSP_bug888172.sjs
rename : content/base/test/file_CSP_evalscript_main.html => content/base/test/csp/file_CSP_evalscript_main.html
rename : content/base/test/file_CSP_evalscript_main.html^headers^ => content/base/test/csp/file_CSP_evalscript_main.html^headers^
rename : content/base/test/file_CSP_evalscript_main.js => content/base/test/csp/file_CSP_evalscript_main.js
rename : content/base/test/file_CSP_evalscript_main_allowed.js => content/base/test/csp/file_CSP_evalscript_main_allowed.js
rename : content/base/test/file_CSP_evalscript_main_allowed_getCRMFRequest.js => content/base/test/csp/file_CSP_evalscript_main_allowed_getCRMFRequest.js
rename : content/base/test/file_CSP_evalscript_main_getCRMFRequest.html => content/base/test/csp/file_CSP_evalscript_main_getCRMFRequest.html
rename : content/base/test/file_CSP_evalscript_main_getCRMFRequest.html^headers^ => content/base/test/csp/file_CSP_evalscript_main_getCRMFRequest.html^headers^
rename : content/base/test/file_CSP_evalscript_main_getCRMFRequest.js => content/base/test/csp/file_CSP_evalscript_main_getCRMFRequest.js
rename : content/base/test/file_CSP_evalscript_main_spec_compliant.html => content/base/test/csp/file_CSP_evalscript_main_spec_compliant.html
rename : content/base/test/file_CSP_evalscript_main_spec_compliant.html^headers^ => content/base/test/csp/file_CSP_evalscript_main_spec_compliant.html^headers^
rename : content/base/test/file_CSP_evalscript_main_spec_compliant_allowed.html => content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed.html
rename : content/base/test/file_CSP_evalscript_main_spec_compliant_allowed.html^headers^ => content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed.html^headers^
rename : content/base/test/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html => content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html
rename : content/base/test/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html^headers^ => content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html^headers^
rename : content/base/test/file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html => content/base/test/csp/file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html
rename : content/base/test/file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html^headers^ => content/base/test/csp/file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html^headers^
rename : content/base/test/file_CSP_evalscript_no_CSP_at_all.html => content/base/test/csp/file_CSP_evalscript_no_CSP_at_all.html
rename : content/base/test/file_CSP_evalscript_no_CSP_at_all.html^headers^ => content/base/test/csp/file_CSP_evalscript_no_CSP_at_all.html^headers^
rename : content/base/test/file_CSP_evalscript_no_CSP_at_all.js => content/base/test/csp/file_CSP_evalscript_no_CSP_at_all.js
rename : content/base/test/file_CSP_frameancestors.sjs => content/base/test/csp/file_CSP_frameancestors.sjs
rename : content/base/test/file_CSP_frameancestors_main.html => content/base/test/csp/file_CSP_frameancestors_main.html
rename : content/base/test/file_CSP_frameancestors_main.js => content/base/test/csp/file_CSP_frameancestors_main.js
rename : content/base/test/file_CSP_frameancestors_main_spec_compliant.html => content/base/test/csp/file_CSP_frameancestors_main_spec_compliant.html
rename : content/base/test/file_CSP_frameancestors_main_spec_compliant.js => content/base/test/csp/file_CSP_frameancestors_main_spec_compliant.js
rename : content/base/test/file_CSP_frameancestors_spec_compliant.sjs => content/base/test/csp/file_CSP_frameancestors_spec_compliant.sjs
rename : content/base/test/file_CSP_inlinescript_main.html => content/base/test/csp/file_CSP_inlinescript_main.html
rename : content/base/test/file_CSP_inlinescript_main.html^headers^ => content/base/test/csp/file_CSP_inlinescript_main.html^headers^
rename : content/base/test/file_CSP_inlinescript_main_spec_compliant.html => content/base/test/csp/file_CSP_inlinescript_main_spec_compliant.html
rename : content/base/test/file_CSP_inlinescript_main_spec_compliant.html^headers^ => content/base/test/csp/file_CSP_inlinescript_main_spec_compliant.html^headers^
rename : content/base/test/file_CSP_inlinescript_main_spec_compliant_allowed.html => content/base/test/csp/file_CSP_inlinescript_main_spec_compliant_allowed.html
rename : content/base/test/file_CSP_inlinescript_main_spec_compliant_allowed.html^headers^ => content/base/test/csp/file_CSP_inlinescript_main_spec_compliant_allowed.html^headers^
rename : content/base/test/file_CSP_inlinestyle_main.html => content/base/test/csp/file_CSP_inlinestyle_main.html
rename : content/base/test/file_CSP_inlinestyle_main.html^headers^ => content/base/test/csp/file_CSP_inlinestyle_main.html^headers^
rename : content/base/test/file_CSP_inlinestyle_main_spec_compliant.html => content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant.html
rename : content/base/test/file_CSP_inlinestyle_main_spec_compliant.html^headers^ => content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant.html^headers^
rename : content/base/test/file_CSP_inlinestyle_main_spec_compliant_allowed.html => content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant_allowed.html
rename : content/base/test/file_CSP_inlinestyle_main_spec_compliant_allowed.html^headers^ => content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant_allowed.html^headers^
rename : content/base/test/file_CSP_main.html => content/base/test/csp/file_CSP_main.html
rename : content/base/test/file_CSP_main.html^headers^ => content/base/test/csp/file_CSP_main.html^headers^
rename : content/base/test/file_CSP_main.js => content/base/test/csp/file_CSP_main.js
rename : content/base/test/file_CSP_main_spec_compliant.html => content/base/test/csp/file_CSP_main_spec_compliant.html
rename : content/base/test/file_CSP_main_spec_compliant.html^headers^ => content/base/test/csp/file_CSP_main_spec_compliant.html^headers^
rename : content/base/test/file_CSP_main_spec_compliant.js => content/base/test/csp/file_CSP_main_spec_compliant.js
rename : content/base/test/file_bothCSPheaders.html => content/base/test/csp/file_bothCSPheaders.html
rename : content/base/test/file_bothCSPheaders.html^headers^ => content/base/test/csp/file_bothCSPheaders.html^headers^
rename : content/base/test/file_csp_bug768029.html => content/base/test/csp/file_csp_bug768029.html
rename : content/base/test/file_csp_bug768029.sjs => content/base/test/csp/file_csp_bug768029.sjs
rename : content/base/test/file_csp_bug773891.html => content/base/test/csp/file_csp_bug773891.html
rename : content/base/test/file_csp_bug773891.sjs => content/base/test/csp/file_csp_bug773891.sjs
rename : content/base/test/file_csp_redirects_main.html => content/base/test/csp/file_csp_redirects_main.html
rename : content/base/test/file_csp_redirects_page.sjs => content/base/test/csp/file_csp_redirects_page.sjs
rename : content/base/test/file_csp_redirects_resource.sjs => content/base/test/csp/file_csp_redirects_resource.sjs
rename : content/base/test/test_CSP.html => content/base/test/csp/test_CSP.html
rename : content/base/test/test_CSP_bug663567.html => content/base/test/csp/test_CSP_bug663567.html
rename : content/base/test/test_CSP_bug802872.html => content/base/test/csp/test_CSP_bug802872.html
rename : content/base/test/test_CSP_bug885433.html => content/base/test/csp/test_CSP_bug885433.html
rename : content/base/test/test_CSP_bug888172.html => content/base/test/csp/test_CSP_bug888172.html
rename : content/base/test/test_CSP_evalscript.html => content/base/test/csp/test_CSP_evalscript.html
rename : content/base/test/test_CSP_evalscript_getCRMFRequest.html => content/base/test/csp/test_CSP_evalscript_getCRMFRequest.html
rename : content/base/test/test_CSP_frameancestors.html => content/base/test/csp/test_CSP_frameancestors.html
rename : content/base/test/test_CSP_inlinescript.html => content/base/test/csp/test_CSP_inlinescript.html
rename : content/base/test/test_CSP_inlinestyle.html => content/base/test/csp/test_CSP_inlinestyle.html
rename : content/base/test/test_bothCSPheaders.html => content/base/test/csp/test_bothCSPheaders.html
rename : content/base/test/chrome/test_csp_bug768029.html => content/base/test/csp/test_csp_bug768029.html
rename : content/base/test/chrome/test_csp_bug773891.html => content/base/test/csp/test_csp_bug773891.html
rename : content/base/test/test_csp_redirects.html => content/base/test/csp/test_csp_redirects.html
2013-09-06 08:41:38 +02:00
Ms2ger
9e242a759d
No bug - Remove a stray semicolon
2013-09-06 08:41:34 +02:00
Ms2ger
82fdf2f606
Bug 910253 - Part b: Move conditional LOCAL_INCLUDES to moz.build in accessible/; r=mshal
2013-09-06 08:41:29 +02:00
Ms2ger
eb40a5cfaa
Bug 910253 - Part a: Move unconditional LOCAL_INCLUDES to moz.build in accessible/; r=mshal
2013-09-06 08:41:18 +02:00
Ms2ger
7f80fc1f7a
Bug 910251 - Support LOCAL_INCLUDES in moz.build; r=gps
2013-09-06 08:41:04 +02:00
Ms2ger
24174f3201
Bug 910238 - Part c: Remove content dirs from LOCAL_INCLUDES in accessible/; r=tbsaune
2013-09-06 08:41:00 +02:00
Ms2ger
4ffdb7518d
Bug 910238 - Part b: Export nsImageLoadingContent.h; r=bz
2013-09-06 08:40:49 +02:00
Ms2ger
9021ca781d
Bug 910238 - Part a: Remove some includes from HTMLInputElement.h; r=bz
2013-09-06 08:40:45 +02:00
Ms2ger
4e96ae49a4
Bug 870407 - Move final batch of CMMSRCS to moz.build and disallow it in makefiles; r=khuey
2013-09-06 08:40:41 +02:00
Ms2ger
7a1ad04da0
Bug 906696 - Start moving testplugin.mk to moz.build; f=gps r=mshal
2013-09-06 08:40:37 +02:00
Ms2ger
20f91680d3
Bug 774124 - Part c: Include nsContentUtils.h in HTMLSplitOnSpacesTokenizer.h; r=dzbarsky
2013-09-06 08:40:33 +02:00
Ms2ger
615c7a7de6
Bug 774124 - Part b: Add include-what-you-use annotations to nsDisplayItemTypes.h and nsDisplayItemTypesList.h; r=roc
2013-09-06 08:40:30 +02:00
Ms2ger
c60ce2f4f7
Bug 774124 - Part a: Include nsAttrValue.h in nsAttrValueInlines.h; r=dzbarsky
2013-09-06 08:40:03 +02:00
Mark Hammond
9d87506987
Bug 903299 - don't log errors if the prompter declines to show a modal prompt. r=adw
2013-09-06 16:37:25 +10:00
Gaia Pushbot
964de4ec8a
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/70eeaa702869
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #11978 from alivedise/bugzilla/905116_master_v3/implement-homescreen-window-launcher
Bug 905116 - Implement Homescreen Window + Homescreen Launcher, r=timdream
========
https://hg.mozilla.org/integration/gaia-central/rev/0cef61b4b186
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 905116 - Implement Homescreen Window + Homescreen Launcher
2013-09-05 21:00:22 -07:00
Gaia Pushbot
98c69dd958
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/43938cb4eedc
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #11947 from steveck-chung/cdma-emergencyCbMode
Bug 881863 - [Gaia] B2G CDMA UI support for emergency call back mode. r=alive, a=koi+.
========
https://hg.mozilla.org/integration/gaia-central/rev/9a1becdb5005
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 881863 - [Gaia] B2G CDMA UI support for emergency call back mode
2013-09-05 20:50:23 -07:00
Phil Ringnalda
f94a2e73eb
Back out 997672af6fc8:8a34b197be1d (bug 885169) for Win64 bustage
2013-09-05 20:24:20 -07:00
Gaia Pushbot
fe6f560a00
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/91ec5d7cc6c6
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #11973 from alivedise/bugzilla/897283
Bug 897283 - No scroll in input PUK screen, r=alive, a=leo+
========
https://hg.mozilla.org/integration/gaia-central/rev/d2b45cdcbe5f
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 897283 - No scroll in input PUK screen
2013-09-05 20:02:09 -07:00
Chia-hung Tai
e1b34277e8
Bug 911690 - Fix the forever spinning circle icon when sending SMS under no service. r=vyang
2013-09-06 10:25:06 +08:00
supadennis.lee
b43e5918a6
Bug 900595 - Once always send a report has been selected, selecting any other option is ignored with system crashes r=fabrice
2013-09-05 18:41:31 -07:00
Matt Brubeck
066f30b9b7
Bug 891056 (part 1) - Code cleanup for autocomplete CSS [r=rsilveira]
2013-09-05 17:40:17 -07:00
Matt Brubeck
bff32d823c
Bug 909019 - Rename and simplify BrowserUI new tab API [r=ally]
2013-09-05 17:40:17 -07:00
Nick Fitzgerald
09896f5a91
Bug 908337 - add getFrameLocation(frame) function and use it wherever we get frame locations in the debugger server; r=jimb
2013-09-05 16:51:23 -07:00
Nick Fitzgerald
667de0ac6c
Bug 878307 - When stepping through source mapped code, we should continue stepping until we are at a new location in the original source; r=jimb
2013-09-05 16:32:27 -07:00
Gaia Pushbot
5f94fe01d1
Bumping gaia.json for 1 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/91fe480f4545
Author: Adam Hyland <protonk@gmail.com>
Desc: Bug 909343 [Clock] Refactor Date Math Utilities r=jugglinmike
Refactor utils.js to provide methods for:
- Conversion to milliseconds from objects with duration values, e.g.
{hours: 4, seconds: 12} (for any combination of hours, minutes,
seconds, etc.
- Conversion from millisecond interval to object with duration values.
2013-09-05 14:45:23 -07:00
Gaia Pushbot
fce434a0a0
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/3057b7d5e2cc
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #11970 from KevinGrandon/bug_913193_fix_calendar_oauth_keys
Bug 913193 - Fix Oauth keys r=lightsofapollo
========
https://hg.mozilla.org/integration/gaia-central/rev/29ec879eecb7
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 913193 - Fix Oauth keys r=lightsofapollo
2013-09-05 14:10:22 -07:00
Fabrice Desré
90ef126aa5
Backout bug 798353 for... not actually working properly
2013-09-05 13:18:28 -07:00
Yuan Xulei
ca70d4cc78
Bug 902847 - Don't trim spaces before newline for contentEditable. r=hsivonen
2013-09-05 16:10:04 -04:00
Ryan VanderMeulen
bc09ab2cd9
Merge inbound to m-c.
2013-09-05 15:42:49 -04:00
Ryan VanderMeulen
c4745b3b08
Backed out changeset 9d9e289013de (bug 899213) due to various regressions caused by it.
2013-09-05 15:39:56 -04:00
Ryan VanderMeulen
cdfb28768d
Merge fx-team to m-c.
2013-09-05 15:37:00 -04:00
Ryan VanderMeulen
429d1d689c
Merge b2g-inbound to m-c.
2013-09-05 15:36:26 -04:00
Gaia Pushbot
54cd2fb627
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/1bb5a08dd1a7
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #11572 from gitmai/bug-905946-autocorrect-punctuation
Bug 905946 - keeping the punctuation character when reverting autofixing r=davidflanagan
========
https://hg.mozilla.org/integration/gaia-central/rev/43f6ddd0c0bf
Author: mai <mri@tid.es>
Desc: Bug 905946 - keeping the punctuation character when reverting autofixing
2013-09-05 11:30:22 -07:00
Gaia Pushbot
73e97e7b9e
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/817c28709daf
Author: Ben Francis <ben@tola.me.uk>
Desc: Merge pull request #11945 from RudyLu/Bug912906_extend_timeout_forBrowserDBTest
Bug 912906 - Extend the unit test timeout to 5 seconds for r=benfrancis
========
https://hg.mozilla.org/integration/gaia-central/rev/4d879c638593
Author: Rudy Lu <left.lu@gmail.com>
Desc: Bug 912906 - Extend the unit test timeout to 5 seconds for
browser_db_test.
2013-09-05 10:55:21 -07:00
Gaia Pushbot
e6c32e74bc
Bumping gaia.json for 4 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/9486207b6a2e
Author: Jonathan Griffin <jgriffin@mozilla.com>
Desc: Merge pull request #11929 from jonallengriffin/unitdir
Bug 911395 - Only run tests in 'unit' directories, r=Rik, a=test-only
========
https://hg.mozilla.org/integration/gaia-central/rev/776f07313f92
Author: Jonathan Griffin <jgriffin@mozilla.com>
Desc: Bug 911395 - Only run tests in 'unit' directories, r=Rik, a=test-only
========
https://hg.mozilla.org/integration/gaia-central/rev/6bc8c4774c6d
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #9403 from pivanov/bug-798696
Bug 798696 - When viewing single image in Gallery, extremely hard to find button to go back to thumbnail view
========
https://hg.mozilla.org/integration/gaia-central/rev/bd17634f54b0
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 798696 - When viewing single image in Gallery, extremely hard to find button to go back to thumbnail view
2013-09-05 10:40:22 -07:00
Ehsan Akhgari
45746b149c
Backed out changeset 2f15518f566e (bug 912702) because of B2G JB Emulator build bustage
...
--HG--
extra : rebase_source : 6c01ad3bc2f91b0e7e3edab84aedbfe064310a8b
2013-09-05 13:29:38 -04:00
Gaia Pushbot
0a0b6faa22
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/440d939f26d2
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #11957 from gaye/bump-marionette-helper
Bump marionette-helper to 0.0.6
========
https://hg.mozilla.org/integration/gaia-central/rev/73d18f581157
Author: gaye <gaye@mozilla.com>
Desc: Bump marionette-helper to 0.0.6
2013-09-05 10:10:23 -07:00
Fabrice Desré
c3bec87fea
Bug 912065 - tapping the" Change wallpaper" icon has no action in the settings app r=vingtetun
2013-09-05 09:45:16 -07:00
Nick Alexander
1579cd537d
Merge m-c to s-c.
2013-09-05 09:07:12 -07:00
Fabrice Desré
40ec4cf85d
Bug 912840 - Preload the appcache manifest properly in OfflineCacheInstaller.jsm r=ochameau
2013-09-05 09:00:14 -07:00
Gaia Pushbot
de7afdd12b
Bumping gaia.json for 8 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/86636c1797f4
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #11941 from jmcanterafonseca/bug-912554
Bug 912554 - [Contacts] Preserve givenName and familyName of the new or ...
========
https://hg.mozilla.org/integration/gaia-central/rev/ac397c5e0f7c
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 912554 - [Contacts] Preserve givenName and familyName of the new or being edited contact when merging.
========
https://hg.mozilla.org/integration/gaia-central/rev/1d145503388b
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #11921 from jmcanterafonseca/bug-906756
Bug 906756 - Algorithms for merging givenName and familyName. Master Con...
========
https://hg.mozilla.org/integration/gaia-central/rev/2948f46fcda1
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 906756 - Algorithms for merging givenName and familyName. Master Contact takes precedence
========
https://hg.mozilla.org/integration/gaia-central/rev/5d876cf397fa
Author: Michael Vines <mvines@codeaurora.org>
Desc: Bug 911357 - Enable build-time overriding of default Gaia wallpaper via GAIA_DISTRIBUTION_DIR. r=yurenju
========
https://hg.mozilla.org/integration/gaia-central/rev/b2867a27e8ba
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #11849 from wanderview/shared-zero-timeout
Bug 910876: Import NobleJS setImmediate polyfill - r=timdream
========
https://hg.mozilla.org/integration/gaia-central/rev/b86f7a2a0aa6
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 910876: Customize NobleJS setImmediate polyfill
========
https://hg.mozilla.org/integration/gaia-central/rev/4887ebab34ab
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 910876: Import NobleJS setImmediate() polyfill
2013-09-05 08:55:21 -07:00
Gaia Pushbot
0b24b02dc8
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a1c1f6a82005
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #11954 from wanderview/settings-ignore-network-json
Bug 913035: add network.json to .gitignore - r=me
========
https://hg.mozilla.org/integration/gaia-central/rev/8b2361a04fb1
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 913035: add network.json to .gitignore
2013-09-05 08:45:29 -07:00