Commit Graph

5306 Commits

Author SHA1 Message Date
Ed Morley
f2c3dd2277 Merge latest green inbound changeset and mozilla-central 2014-01-06 12:51:38 +00:00
Ehsan Akhgari
86b366517d Merge m-c into fx-team 2014-01-04 12:20:27 -05:00
Ehsan Akhgari
eaa7491d77 Bug 927728 - Part 1: Replace PRUnichar with char16_t; r=roc
This patch was automatically generated by the following script:

#!/bin/bash
# Command to convert PRUnichar to char16_t

function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
       ! -wholename "*security/nss*" \
       ! -wholename "*modules/libmar*" \
       ! -wholename "*/.hg*" \
       ! -wholename "obj-ff-dbg*" \
       ! -name prtypes.h \
       ! -name Char16.h \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.c" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert PRUnichar char16_t
2014-01-04 10:02:17 -05:00
Jared Wein
c9b5bd3d2a Bug 946320 - Followup, remove all logins after disabling sync. r=me
--HG--
extra : rebase_source : 1a0da944bb2cde11e899b78b2421ab87837553d2
2014-01-03 17:28:16 -05:00
Ryan VanderMeulen
29500d1a05 Merge m-c to fx-team. 2014-01-03 15:00:17 -05:00
Jared Wein
6e0c24644b Bug 933926 - [Australis] Hide customization palette during transition phase. r=Unfocused 2014-01-03 14:57:22 -05:00
Jared Wein
fdfb165666 Bug 946320 - [Australis] history widget missing a "Tabs From Other Devices" entry. r=Gijs 2014-01-03 14:57:19 -05:00
Jared Wein
7ce0417292 Bug 934951 - [Australis] Zoom controls percentage label doesn't update when it's in the toolbar and you navigate. r=mconley 2014-01-02 18:02:55 -05:00
Gijs Kruitbosch
9930606f5b Bug 952963 - Australis: areaType getter in widget wrapper shouldn't assume area exists, r=jaws
Fixing commit msg; DONTBUILD, identical to 4bc1cf097ca1
2014-01-02 21:17:58 +00:00
Gijs Kruitbosch
f0f1a3132e Backed out changeset 4bc1cf097ca1 (bug 952963) 2014-01-02 22:10:50 +00:00
Gijs Kruitbosch
2ce882592a Bug 952963 - areaType getter in widget wrapper shouldn't assume area exists, r=jaws
--HG--
extra : rebase_source : adf2bb0d616b9ad92d88854a903f1b9de33661bb
2014-01-02 21:17:58 +00:00
Ryan VanderMeulen
2047150905 Merge m-c to fx-team. 2014-01-02 16:19:21 -05:00
Jared Wein
e3579754fe Bug 940107 - [Australis] Home icon not shown when moved to Bookmarks toolbar, only text. r=mconley
--HG--
extra : rebase_source : 0514eeda6abfc319d6316898a65bcb99c287ff6e
2014-01-02 15:32:09 -05:00
Gavin Sharp
ea64d1c164 Bug 601409: Add a comment to some confusing search.xml code 2014-01-04 16:45:29 -05:00
Henri Sivonen
0a59ad7382 Bug 213517 part 2 - Remove the x-user-def language group. r=jfkthame. 2014-01-02 09:18:20 +02:00
ytx
ab293b2da6 Bug 956151 - Remove the perm attribute in permissions.js. r=dao 2014-01-03 09:32:57 -05:00
Ms2ger
52fa2f5973 Merge inbound to m-c. 2013-12-31 10:19:24 +01:00
Ms2ger
6c7c16c6b2 Bug 950130 - Move more INCLUDES / LOCAL_INCLUDES to moz.build; r=mshal 2013-12-31 10:06:11 +01:00
Phil Ringnalda
c9a9b03eff Bug 952422 - Disable browser_overflow_anchor.js on Linux for excessive timeouts and extremely excessive fallout from them 2013-12-30 19:53:54 -08:00
Tim Taubert
3c761043d1 Bug 952401 - Collect scroll and pageStyle data as soon as the frame tree is available r=smacleod
From 84ca4ca357b94a5dc9449627e88bb4e3cde69557 Mon Sep 17 00:00:00 2001
2013-12-20 11:13:49 +01:00
Wes Kocher
18ed09c2b6 Merge fx-team to m-c 2013-12-20 18:28:28 -08:00
Tim Taubert
c5ecbf72a9 merge m-c to elm 2013-12-20 15:05:28 +01:00
Wes Kocher
1604d77962 Merge fx-team to m-c 2013-12-19 19:09:04 -08:00
Tim Taubert
6f4002d450 merge m-c to elm 2013-12-19 15:52:32 +01:00
Mark Hammond
c8e0341c3c Have the sync setup dialog do the right thing if identity.fxaccounts.enabled=true 2013-12-19 16:38:35 +11:00
Ryan VanderMeulen
d1e170e512 Merge fx-team to m-c. 2013-12-18 21:19:33 -05:00
Tim Taubert
9f685f4d29 Bug 951857 - Bring back UI entry points and the setup dialog for old sync r=markh
From 046c19dae155a175cf6fa5e480f1fa1882f7d51f Mon Sep 17 00:00:00 2001
2013-12-18 23:10:11 +01:00
Tim Taubert
46e29d4462 merge m-c to elm 2013-12-18 17:54:23 +01:00
Phil Ringnalda
a4ed7a6042 Back out fc79fa2fd2e3 (bug 941002) for Win8 browser_880382_drag_wide_widgets_in_panel.js bustage
CLOSED TREE
2013-12-17 23:12:09 -08:00
Wes Kocher
171c7a07cb Merge m-c to fx-team 2013-12-17 21:21:30 -08:00
Wes Kocher
e365f41e60 merge inbound to m-c 2013-12-17 21:00:02 -08:00
Tetsuharu OHZEKI
bd9834a7ac Bug 881436 - [Australis] Add History Sidebar toggle item to History widget panel. r=jaws DONTBUILD 2013-12-17 22:12:13 -05:00
Jared Wein
f01fc19efa Backed out changeset 8d77e66558eb (bug 881436) for not including [Australis] in the commit message. 2013-12-17 22:20:26 -05:00
Tetsuharu OHZEKI
fc89f378c9 Bug 881436 - Add History Sidebar toggle item to History widget panel. r=jaws
--HG--
extra : rebase_source : a6b7b7e2cf689c35b2a18e705cc232efa86eeac4
2013-12-17 22:12:13 -05:00
Jared Wein
21ed44fb9c Bug 941002 - [Australis] Add Developer Tools button to menu default set. r=Unfocused 2013-12-17 21:11:59 -05:00
Jared Wein
faaab61909 Bug 941568 - [Australis] History subview shows no URLs/addresses in the tooltips. r=Unfocused 2013-12-17 21:11:57 -05:00
Ryan VanderMeulen
f1871d37dd Bug 945667 - Disable browser_google_behavior.js on Linux due to relying on browser_aboutHome.js. 2013-12-17 20:01:58 -05:00
Nick Alexander
bd12407b3a Merge m-c to elm 2013-12-17 13:31:03 -08:00
Ryan VanderMeulen
b9ea898a47 Merge m-c to fx-team. 2013-12-17 16:23:55 -05:00
Justin Dolske
76814b4c2f Bug 951364 - [Australis] button context menu should offer to "move", not "add". r=jaws 2013-12-17 13:21:37 -08:00
Jared Wein
a013500ed1 Bug 885052 - [Australis] Fullscreen-button is checked during customization mode if the browser is in fullscreen. r=Unfocused 2013-12-16 23:20:13 -05:00
Jared Wein
32e7a01ddf Bug 950014 - [Australis] Ctrl-K no longer goes to home page of default search engine (when search toolbar hidden). r=mconley,gijs
--HG--
extra : rebase_source : 011ff25a2a6ed81e93c45f041ead35d5cf2be82b
2013-12-17 13:45:00 -05:00
Carsten "Tomcat" Book
45ff41b74f Backed out changeset af77b8d3a9e1 (bug 885052) for b-c testfailures on a CLOSED TREE 2013-12-17 09:12:44 +01:00
Jared Wein
c54daea4b4 Bug 885052 - Fullscreen-button is checked during customization mode if the browser is in fullscreen. r=Unfocused 2013-12-16 23:20:13 -05:00
Jared Wein
037773c308 Backed out changeset 663470a9a54b (bug 885052) 2013-12-17 00:45:00 -05:00
Shane Caraveo
862d9885b4 bug 935640 part 1 Australis, update social sidebar with new ux, r=markh 2013-12-16 21:37:30 -08:00
Shane Caraveo
47254b9a46 bug 914921 make status button work in Australis menu panel, r=markh 2013-12-16 21:21:17 -08:00
Jared Wein
602778da29 Bug 885052 - Fullscreen-button is checked during customization mode if the browser is in fullscreen. r=Unfocused 2013-12-16 23:20:13 -05:00
Nick Alexander
16a571629c Merge m-c to elm 2013-12-16 09:13:10 -08:00
Steven MacLeod
227b183c61 Bug 546169 - Use an event listener instead of a timeout to avoid intermittent failures. r=gavin 2013-12-15 14:05:53 -05:00