Commit Graph

4172 Commits

Author SHA1 Message Date
Tom Tromey
5538d692d3 Bug 1286877 - do not set c-basic-offset for python-mode; r=gps
This removes the unnecessary setting of c-basic-offset from all
python-mode files.

This was automatically generated using

    perl -pi -e 's/; *c-basic-offset: *[0-9]+//'

... on the affected files.

The bulk of these files are moz.build files but there a few others as
well.

MozReview-Commit-ID: 2pPf3DEiZqx

--HG--
extra : rebase_source : 0a7dcac80b924174a2c429b093791148ea6ac204
2016-07-14 10:16:42 -06:00
Andrea Marchesini
8b38059bad Bug 1288057 - Fix 2 conflicts in accesskeys in about:preferences, r=flod 2016-07-20 13:00:17 +02:00
Andrea Marchesini
aa4cf8af1e Bug 1287765 - Add 'learn more' in about:preferences for Containers, r=gijsm r=flod 2016-07-20 11:53:06 +02:00
Carsten "Tomcat" Book
8428cd56e3 merge mozilla-inbound to mozilla-central a=merge 2016-07-20 11:20:15 +02:00
Edouard Oger
0f02a1105e Bug 1287478 - Use proper plural forms for notification of incoming tabs. r=flod,markh
MozReview-Commit-ID: 2l96yrmoluG

--HG--
extra : transplant_source : %82%C1T%DA%E4%0BO%EF%8D%FF%E1v%08%EAz%27%3B%AD%A4%DA
2016-07-18 16:30:52 -07:00
Edouard Oger
b2ac11da02 Bug 1244597 - Show notification on incoming tab. r=markh
MozReview-Commit-ID: BW7irvjVGiv

--HG--
extra : transplant_source : %90%C3R%D2%D1a%18%EA%DFyq%5E%BDY%E4%C8%9B%0El%9A
2016-07-07 13:33:29 -07:00
Carsten "Tomcat" Book
a0992595d6 merge mozilla-inbound to mozilla-central a=merge 2016-07-17 10:08:08 +02:00
Ryan VanderMeulen
48149b87d1 Backed out changesets 48d6706662c0, 53236b4393f2, and 9125083b8dfe (bug 1268912, bug 1244597) for test_clients_engine.js perma-timeouts.
CLOSED TREE

--HG--
extra : amend_source : bfa17aa47bbb5d5e7f51f467fcae24d082b2989f
extra : histedit_source : 4db9a64c9d9704f9aecb65e213e05566d91a5847%2C5b92529a8a7fdff1f8d319c8208f0cb525a716eb
2016-07-15 19:48:14 -04:00
Ryan VanderMeulen
ceff64c9ef Bug 1244597 - Fix quotes to make browser_misused_characters_in_strings.js happy. a=orange 2016-07-15 18:21:20 -04:00
Tooru Fujisawa
a14a6cb845 Bug 1285751 - Use brandShortName in a notification shown after Sync is connected. r=markh 2016-07-16 10:40:05 +09:00
Edouard Oger
9869283a90 Bug 677372 - Send Tab/Page/Link to device. r=markh, a=KWierso
MozReview-Commit-ID: 6xnBjTPkiUQ
MozReview-Commit-ID: D7sdRrsWRCF

--HG--
extra : amend_source : fc1ff45a8b912acd673ee536b00bb3f914a301fb
extra : transplant_source : %27y%AD%91%11u%E27%FA%E5%85%F0Fh%07%F1s%CD%08%BB
extra : histedit_source : cef1a0dca88c5a103fb995246c6e9be568bbf83b%2C8082d5b8b03136b895f50458b119e3d09ab0f974
2016-06-27 16:46:43 -07:00
Edouard Oger
756f163b67 Bug 1244597 - Show notification on incoming tab. r=markh
MozReview-Commit-ID: BW7irvjVGiv

--HG--
extra : transplant_source : %E8%5B%A6%89%EA%E6%01%87%D1%AE%3D%28%7E%0C%1A%14%C4%D8V%FE
2016-07-07 13:33:29 -07:00
Carsten "Tomcat" Book
1f0b20817c Backed out changeset 46231d51ba66 (bug 677372) 2016-07-14 14:12:30 +02:00
Carsten "Tomcat" Book
fb7cf735a1 Backed out changeset 49ef0b8c3cfa (bug 1244597) 2016-07-14 14:12:29 +02:00
Dale Harvey
525856118a Bug 1273351 - Follow up to fix localisation. r=dao 2016-07-14 11:11:37 +01:00
Edouard Oger
0e79663f8d Bug 1244597 - Show notification on incoming tab. r=markh
MozReview-Commit-ID: BW7irvjVGiv

--HG--
extra : transplant_source : %E8%5B%A6%89%EA%E6%01%87%D1%AE%3D%28%7E%0C%1A%14%C4%D8V%FE
2016-07-07 13:33:29 -07:00
Edouard Oger
a1af006e6d Bug 677372 - Send Tab/Page/Link to device. r=markh
MozReview-Commit-ID: 6xnBjTPkiUQ

--HG--
extra : transplant_source : 0P%F2%CD%88%0C%01%F6sO%D7%0E%D8%DDl%3B%B4%9E%F0%C0
2016-06-17 16:44:14 +01:00
djmdev
b1f95dff78 Bug 1249494 - Move networkProxySOCKSRemoteDNS checkbox to clarify when it can be set. r=dolske
MozReview-Commit-ID: EhSDfiXhaxo
2016-07-09 17:56:38 +05:30
Justin Wood
27f34d80f1 Bug 1223385 - use in-tree compare-locales in Makefiles, r=gps
Also fix that the default merge dir in the mach command creates a directory
that's the merge make target, and thus keeps that make target from actually
running.

MozReview-Commit-ID: HWZBPxWuHSy

--HG--
extra : rebase_source : a39157ad9eb99f3eef5d149d003e62a235f92fc1
2016-07-08 11:59:27 -04:00
Justin Wood
3b3a7eeefd Bug 1223385 - Remove unused extract-bookmarks.py. r=Pike
MozReview-Commit-ID: LAOBfvzf3v6

--HG--
extra : rebase_source : 691c9a3f49c8d4950e2349640ebdacaf711bb00d
2016-07-08 08:33:13 -04:00
Michael Kaply
6f2b7722af Bug 1272692 - New Bing icon - remove unnecessary spaces. r=florian DONTBUILD 2016-07-11 12:23:52 -05:00
Michael Kaply
e3ac105909 Bug 1272692 - New Bing icon. r=florian
--HG--
extra : rebase_source : b5458d83087d59e1f2ef041d289cc93c9f9a3c39
extra : amend_source : 86e0d2484d893c92b3e42fded334f02ddc14a11f
2016-07-08 11:27:47 -05:00
Yoshi Huang
e24cc195d9 Bug 1274893 - remove -forbid- list from SafeBrowsing. r=francois 2016-07-11 16:11:32 +08:00
Dale Harvey
45e036dff5 Bug 1273351 - Remove pointerlock permission requirement. r=dao
--HG--
rename : browser/base/content/browser-fullScreen.js => browser/base/content/browser-fullScreenAndPointerLock.js
2016-07-08 13:58:31 +01:00
Rakhi Sharma
48d31f6206 Bug 1269746 - bug 935640 removed only use of some social strings and CSS but not the strings/CSS. r= Gijs.
MozReview-Commit-ID: J7ScUOh5kZI

--HG--
extra : rebase_source : eb481fe4c3a44cd90b378c0e20087e7529f17939
2016-07-06 16:45:47 +05:30
Andrea Marchesini
dbd1a56877 Bug 1279029 - part 2 - removed 'learn more' for Containers, r=gijs 2016-07-19 16:30:06 +02:00
Andrea Marchesini
2e55fe0b18 Bug 1279029 - part 1 - Containers in preferences, r=gijs 2016-07-19 16:29:41 +02:00
Towkir Ahmed
8eff74364d Bug 1279910 - Renamed occurrences of 'Oriya' to 'Odia'. r=gijs 2016-06-27 12:31:00 +02:00
Mark Hammond
367f33f78d Bug 1279224 - remove all Sync promotions from doorhangers. r=adw
MozReview-Commit-ID: 8QELFxqM6Av

--HG--
extra : rebase_source : e76d93d5096e9f820238645a9ac2db658f815718
2016-06-15 13:43:25 +01:00
Tanvi Vyas
699a92d0e0 Bug 1276412 - Fix context menu test that doesn't account for New Container Tab option. r=past 2016-06-14 22:41:33 +01:00
Andrea Marchesini
1bf257e0b3 Bug 1276880 - 'Open link in a new <container_name> Tab' in the context menu, r=gijs 2016-06-12 16:23:10 +02:00
Sebastian Hengst
cfb60054b0 Backed out changeset 20ea7d3d347f (bug 1276880) for failing browser-chrome test browser_referrer_open_link_in_container_tab2.js. r=backout 2016-06-10 18:21:05 +02:00
Carsten "Tomcat" Book
2266139ee3 Merge mozilla-central to mozilla-inbound 2016-06-10 15:44:04 +02:00
Edouard Oger
c1194ab1a9 Bug 1277026 - Disconnect Sync and show a notification on FxA remote disconnect. r=markh
MozReview-Commit-ID: Hxz1j5QDkfM

--HG--
extra : transplant_source : J%82i%FD%AA%3D%E6%13%FB%A0%C8%5EC%8F%85%ADq%9C%B9%C8
2016-06-08 10:40:42 -07:00
Matthew Noorenberghe
e74c05284e Backed out changeset 947617c723cd (bug 1277026)
MozReview-Commit-ID: 6wRsDiaxVp1
2016-06-07 16:10:56 -07:00
Edouard Oger
000c4ca9ce Bug 1277026 - Disconnect Sync and show a notification on FxA remote disconnect. r=markh
MozReview-Commit-ID: Hxz1j5QDkfM

--HG--
extra : rebase_source : 396713694fb50042331715dde2d404e32e659815
2016-06-02 15:22:12 -07:00
Andrea Marchesini
0dc0ba53a2 Bug 1276880 - 'Open link in a new <container_name> Tab' in the context menu, r=gijs 2016-06-10 14:00:23 +02:00
Timothy Guan-tin Chien
8b595135ed Bug 1277747 - Show "Restarting..." label when we restart from about dialog updater, r=mikedeboer
Restart might not happen instantly when the user clicks the restart
button. Ideally we want to provide instant feedback in that case. This
patch will switch the UI to a "Restarting..." label as soon as the user
clicks the restart button.

The button is restored if the restart action is aborted.

MozReview-Commit-ID: BfMVla87FmT

--HG--
extra : transplant_source : X%5B%B9c%02%B6%B1%87z%13%18F%AC%1E.dt%20%F7%93
2016-06-03 14:01:38 +08:00
Edouard Oger
ff3f8876af Bug 1275927 - Replace custom Sync success doorhanger with platform notification. r=markh
MozReview-Commit-ID: 1GJRcB6mnEI

--HG--
extra : rebase_source : 13c5ab4005c99ab96dee15335f87324af571b2a5
2016-06-02 10:36:53 -07:00
Carsten "Tomcat" Book
91c45dd470 Merge mozilla-central to fx-team 2016-06-02 12:00:53 +02:00
Brad Lassey
68359e5cd1 bug 1269998 - Prompt users with pending crash reports to submit them r=mconley ui-r=shorlander 2016-05-10 23:50:55 -07:00
Matthew Noorenberghe
8f89f328e1 Bug 1274712 - Follow-up to also change doNotTrackCheckbox.accesskey. rs=flod,johannh
MozReview-Commit-ID: BVSlJ9qAaJs

--HG--
extra : amend_source : dd58c5ed09a22f70f8537346a8091874604552f9
2016-06-01 00:34:10 -07:00
Edouard Oger
a58b0d4db3 Bug 1275383 - Change the copy of Sync disconnection warning. r=markh
MozReview-Commit-ID: 6WuxnRaYo7X

--HG--
extra : transplant_source : %BD%FE%F8%FD%AA%40%CF%97%B8M%D7%7Fm%9Aq%F9%BEhX%AB
2016-06-01 16:41:31 -07:00
Edouard Oger
e2bf4faffe Bug 1275915 - Replace sync verification panel with platform notification. r=markh
MozReview-Commit-ID: CrGGBplrHPI

--HG--
extra : transplant_source : KE%7B%7D%0C%16%40%1D%5E%B2%A6%257%9F%0B%C8%254%A99
2016-05-31 14:52:11 -07:00
Johann Hofmann
4fcbbc231b Bug 1274712 - Add Tracking Protection info to DNT settings. r=past
MozReview-Commit-ID: GKOedxVsUrG

--HG--
extra : transplant_source : %BB%E42%90%F2J%F1g%0E%0E%DC%86%9D%1B%CDp%14b%5E%D5
2016-05-30 12:37:31 +02:00
Florian Quèze
4117139fd8 Bug 1203168 - follow-up to improve internationalization of the about:searchreset page, rs=flod. 2016-05-30 13:08:27 +02:00
Robert Strong
2e59bf1b5d Bug 1271759 - Don't install on systems that have a CPU that doesn't support SSE2. r=mhowell 2016-05-27 09:15:16 -07:00
Florian Quèze
e9ee2349cc Bug 1203168 - ask the user for confirmation when searching with a default search engine of unknown origin, data-review=bsmedberg, r=adw. 2016-05-27 13:41:29 +02:00
Carsten "Tomcat" Book
b08e506896 Backed out changeset 08053d1e2cc1 (bug 1203168) for ESlint failure in browser_aboutSearchReset.js 2016-05-27 14:35:31 +02:00
Florian Quèze
148acbd4be Bug 1203168 - ask the user for confirmation when searching with a default search engine of unknown origin, data-review=bsmedberg, r=adw. 2016-05-27 13:41:29 +02:00