Commit Graph

21568 Commits

Author SHA1 Message Date
Phil Ringnalda
afb1afe7e4 Backed out 2 changesets (bug 1070778, bug 1073846) for bc1 bustage
Backed out changeset c5f1d81d3849 (bug 1070778)
Backed out changeset b327a052e47f (bug 1073846)

--HG--
extra : rebase_source : 49d62043ba91398f370997868bba693ccc6d8251
2014-09-29 20:34:54 -07:00
Blair McBride
b329a5bcbb Bug 1070778 - Selecting a moz-action: result then typing more can result in "Search X for moz-action:..." item. r=mak
--HG--
extra : transplant_source : P/b%9D%B6T%85%22%A8%1B%F0%18%3A%827%C2qx%F6%97
2014-09-30 13:56:06 +13:00
Blair McBride
858d40f71b Bug 1073846 - Wrong URL loads after autofill of a hostname that matches a search engine. r=mak
--HG--
extra : transplant_source : %D3%25%3F%83R%B7%81%DF%13nZ%1CH%D8B%B10%99%B4%B2
2014-09-30 11:16:48 +13:00
Ryan VanderMeulen
ca7eb1e9fb Merge m-c to fx-team. a=merge 2014-09-29 16:09:22 -04:00
Ryan VanderMeulen
d209ce9389 Merge fx-team to m-c. a=merge 2014-09-29 15:06:48 -04:00
Ed Morley
ad0103637b Backed out changeset 49b1465d3e5e (bug 1044020) for compilation failures 2014-09-29 15:41:54 +01:00
Carsten "Tomcat" Book
b8dfb0bd0b Merge m-c to fx-team 2014-09-29 16:19:41 +02:00
Carsten "Tomcat" Book
04f390a404 merge mozilla-inbound to mozilla-central a=merge 2014-09-29 15:42:55 +02:00
Brian R. Bondy
d0465e893d Bug 958554 - Fix about window sometimes saying nightly is being updatd by another instance. r=rstrong
Note that if the process is hung, or there is another instance running in a  different user instance,
or another profile is running, the message is perfectly normal.  But this should prevent the bad case
of getting this message.

This handling was first added specifically for Metro and Firefox running the same intallation at the
same time.  Metro isn't being released but there are still other very valid reasons for having this
handling as noted above.
2014-09-28 21:26:34 -04:00
Mike Quested
f0ea4a8120 Bug 1056035 - Hide the separator if there are no visible items above it. r=Unfocused 2014-09-29 05:01:00 -04:00
Irving Reid
1a750a0d61 Bug 1059674 - use AsynchShutdown.blocker() for AddonManager provider shutdown; r=unfocused 2014-09-27 16:25:47 -04:00
Carsten "Tomcat" Book
6906d1ae0f Merge m-c to mozilla-inbound 2014-09-29 16:10:39 +02:00
Henri Sivonen
1ebfa4ad7b Bug 964225 - Remove the GBK decoder class and remove GB2312 as a Gecko-canonical encoding. r=emk. 2014-09-26 15:12:02 +03:00
David Rajchenbach-Teller
42346ce81a Bug 1044020 - Add the duration of shutdown phases to Telemetry. r=froydnj 2014-09-25 17:19:34 +02:00
Iaroslav Sheptykin
d5c0411061 Bug 1031298 - Add a histogram for counting unrecoverable sessions. r=yoric 2014-09-25 13:39:00 -04:00
Blair McBride
db53b53c1c Backout 262b6ad34702 (bug 1070778) due to bc1 failures. r=backout 2014-09-30 02:38:29 +13:00
Florian Quèze
7938d388b2 Bug 1067367 - tapping the icon of a second doorhanger reopens the first doorhanger if it was already open, r=Enn. 2014-09-29 15:33:34 +02:00
Blair McBride
19fd3187ae Bug 1070778 - Selecting a moz-action: result then typing more can result in "Search X for moz-action:..." item. r=mak
--HG--
extra : transplant_source : %2C%E3F%B4%B9%A9%3A%AD1s%1C%E3Y%C1S%DC%A1%99%DF%C2
2014-09-30 01:49:52 +13:00
Alex Bardas
eb67e9eaca Bug 1071164 - Display magnifying glass for search results in awesomebar (follow-up of bug 1040725). r=Unfocused 2014-09-27 16:58:00 +02:00
Georg Fritzsche
7bf3afe79c Bug 1069873 - Add counter histogram type. r=froydnj 2014-09-26 17:45:33 +02:00
Tim Taubert
f50879194c Backed out changeset c9ef2c9434b5 (bug 1071164) 2014-09-29 02:21:49 -07:00
Alex Bardas
9bd668bd8a Bug 1071164 - Display magnifying glass for search results in awesomebar (follow-up of bug 1040725). r=Unfocused 2014-09-27 16:58:00 +02:00
J. Ryan Stinnett
c9105d54de Bug 1073522 - Better error when front has no actor. r=dcamp 2014-09-26 09:35:00 +02:00
Georg Fritzsche
6f7d27254c Bug 1070036 - Catch NS_ERROR_NOT_AVAILABLE during OpenH264Provider startup. r=irving 2014-09-24 17:38:50 +02:00
Tomasz Kołodziejski
7f84ec05f4 Bug 1070923 - Fix intermittent test_bug451286.xul by waiting for the highlight toggle to finish. r=mikedeboer
--HG--
extra : rebase_source : 109dcc17a75333f1715e48432893e216e73838fc
2014-09-26 10:49:00 -04:00
Nick Alexander
31a82e2d6c Bug 1064177 - Part 1: Add RestrictedProfiles.DISALLOW_MODIFY_ACCOUNTS. r=wesj
This corresponds to UserManager.DISALLOW_MODIFY_ACCOUNTS.

--HG--
extra : rebase_source : 9a337cf2cb7c3cf6d8ae4c9b9c7a41138651410f
2014-09-26 11:44:55 -07:00
Sudheesh Singanamalla
6291f6cdb0 Bug 1054492: move DirectoryLinksProvider.jsm to browser/ since it's Firefox-specific, r=gavin
--HG--
rename : toolkit/modules/DirectoryLinksProvider.jsm => browser/modules/DirectoryLinksProvider.jsm
rename : toolkit/modules/tests/xpcshell/test_DirectoryLinksProvider.js => browser/modules/test/xpcshell/test_DirectoryLinksProvider.js
2014-09-22 13:23:19 +05:30
Robert Strong
e206e1d442 Mac v2 signing - Bug 1072722 - With older clients the new maintenance service checks the updated directory's updater.exe when verifying the updater.exe for replace requests. r=spohl 2014-09-29 11:53:07 -07:00
Robert Strong
256850ee9c Mac v2 signing - Bug 1072554 - Remove update directories when running xpcshell tests. r=spohl 2014-09-29 11:52:59 -07:00
Robert Strong
d23dd0c344 Mac v2 signing - Bug 1071465 - old precomplete file is not removed on update. r=spohl 2014-09-29 11:52:48 -07:00
Robert Strong
53ad52e471 Mac v2 signing - Bug 1071134 - Fix command line help for updater. r=spohl 2014-09-29 11:52:44 -07:00
Robert Strong
f18e3ae057 Mac v2 signing - Temporary workaround for Bug 1070148 - Copy maintenance service binary into its install directory when the installed binary is different. r=bbondy 2014-09-29 11:52:32 -07:00
Robert Strong
9c32d082f1 Mac v2 signing - Bug 1070661 - Error setting access/modification time on application bundle. r=spohl 2014-09-29 11:52:21 -07:00
Robert Strong
3715196e39 Mac v2 signing - Bug 1068439 - Move the distribution directory from Content/MacOS to Contents/Resources on app update due to v2 signing requirements. r=spohl 2014-09-29 11:52:18 -07:00
Robert Strong
d61019a5de Mac v2 signing - Bug 1058182 - Fix app update xpcshell tests due to the Mac v2 bundle structure. r=bbondy 2014-09-29 11:52:14 -07:00
Robert Strong
cddf6a2d9d Mac v2 signing - Bug 1064523 - Create staging directory outside of the Mac bundle. r=bbondy 2014-09-29 11:52:08 -07:00
Robert Strong
19489bfb24 Mac v2 signing - Bug 1059567 - Packaging changes for the move of removed-files file from Contents/MacOS to Contents/Resources. r=bbondy, r=nthomas
--HG--
rename : tools/update-packaging/test/from-mac/Contents/MacOS/application.ini => tools/update-packaging/test/from-mac/Contents/Resources/application.ini
rename : tools/update-packaging/test/from-mac/Contents/MacOS/distribution/extensions/diff/diff-patch-larger-than-file.txt => tools/update-packaging/test/from-mac/Contents/Resources/distribution/extensions/diff/diff-patch-larger-than-file.txt
rename : tools/update-packaging/test/from-mac/Contents/MacOS/extensions/diff/diff-patch-larger-than-file.txt => tools/update-packaging/test/from-mac/Contents/Resources/extensions/diff/diff-patch-larger-than-file.txt
rename : tools/update-packaging/test/from-mac/Contents/MacOS/readme.txt => tools/update-packaging/test/from-mac/Contents/Resources/readme.txt
rename : tools/update-packaging/test/from-mac/Contents/MacOS/removed.txt => tools/update-packaging/test/from-mac/Contents/Resources/removed.txt
rename : tools/update-packaging/test/from-mac/Contents/MacOS/same.txt => tools/update-packaging/test/from-mac/Contents/Resources/same.txt
rename : tools/update-packaging/test/from-mac/Contents/MacOS/searchplugins/diff/diff-patch-larger-than-file.txt => tools/update-packaging/test/from-mac/Contents/Resources/searchplugins/diff/diff-patch-larger-than-file.txt
rename : tools/update-packaging/test/from-mac/Contents/MacOS/update-settings.ini => tools/update-packaging/test/from-mac/Contents/Resources/update-settings.ini
rename : tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/channel-prefs.js => tools/update-packaging/test/from-mac/Contents/Resources/{foodir/channel-prefs.js
rename : tools/update-packaging/test/from-mac/Contents/MacOS/{foodir/force.txt => tools/update-packaging/test/from-mac/Contents/Resources/{foodir/force.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/application.ini => tools/update-packaging/test/to-mac/Contents/Resources/application.ini
rename : tools/update-packaging/test/to-mac/Contents/MacOS/distribution/extensions/added/file.txt => tools/update-packaging/test/to-mac/Contents/Resources/distribution/extensions/added/file.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/distribution/extensions/diff/diff-patch-larger-than-file.txt => tools/update-packaging/test/to-mac/Contents/Resources/distribution/extensions/diff/diff-patch-larger-than-file.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/extensions/added/file.txt => tools/update-packaging/test/to-mac/Contents/Resources/extensions/added/file.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/extensions/diff/diff-patch-larger-than-file.txt => tools/update-packaging/test/to-mac/Contents/Resources/extensions/diff/diff-patch-larger-than-file.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/readme.txt => tools/update-packaging/test/to-mac/Contents/Resources/readme.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/removed-files => tools/update-packaging/test/to-mac/Contents/Resources/removed-files
rename : tools/update-packaging/test/to-mac/Contents/MacOS/same.txt => tools/update-packaging/test/to-mac/Contents/Resources/same.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/searchplugins/added/file.txt => tools/update-packaging/test/to-mac/Contents/Resources/searchplugins/added/file.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/searchplugins/diff/diff-patch-larger-than-file.txt => tools/update-packaging/test/to-mac/Contents/Resources/searchplugins/diff/diff-patch-larger-than-file.txt
rename : tools/update-packaging/test/to-mac/Contents/MacOS/update-settings.ini => tools/update-packaging/test/to-mac/Contents/Resources/update-settings.ini
rename : tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/channel-prefs.js => tools/update-packaging/test/to-mac/Contents/Resources/{foodir/channel-prefs.js
rename : tools/update-packaging/test/to-mac/Contents/MacOS/{foodir/force.txt => tools/update-packaging/test/to-mac/Contents/Resources/{foodir/force.txt
2014-09-29 11:52:04 -07:00
Robert Strong
240ce21733 Mac v2 signing - Bug 1059467 - Move precomplete file from the root of the Mac bundle to Contents/Resources. r=bbondy, r=nthomas
--HG--
rename : tools/update-packaging/test/from-mac/precomplete => tools/update-packaging/test/from-mac/Contents/Resources/precomplete
rename : tools/update-packaging/test/to-mac/precomplete => tools/update-packaging/test/to-mac/Contents/Resources/precomplete
2014-09-29 11:51:55 -07:00
Steven Michaud
25e007d56d Mac v2 signing - Bug 1047738 - Make distribution code look for the distribution directory under Contents/Resources due to v2 signing requirements. r=bsmedberg 2014-09-29 11:51:51 -07:00
Stephen Pohl
5781264d40 Mac v2 signing - Bug 1064910 - Update Webapp Runtime to work with the new v2 bundle structure of Firefox on OSX. r=myk 2014-09-29 11:51:43 -07:00
Stephen Pohl
d16e3504d5 Mac v2 signing - Bug 1060562 - Update xpcshell-tests for the new v2 bundle structure on OSX. r=jmaher 2014-09-29 11:51:29 -07:00
Stephen Pohl
953f3dd157 Mac v2 signing - Bug 1055774 - Update lookup for crashreporter.ini for the new v2 bundle structure on OSX. r=bsmedberg 2014-09-29 11:51:13 -07:00
Stephen Pohl
00e9cf9ba0 Mac v2 signing - Bug 1046924 - Move updates directory out of the .app bundle. r=rstrong 2014-09-29 11:51:08 -07:00
Stephen Pohl
dca2016258 Mac v2 signing - Bug 1050944 - Get Firefox to launch and run on OSX with the new .app bundle structure, made necessary by Apple's v2 signatures. r=smichaud, r=ted, sr=bsmedberg 2014-09-29 11:51:04 -07:00
Stephen Pohl
03bdc411e4 Mac v2 signing - Bug 1047584 - Modify the .app file structure to allow for OSX v2 signing. r=bsmedberg 2014-09-29 11:50:56 -07:00
Stephen Pohl
9ddba86a83 Mac v2 signing - Bug 1047584 - Enable DMG v2 signing. r=bhearsum 2014-09-29 11:50:52 -07:00
Tim Taubert
52bfe61f91 Bug 1072198 - updateBrowserRemoteness() needs to keep .permanentKey when updating browsers r=billm 2014-09-24 12:19:46 +02:00
Blair McBride
7f485beb93 Bug 1067899 - Add autocomplete result type for arbitrary URLs. r=mak
--HG--
extra : transplant_source : %B4%5C%83%26%B0%3EL%F1%B0%0E%B4%822y%E5%8B%0B%A4%01%3D
2014-09-27 01:17:25 +12:00
Blair McBride
5544fa5570 Bug 1073358 - Sqlite.jsm should return some measure of what happened regardless of whether a row handler was used. r=mak
--HG--
extra : transplant_source : %09%E7%2B%D3%9F%93Qzw%C4IL%EC%23g%B9o%DB%0D%DE
2014-09-27 01:17:00 +12:00
Carsten "Tomcat" Book
7bcab5f21e merge fx-team to mozilla-central a=merge 2014-09-26 13:27:36 +02:00