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

10166 Коммитов

Автор SHA1 Сообщение Дата
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
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
Alex Gibson 3392ce9fa8 Merge pull request #4783 from kyoshino/bug-1357373-remove-aurora-channel
Fix Bug 1357373 - Remove Aurora from Android pre-release channel page
2017-05-09 08:15:57 +01:00
Alex Gibson b20cbca01d Merge pull request #4812 from alexgibson/bug-1361494-optimizely-features-page
[fix bug 1361494] Add Optimizely to /firefox/features/ page
2017-05-09 08:14:19 +01:00
Kohei Yoshino 5b9515bea9 Fix Bug 1353454 - Fix opengraph image links that point to old logo - update to new logo 2017-05-09 02:53:37 -04:00
Kohei Yoshino c4002058bd Fix Bug 1359091 - Release notes top menu should have a link to the pre-release channel page 2017-05-08 19:17:52 -04:00
FrancescoSTL 49c299f940 Create /new variations for display traffic 2017-05-08 16:20:24 -05:00
alexgibson 3ff6081a98 [fix bug 1361494] Add Optimizely to /firefox/features/ page 2017-05-08 19:54:05 +01:00
Alex Gibson 024ee2ac12 Merge pull request #4811 from mozilla/firefox-hub-branch
Firefox hub branch
2017-05-08 18:34:36 +01:00
Kohei Yoshino 020842da4e Fix Bug 1358198 - Remove Aurora/DevEdition links from Release Notes navigation, add Desktop Nightly link instead 2017-05-08 11:49:52 -04:00
Paul McLanahan bec54c4ea3 Merge pull request #4810 from alexgibson/bug-1333294-hide-releasenotes-ios
[fix bug 1333294] Remove links to iOS release notes
2017-05-08 10:36:01 -04:00
alexgibson ca56c84b90 Fix locale for old Firefox desktop page functional test 2017-05-08 15:21:30 +01:00
Jon Petto a327e6527a [fix bug 1352139] Add Firefox Hub landing page. 2017-05-08 15:21:30 +01:00
Craig Cook 5c613264b3 [fix bug 1353581] New Firefox platform pages 2017-05-08 15:21:30 +01:00
alexgibson 03700b07f6 [bug 1353574] Update Firefox feature images 2017-05-08 15:21:30 +01:00
alexgibson 7900924992 [fix bug 1353574] Firefox features hub pages 2017-05-08 15:21:30 +01:00
alexgibson 900fc99d24 [fix bug 1333294] Remove links to iOS release notes 2017-05-08 15:13:48 +01:00
Paul McLanahan 1ac84b80ec Merge pull request #4789 from kyoshino/bug-1360034-relnotes-bug-id
Fix Bug 1360034 - Show bug ID field in Nightly release notes
2017-05-08 09:56:48 -04:00
Paul McLanahan 23f68a52fe Merge pull request #4809 from alexgibson/bug-1341425-remove-mozorg-survey-code
[fix bug 1341425] Remove task completion survey code
2017-05-08 09:52:37 -04:00
alexgibson ee8e64faa0 [fix bug 1341425] Remove task completion survey code 2017-05-08 12:02:38 +01:00
Kohei Yoshino f5e231223e Fix Bug 1360034 - Show bug ID field in Nightly release notes 2017-05-07 21:40:18 -04:00
Kohei Yoshino d70ced7343 Fix Bug 1357373 - Remove Aurora from Android pre-release channel page 2017-05-05 16:51:19 -04:00
Jon Petto 599be7a466 Merge pull request #4807 from alexgibson/bug-1362056-nav-white-space
[fix bug 1362056] Reduce empty whitespace at top of global nav
2017-05-05 11:26:46 -05:00
alexgibson d40ad08b6e [fix bug 1362056] Reduce empty whitespace at top of global nav 2017-05-05 14:31:27 +01:00