Carsten "Tomcat" Book
3e11f2fe34
merge mozilla-inbound to mozilla-central a=merge
2015-11-04 11:59:46 +01:00
David Critchley
fd0911db0b
Bug 1215487 - Fix Mozilla logo in Chrome for Loop Standalone [r=Mardak]
2015-11-03 14:29:55 -08:00
Carsten "Tomcat" Book
edda9042a5
Merge mozilla-central to fx-team
2015-11-03 12:13:10 +01:00
Carsten "Tomcat" Book
8232c46c4f
merge mozilla-inbound to mozilla-central a=merge
2015-11-03 12:00:30 +01:00
Ralph Giles
87aab4c5c3
Bug 1219530 - Add MOZ_RUST_MP4PARSE feature switch. r=glandium
...
Add a switch to enable the rust mp4parser code through confvars.sh
and set this for browser targets. Configure will only pass this
through as a CPP define if the rust toolchain is available.
The MOZ_RUST check is hoisted to an outer conditional to
make it cleaner to add other features.
Thanks to zhoubcfan@163.com for the typo fix in configure.in.
2015-11-02 16:40:00 -08:00
Wes Kocher
902cea2b9a
Merge m-c to fx-team, a=merge
...
--HG--
extra : commitid : 9dyZ3yocWTJ
2015-11-02 15:59:07 -08:00
Wes Kocher
3696443a14
Merge inbound to m-c a=merge
...
--HG--
extra : commitid : Iy93sktRpdv
2015-11-02 15:12:16 -08:00
Matthew Noorenberghe
01ef877e80
Bug 1220884 - Friendlier string for the notification upgrade UI. r=kitcambridge
...
--HG--
extra : commitid : JK4ut7t32GU
2015-11-02 15:16:15 -08:00
Kit Cambridge
759a7eadce
Bug 1220527 - Wait for the first window before showing the upgraded notifications alert. r=MattN
...
--HG--
extra : commitid : DDBFmrJtj1O
2015-11-02 14:59:52 -08:00
Chris Rafuse
3249757e08
Bug 1213906-Change email invitation to fit new user journey, r=dmose
2015-11-02 14:09:39 -08:00
Carsten "Tomcat" Book
7a70d4ebe3
Merge mozilla-central to fx-team
2015-11-02 12:05:19 +01:00
Carsten "Tomcat" Book
c544f0d430
merge mozilla-inbound to mozilla-central a=merge
2015-11-02 11:54:07 +01:00
Kit Cambridge
3889d78409
Bug 1219832
- Use "send" instead of "receive" in notification preferences. r=MattN
...
--HG--
extra : commitid : E2D3YWpHPq8
2015-11-01 17:15:23 -08:00
Matthew Noorenberghe
eaebce9463
Bug 1216271 - Follow-up to add L10N notes and fix style to use an early return. r=me
...
--HG--
extra : commitid : 4zmXYvp642p
2015-11-01 17:11:23 -08:00
Phil Ringnalda
dd60c5be0a
Merge f-t to m-c, a=merge
2015-10-31 17:02:44 -07:00
Phil Ringnalda
44a0ec6788
Merge m-i to m-c
2015-10-31 16:57:05 -07:00
Phil Ringnalda
ee133293f5
Bug 1217332 - disable browser_syncui.js on OS X debug for a completely ridiculous assertion failure rate, a=toporange
2015-10-31 16:41:41 -07:00
Wes Kocher
f366d6cb63
Merge m-c to fx-team, a=merge
...
--HG--
extra : commitid : Gg8WWdYJLXL
2015-10-30 17:00:16 -07:00
Wes Kocher
d31ed2617b
Merge inbound to central, a=merge
...
--HG--
extra : commitid : GwjoFY5dx7Q
2015-10-30 16:35:46 -07:00
Alexandre Poirot
4a89db3430
Bug 1216979 - Add ACCEL+ALT+R key binding to reload WebIDE. r=jryans
2015-11-02 08:18:58 -08:00
Alexandre Poirot
10650ce81a
Bug 1216590 - Merge last bits of app-manager into WebIDE. r=jryans
...
--HG--
rename : devtools/client/app-manager/app-projects.js => devtools/client/webide/modules/app-projects.js
rename : devtools/client/app-manager/app-validator.js => devtools/client/webide/modules/app-validator.js
rename : devtools/client/app-manager/test/test_app_validator.html => devtools/client/webide/test/test_app_validator.html
rename : devtools/client/app-manager/test/validator/no-name-or-icon/home.html => devtools/client/webide/test/validator/no-name-or-icon/home.html
rename : devtools/client/app-manager/test/validator/no-name-or-icon/manifest.webapp => devtools/client/webide/test/validator/no-name-or-icon/manifest.webapp
rename : devtools/client/app-manager/test/validator/non-absolute-path/manifest.webapp => devtools/client/webide/test/validator/non-absolute-path/manifest.webapp
rename : devtools/client/app-manager/test/validator/valid/alsoValid/manifest.webapp => devtools/client/webide/test/validator/valid/alsoValid/manifest.webapp
rename : devtools/client/app-manager/test/validator/valid/home.html => devtools/client/webide/test/validator/valid/home.html
rename : devtools/client/app-manager/test/validator/valid/icon.png => devtools/client/webide/test/validator/valid/icon.png
rename : devtools/client/app-manager/test/validator/valid/manifest.webapp => devtools/client/webide/test/validator/valid/manifest.webapp
rename : devtools/client/app-manager/test/validator/wrong-launch-path/icon.png => devtools/client/webide/test/validator/wrong-launch-path/icon.png
rename : devtools/client/app-manager/test/validator/wrong-launch-path/manifest.webapp => devtools/client/webide/test/validator/wrong-launch-path/manifest.webapp
rename : devtools/client/themes/app-manager/images/default-app-icon.png => devtools/client/webide/themes/default-app-icon.png
rename : devtools/client/themes/app-manager/images/noise.png => devtools/client/webide/themes/noise.png
rename : devtools/client/themes/app-manager/images/rocket.svg => devtools/client/webide/themes/rocket.svg
2015-11-02 08:18:58 -08:00
David Critchley
40edfd42a3
Bug 1219740 - Add Beta Ribbon back in to Hello, r=dmose
2015-10-30 12:25:51 -07:00
David Critchley
86c3cc806e
Bug 1214590 - Remove Loop default Room name, r=dmose
2015-10-30 11:48:22 -07:00
Patrick Brosset
914dc333d8
Bug 1211801 - Add a playback rate selector to the animation panel. r=miker
2015-11-02 12:54:07 +01:00
Paolo Amadini
5924d46107
Bug 1216699 - Add Learn More link to Insecure Password Warning in Control Center. r=bgrins
...
--HG--
extra : commitid : KNjyMETahMC
extra : rebase_source : f0498fe7a4a85731350172935252bb414b7503a8
2015-10-30 14:36:13 +00:00
Chris Rafuse
3ac351d73a
Bug 1215593 - Relayout the room title and context tile in text chat. r=Standard8
2015-10-30 14:43:58 +00:00
Mark Banner
d2ba20bd59
Backout bug 1210865 / changeset dcd113d0102e due to apparent bustage of Loop's setup system for data channels.
2015-10-30 14:43:49 +00:00
Brian Grinstead
8e05c079ec
Bug 1220781 - Hide the exception button, not advanced section for badStsCert or cert errors in frames;r=MattN
...
--HG--
extra : commitid : 3YNVoTpu5z2
2015-11-02 16:09:16 -08:00
Tooru Fujisawa
da0d85ff8c
Bug 1219837 - Part 2: Remove use of expression closure from browser/. r=ttaubert
...
--HG--
extra : commitid : I3YNU2vV2le
extra : rebase_source : e3b02ee43f956ea80e0f298c4507052811176601
extra : amend_source : 31230481a90a30ffc7f991ec2ec2454860e85ecb
2015-10-30 02:48:18 +09:00
Gijs Kruitbosch
fbf89fb02e
Bug 120684 - use ChromeNodeList in toolkit's listboxes' selectedItems implementation, r=dao,smaug
...
--HG--
extra : commitid : DzQPAIbbhpX
extra : rebase_source : 4bd9ac283e1c789c2577dc5d4cc85511f35ac27d
2015-10-26 17:25:29 +01:00
Matt Howell
501c275eec
Bug 1205843 - Part 2: Disable maintenance service on WinXP < SP3 - r=rstrong
...
Attempt to get around the fact that XP SP2 (and below) systems won't be able to
handle Authenticode signatues with SHA-2 digests by disabling the maintenance
service, the only thing on our update path that uses Authenticode, on systems
running WinXP below SP3.
This patch both prevents the service from being included in new installations,
and prevents the service from being used where it is already installed.
--HG--
extra : transplant_source : %F7%BE%0B%FDYd%CF%24%E7%B2%A5l%40%8D%E5%81%88F%E4%07
2015-10-27 14:31:34 -07:00
Gijs Kruitbosch
1650e4eeec
Bug 1025568 - fix contextmenu actions across page loads, r=MattN
...
--HG--
extra : commitid : HWHeooHCAH
extra : rebase_source : 7654e7a347e0c00cd572e7f1fc0b352039cf8450
2015-10-23 12:48:59 +01:00
Wes Kocher
59aa271131
Merge m-c to inbound, a=merge
...
--HG--
rename : webapprt/application.ini.in => webapprt/webapprt.ini
extra : commitid : BR0bpNo1yny
2015-10-30 16:57:55 -07:00
Phil Ringnalda
bdf1feba1c
Back out changeset ce56b70293c6 (bug 1219530) for build bustage
...
CLOSED TREE
2015-11-02 19:07:11 -08:00
Ralph Giles
050e04d240
Bug 1219530 - Add MOZ_RUST_MP4PARSE feature switch. r=glandium
...
Add a switch to enable the rust mp4parser code through confvars.sh
and set this for browser targets. Configure will only pass this
through as a CPP define if the rust toolchain is available.
The MOZ_RUST check it hoisted to an ourter conditional to
make it easier to add other features.
2015-11-02 16:40:00 -08:00
Mike Hommey
b36da4bf89
Bug 1186748 - Switch ASan builds to Gtk+3. r=mshal
2015-11-04 11:21:49 +09:00
Jason Orendorff
1a625d9f04
Bug 1216623 - Part 1: Rename some loop variables to avoid conflicts with ES6 scoping rules. r=fitzgen, r=ttaubert, r=MattN, r=gps.
...
--HG--
extra : commitid : 3eLC5U91GM8
extra : rebase_source : 0933f07c19c0ba87fc34ddd9beaff4bb89e7c690
extra : amend_source : 76fa887d541bfd9f6592b6a6113d76b4df82dea0
2015-10-26 16:33:59 -05:00
Tanvi Vyas
a6b6733208
Bug 1220322 - Change the link pointed to by the one-time notification on upgrade for Push Notifications. r=markh, MattN
2015-11-01 19:17:54 -08:00
Phil Ringnalda
0a814fd133
Back out changeset 7ff25645a058 (bug 1210410) for browser_SearchProvider.js timeouts on Windows
2015-10-29 21:04:10 -07:00
Wes Kocher
78fcbfb1ce
Merge m-c to inbound, a=merge
...
--HG--
extra : commitid : 5VPid7mV1Uk
2015-10-29 17:16:32 -07:00
Wes Kocher
f989cf27b4
Merge inbound to central, a=merge
...
--HG--
extra : commitid : B2ufrhKlXRr
2015-10-29 17:12:28 -07:00
Wes Kocher
76452b103c
Merge m-c to fx-team, a=merge CLOSED TREE
...
--HG--
extra : commitid : 7i8epxLlM7z
2015-10-29 15:30:24 -07:00
Wes Kocher
bfd6026b6d
Merge m-c to inbound a=merge CLOSED TREE
...
--HG--
extra : commitid : Esl8WMdNkIt
2015-10-29 15:29:24 -07:00
Masatoshi Kimura
c8bb52488d
Backed out changeset 6b3c99e54177 (Bug 1219088) and 72cfa6eac21f (bug 1219109) for premature string change DONTBUILD CLOSED TREE
2015-10-30 00:45:05 +09:00
Masatoshi Kimura
c75a03c5a9
Bug 1219088 - String changes for RC4 override infobar. r=ttaubert
2015-10-29 20:44:29 +09:00
Masatoshi Kimura
4f44b4ffa5
Bug 1219109 - Strings for non-overridable errors. r=ttaubert
2015-10-29 20:44:29 +09:00
Carsten "Tomcat" Book
535f267585
Merge mozilla-central to mozilla-inbound
2015-10-29 12:15:05 +01:00
Carsten "Tomcat" Book
c56010f3c1
Merge mozilla-central to fx-team
2015-10-29 12:13:20 +01:00
Carsten "Tomcat" Book
55a9d343e5
Backed out changeset cad376d2e71f (bug 1218908) for blocking m-c to fx-team merge with a conflict
2015-10-29 12:12:42 +01:00
Brian Grinstead
2981471089
Bug 1207107 - Strings for aboutCertError design update;r=dao
2015-10-29 13:08:09 +02:00