Граф коммитов

10189 Коммитов

Автор SHA1 Сообщение Дата
Craig Cook a6f823ed0a [fix bug 1365339] Remove Sylvie Veilleux from leadership page
[fix bug 1341764] Update David Slater’s bio
2017-05-17 11:10:40 -07:00
Paul McLanahan 3dbc4dcfbc Merge pull request #4815 from kyoshino/bug-1359037-nightly-notes-feed
Fix Bug 1359037 - Provide some syndication feature to Nightly release notes
2017-05-17 13:53:17 -04:00
Craig Cook 9a672effc1 Merge pull request #4841 from alexgibson/bug-1363913-fix-decentralization-link
[fix bug 1363913] Fix broken link on decentralization page
2017-05-17 10:37:58 -07:00
Josh Mize 9d243bb8b5 Merge pull request #4831 from pmac/remove-app-name-suffix
Remove app name suffix from deployment
2017-05-17 10:38:28 -05:00
Alex Gibson 55fc4980db Merge pull request #4840 from craigcook/bug-1363955-zilla-slab-italic
[fix bug 1363955] Switch Pebbles to Zilla Slab
2017-05-17 16:20:13 +01:00
Craig Cook 99e05246d4 [fix bug 1363955] Switch Pebbles to Zilla Slab
Add Zilla Slab italics.
Remove Open Sans italics.
Set Zilla Slab as the primary font.
Use Open Sans as an accent.
2017-05-17 07:08:07 -07:00
Jon Petto 4e03d1b8d5 Merge pull request #4832 from jpetto/bug-1361181-redirect-firefox-products-to-firefox-en-us
[fix bug 1361181] Redirect en-US/firefox/products/ to /firefox/
2017-05-17 08:10:33 -05:00
alexgibson 651eed91b2 [fix bug 1363913] Fix broken link on decentralization page 2017-05-17 10:07:20 +01:00
Alex Gibson d8ecee2595 Merge pull request #4834 from alexgibson/bug-1363802-batm-ad-campaign
[fix bug 1363802] /new variation to support ad campaign - BATM
2017-05-16 19:46:01 +01:00
alexgibson 4beabe41c5 [fix bug 1364988] Batm page variations 2017-05-16 18:27:42 +01:00
Jon Petto 855848fd21 [fix bug 1361181] Redirect en-US/firefox/products/ to /firefox/
- Also removes /firefox/products/?v=b (from bug 1348146)
2017-05-16 09:56:15 -05:00
Alex Gibson cdc0fc50d0 Merge pull request #4835 from pmac/fix-google-sitelinks-1364452
Fix bug 1364452: Add ability to specify alternate canonical paths per locale
2017-05-15 16:31:24 +01:00
alexgibson d91a98f487 [fix bug 1363802] /new variation to support ad campaign - BATM 2017-05-15 16:22:09 +01:00
Paul McLanahan 791c5fdcf9 Fix firefox features redirects to include locale 2017-05-15 11:05:38 -04:00
Paul McLanahan ce48a15848 Fix bug 1364452: Add ability to specify alternate canonical paths per locale 2017-05-12 14:46:27 -04:00
Paul McLanahan d88b140b90 Remove old demo config file 2017-05-12 11:48:18 -04:00
Paul McLanahan fe3457a7b1 Move testing success message to a single one at the end 2017-05-12 11:47:31 -04:00
Paul McLanahan f3c79c3531 Switch deployment to use dockerized envcat 2017-05-12 10:35:24 -04:00
Alex Gibson b3ac7dd636 Merge pull request #4828 from april/master
Update the web bug bounty Hall of Fame to have q1 2017
2017-05-12 11:49:41 +01:00
Alex Gibson ed157f92f6 Merge pull request #4833 from kyoshino/bug-1311121-notes-equivalent-url
Fix Bug 1311121 - Links to past Firefox for Android release notes all point to current version
2017-05-12 11:41:09 +01:00
Kohei Yoshino 21d27ed2e1 Fix Bug 1311121 - Links to past Firefox for Android release notes all point to current version 2017-05-12 00:07:44 -04:00
Paul McLanahan d966001f65 Remove app name suffix from deployment
Was only needed for the "-deis" suffix on stage and prod but those are
going away.
2017-05-11 15:59:09 -04:00
Alex Gibson 24f6c3d0d6 Merge pull request #4782 from kyoshino/bug-1358198-relnotes-nav-nightly
Fix Bug 1358198 - Remove Aurora/DevEdition links from Release Notes navigation, add Desktop Nightly link instead
2017-05-11 18:43:51 +01:00
Josh Mize a50878acc0 Merge pull request #4808 from pmac/jenkins-merge-demo-builds
Restructure jenkins deployment. Demos build in main pipeline.
2017-05-11 11:18:53 -05:00
Alex Gibson 2ee8d395f7 Merge pull request #4830 from jpetto/bug-1363540-fx-lifestyle-itsyourweb-variation
[fix bug 1363540] Add fx lifestyle itsyourweb variation.
2017-05-11 09:39:09 +01:00
Jon Petto 8de9e48cd2 [fix bug 1363540] Add fx lifestyle itsyourweb variation. 2017-05-10 16:34:07 -05:00
Paul McLanahan 914d8007f4 Restructure jenkins deployment. Demos build in main pipeline.
* Fix demo deploy and update docs.
* Make it work with deis1 and deis2
* Enforce max 63 char app names
* Fix SSL redirect for Deis v2 clusters. Allow settings per cluster.
* Improve env file handling and combination for demo deploys
* Use new envcat utility
* Deploy our dev, stage, and prod apps to virginia and tokyo clusters
2017-05-10 17:01:06 -04:00
Josh Mize 93c83b1982 Merge pull request #4824 from pmac/fix-logging
Fix bedrock's logging config
2017-05-10 14:26:05 -05:00
Jon Petto f5d780374e Merge pull request #4829 from alexgibson/bug-1363543-firefox-new-variationa-part-deux
[fix bug 1363543] /new variations to support ad campaigns - private, general, competitor
2017-05-10 10:19:36 -05:00
Alex Gibson 33f4944082 Merge pull request #4788 from kyoshino/bug-1359091-relnotes-top-menu
Fix Bug 1359091 - Release notes top menu should have a link to the pre-release channel page
2017-05-10 15:10:44 +01:00
Jon Petto 35b9bfc6f1 Merge pull request #4823 from alexgibson/bug-1363411-firefox-hub-page-titles
[fix bug 1363411] Update Firefox hub page titles
2017-05-10 08:56:31 -05:00
alexgibson 4d00a74717 [fix bug 1363543] /new variations to support ad campaigns - private, general, competitor 2017-05-10 11:18:07 +01:00
Alex Gibson c6ff9508c7 Merge pull request #4827 from jpetto/bug-1363554-fx-new-variations-fixes
[fix bug 1363554] Fix /new variation UI issues.
2017-05-10 09:27:34 +01:00
Alex Gibson 4c976aefac Merge pull request #4826 from jpetto/bug-1363488-fxhub-correct-article-source
[fix bug 1363488] Fx Hub home - fix 3rd party quote attribution
2017-05-10 09:24:38 +01:00
April King 8884d71027 Update the web bug bounty site to have q1 2017 2017-05-09 19:09:20 -05:00
Jon Petto 92d7d3093c [fix bug 1363554] Fix /new variation UI issues. 2017-05-09 17:30:58 -05:00
Jon Petto 508c0710f9 [fix bug 1363488] Fx Hub home - fix 3rd party quote attribution 2017-05-09 15:08:57 -05:00
Jon Petto bc96af38c4 Merge pull request #4825 from jpetto/bug-1359878-add-noindex-to-variations
[fix bug 1359878] Add noindex to /new variation templates
2017-05-09 13:34:11 -05:00
Jon Petto c53176d7e0 [fix bug 1359878] Add noindex to /new variation templates 2017-05-09 13:16:40 -05:00
Jon Petto 54b256bf74 Merge pull request #4818 from alexgibson/bug-1363239-firefox-features-header
[fix bug 1363239] Header CSS height differences on new /firefox/features/ page
2017-05-09 12:18:12 -05:00
Alex Gibson c73d3a74b3 Merge pull request #4814 from jpetto/bug-1359878-fx-lifestyle-variations
Bug 1359878 fx lifestyle variations
2017-05-09 18:16:34 +01:00
alexgibson 24165b17d7 [fix bug 1363239] Header CSS height differences on new /firefox/features/ page 2017-05-09 17:41:10 +01:00
Jon Petto 36102b3aaa Review fixes & template cleanup 2017-05-09 11:39:55 -05:00
Paul McLanahan d77c3f48c1 Fix bedrock's logging config
Everything goes to STDOUT depending on the LOG_LEVEL setting.
2017-05-09 12:22:01 -04:00
alexgibson f40aad9c6e [fix bug 1363411] Update Firefox hub page titles 2017-05-09 17:08:55 +01:00
Alex Gibson 160d48c044 Merge pull request #4821 from kyoshino/bug-1349339-nightly-mobile-menu
Fix Bug 1349339 - Mobile menu on /nightly/all is unreadable
2017-05-09 12:00:54 +01:00
Alex Gibson f45a06b549 Merge pull request #4819 from kyoshino/bug-1355072-nightly-firstrun-scrollbars
Fix Bug 1355072 - [nightly] First run page, has 2 vertical scrollbars if you change the window size.
2017-05-09 11:52:55 +01:00
Kohei Yoshino e8fd3e5d20 Fix Bug 1349339 - Mobile menu on /nightly/all is unreadable 2017-05-09 06:44:19 -04:00
Kohei Yoshino 498f962e9e Fix Bug 1355072 - [nightly] First run page, has 2 vertical scrollbars if you change the window size. 2017-05-09 05:56:19 -04:00
Alex Gibson 8333e6ef84 Merge pull request #4817 from kyoshino/bug-1353454-update-ogp-logo
Fix Bug 1353454 - Fix opengraph image links that point to old logo - update to new logo
2017-05-09 09:32:57 +01:00