mozilla
/
bedrock
зеркало из https://github.com/mozilla/bedrock.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
6 444 коммитов 63 Ветки 1 278 Теги 1,1 GiB
Граф коммитов

601 Коммитов

Автор SHA1 Сообщение Дата
Andrei Hajdukewycz 0caa8b42f0 Merge pull request #934 from retornam/bug-724682-redirect-mathml 
Bug 724682 Redirect MATHML
 2013-06-21 13:38:24 -07:00
Andrei Hajdukewycz 1cd8adc2bc Merge pull request #977 from kyoshino/bug-884164-img-home 
Bug 884164 - Assets in /img/home/ are unavailable
 2013-06-20 12:14:30 -07:00
Kohei Yoshino 55154ffa8c Bug 884164 - Assets in /img/home/ are unavailable 
Regressed by Bug 845580
 2013-06-21 04:09:04 +09:00
retornam bac26db87a Bug 724682 Redirect MATHML 2013-06-20 10:26:19 -07:00
Craig Cook 03e26e8c18 Merge pull request #976 from sgarrity/bug-860532-gov-fix 
Fix redirects for governance pages (Bug 860532)
 2013-06-20 10:21:14 -07:00
Alex Gibson 9d91854075 Merge pull request #978 from pascalchevrel/bug_881754_firefoxnew_SpanishRedirect 
Bug 881754 : redirect es-ES locale for firefox/new
 2013-06-20 10:15:20 -07:00
Jon Petto 2690fb9f16 Merge pull request #982 from sgarrity/bug-846362-community-redirects 
Bug 846362 - Redirect /community pages to /contribute
 2013-06-20 10:13:57 -07:00
Craig Cook 87553c62bf Merge pull request #986 from kyoshino/bug-657049-accountmanager 
Bug 657049 - [404] http://www.mozilla.com/en-US/firefox/accountmanager/
 2013-06-20 10:09:56 -07:00
Kohei Yoshino dd2e278bd0 Bug 882845 - Remove/redirect /firefox/toolkit/download-to-your-devices/ page 2013-06-19 19:22:00 +09:00
Kohei Yoshino 5ef423ccea Bug 657049 - [404] http://www.mozilla.com/en-US/firefox/accountmanager/ 2013-06-19 17:59:31 +09:00
Steven Garrity 05b20f2628 Redirect /community pages to /contribute 
Bug 846362
 2013-06-18 16:34:01 -03:00
pascalc ca9daef4a9 Bug 881754 : redirect es-ES locale for firefox/new 2013-06-18 08:57:50 +02:00
Steven Garrity e1f3df2305 Fix redirects for governance pages (Bug 860532) 2013-06-17 19:50:18 -03:00
Craig Cook fb243cccd5 Bug 724633 - migrate foundation pages to bedrock 
Fix bug 871759 - improve semantics on nightly firstrun page
 2013-06-14 16:23:11 -04:00
Dan Poirier 1079802cab Bug 724633 - Port foundation pages to bedrock 2013-06-14 09:35:54 -07:00
retornam ae923faa5e Bug 845580 Redirect Firefox home 2013-06-13 10:40:38 -07:00
Andrei Hajdukewycz c0bdbae036 [Fix Bug 748503] Rewrite nightly whatsnew url to firstrun 2013-06-06 17:15:06 -04:00
Paul McLanahan 8b36b48f27 Merge pull request #948 from sgarrity/bug-877165-remove-connect 2013-06-05 10:29:50 -07:00
Paul McLanahan 9e9ad4daed Merge pull request #949 from sgarrity/bug-876668-redirect-mobile-customize 2013-06-05 10:26:30 -07:00
Steven Garrity b5d186f3b6 Bug 877165 - Remove/redirect /firefox/connect page 2013-06-05 14:25:32 -03:00
Paul McLanahan 94a974e5a0 Merge pull request #947 from openjck/bug-874525-redirects-1 2013-06-05 10:22:37 -07:00
Steven Garrity 7634a9b719 Redirect /mobile/customize for Bug 876668 2013-06-05 14:20:47 -03:00
Paul McLanahan 2a1088c5d6 Fix newsletter rewrite rules. 2013-06-04 18:07:39 -04:00
Paul McLanahan 79c85a2db3 Bug 845904: Newsletter center should be en-US only for now. 2013-06-04 18:02:19 -04:00
John Karahalis 79ecb8f0a9 Fix bug 874525: Redirect NSS/* and JSS/* to MDN. 
Commit 98b4668f redirected the NSS and JSS directories to MDN. This
commit additionally redirects the files and directories that live below
them to MDN.
 2013-06-04 15:26:22 -04:00
Paul McLanahan a002d41a01 Merge branch 'dpoirier-bug-845904-newsletter-preference-center' 
Conflicts:
	bedrock/privacy/tests/test_views.py
 2013-06-04 11:58:18 -04:00
Paul McLanahan 326dfb6f54 Merge pull request #946 from sgarrity/bug-878926-flicks-redirect 2013-06-04 08:31:31 -07:00
Steven Garrity c5b82fb887 Redirect flicks pages firefoxflicks.mozilla.org 
Bug 878926
 2013-06-04 11:41:46 -03:00
Dan Poirier b0f79bbdc0 Port newsletter preferences to Bedrock 
- Create newsletter app and move hacks.mozilla.org.html there
- Set up to display Django messages to the user.
- Make displaying most of the information on the page conditional on having a formset, so we can still use the same template when some error occurs in processing.
- Handle errors by displaying translated messages to the user. Also use Playdoh logging to log errors and debug information.
- If no token given, or token is invalid, let user supply an email
address and sign up for newsletters.
 2013-06-04 07:54:07 -04:00
Steven Garrity 3f98ec62bc Drop FUR manifesto rewrite exception (Bug 869489) 2013-06-03 09:18:41 -03:00
Jon Petto fe1df55025 Merge pull request #930 from openjck/877698-components-trailing-path 
Fix bug 877698: Redirect components trailing path.
 2013-05-30 11:06:18 -07:00
Steven Garrity 49365aef51 Merge pull request #927 from jpetto/bug-877206-disable-firstrun-test-urls 
Disable firstrun A/B test URLs. Bug 877206.
 2013-05-30 10:29:27 -07:00
Craig Cook 82c2e89776 Merge pull request #925 from sgarrity/bug-877165-remove-connect 
Bug 877165 - Remove/redirect /firefox/connect page
 2013-05-30 10:26:09 -07:00
Steven Garrity d89a63e083 Merge pull request #923 from openjck/876889-redirect-testopia 
Fix bug 876889: Redirect Testopia page to MDN.
 2013-05-30 10:23:51 -07:00
John Karahalis 4dcac598ac Fix bug 877698: Redirect components trailing path. 2013-05-30 12:13:47 -04:00
Jon Petto d1c058c60e Disable firstrun A/B test URLs. Bug 877206. 
Temporarily disable firstrun A/B test URLs. Will be used
on demo server 2013-06.

Remove GA experiment code from base /firefox/firstrun/
page.
 2013-05-29 15:33:28 -05:00
Steven Garrity ba3e2e3a31 Bug 877165 - Remove/redirect /firefox/connect page 2013-05-29 15:55:44 -03:00
Jon Petto dc569acd2b Add /b/ redirect. Bug 843789. 
Add missing bedrock passthrough for partnerships forms AJAX
endpoint (/about/partnerships/contact-bizdev/).
 2013-05-29 09:09:28 -05:00
John Karahalis c4f0cf2a21 Fix bug 876889: Redirect Testopia page to MDN. 2013-05-28 18:17:22 -04:00
Paul McLanahan b0d2107b7d Merge pull request #911 from sgarrity/bug-869489-manifesto-l10n 2013-05-24 12:29:09 -07:00
Steven Garrity 81543f2e75 Redirect manifesto language list page to bedrock 
Also remove the now-unsued credits and related CSS
Bug 869489
 2013-05-24 10:02:28 -03:00
retornam 7963c581bf Bug 841846 Redirect /firefox/nightly to nightly.mozilla.org 2013-05-23 14:44:22 -07:00
retornam 98b4668f10 Bug 874525 Redirect /projects/security/pki/* to developer.mozilla.org 2013-05-23 10:48:36 -07:00
Craig Cook 6e4278d099 Merge pull request #897 from openjck/bug-874526-redirect-components 
Fix bug 874526: Redirect components to archive.
 2013-05-23 10:44:31 -07:00
Paul McLanahan 48dabc46a1 Merge pull request #841 from retornam/bug-856077-redirect-projects-toolkit 2013-05-23 10:24:17 -07:00
Andrei Hajdukewycz 695b6edef1 Merge pull request #894 from sgarrity/bug-869489-manifesto-l10n 
Bug 869489 - Port localized versions of Manifesto to Bedrock
 2013-05-22 09:46:07 -07:00
Steven Garrity 19841a5958 Port localized versions of Manifesto to Bedrock 
Bug 869489
 2013-05-22 13:15:16 -03:00
John Karahalis 43140f7519 Fix bug 874526: Redirect components to archive. 2013-05-21 16:12:37 -04:00
retornam d844ec7214 Bug 856077 Redirect /projects/toolkit to developer.mozilla.org/docs/Toolkit_API 2013-05-21 12:20:43 -07:00
Andrei Hajdukewycz 14ce064ccf [Fix Bug 748503] Rewrite for Nightly Redesign 2013-05-21 10:09:08 -07:00
John Karahalis 39b9aaa52d Fix bug 856075: Redirect technologies.html to MDN. 2013-05-16 15:02:54 -04:00
Jon Petto 6db7669501 Firefox /firstrun A/B tests. Bug 865433. 
- Abstracted simple footer from /firefox/new/

- Added L10n strings block to templates/base.html

- Fixed L10n comment case typo on /firefox/partners/index.html

- First crack at general modal JS (media/js/mozilla-modal.js)
 2013-05-13 14:36:20 -05:00
Dan Poirier 3e9ab143ab Bug 748503: Port Firefox nightly firstrun page to Bedrock 
- Created new page with content copied from existing page
- Mark for translation
- Took a stab at formatting, but needs more work
- Use /firefox/nightly/firstrun/ instead of
  /projects/firefox/prerelease.html

- Added rewrite rules so old page:
   /projects/firefox/prerelease.html
ends up at
   /firefox/nightly/firstrun/
served with new content from Bedrock.

Add link to nightly build bug team

Link requested in https://bugzilla.mozilla.org/show_bug.cgi?id=864541
Was added on the php/svn side, needed to be added here too so the
ported page would have it when it goes live.

Page styling
 2013-05-09 11:37:22 -07:00
Paul McLanahan 83f6835a24 Merge pull request #834 from glogiotatidis/ambassadors 
[bug 859564] Add student ambassadors form.
 2013-05-07 12:02:17 -07:00
Paul McLanahan 284808c769 Bug 859564: University Ambassadors form. 
Student Ambassadors page styling.

Add base styles

updated responsive layout

add input placeholder js shim

Bug 859564: Fix data and form issues.

Derevert "[bug 859564] Add /b/ redirect for /contribute/universityambassadors/"

This reverts commit 1caa09be05.

Update to match new requirements from Jess.

Bug 859564: Fix tests.

Bug 859564: Redirect on successful submit.
 2013-05-07 21:39:44 +03:00
Paul McLanahan 0a9bb3bc44 Bug 835506: Add /b/ passthrough for facebook download tab. 2013-05-07 09:58:38 -04:00
Paul McLanahan 1caa09be05 Revert "[bug 859564] Add /b/ redirect for /contribute/universityambassadors/" 
Reverting because this page is not ready.

This reverts commit be67aa484e.
 2013-05-06 09:43:48 -04:00
Paul McLanahan d843c26978 Merge pull request #820 from glogiotatidis/859564-b 
[bug 859564] Add /b/ redirect for /contribute/universityambassadors/
 2013-05-02 07:22:47 -07:00
Giorgos Logiotatidis be67aa484e [bug 859564] Add /b/ redirect for /contribute/universityambassadors/ 2013-05-02 13:42:05 +03:00
retornam a3b3f8214c Bug 861243 Migrate Manifesto page to bedrock 2013-04-30 10:07:18 -07:00
ossreleasefeed 226c34b9ef Bug 820212: Implement Firefox OS privacy policy for display on device. 2013-04-25 00:55:29 -04:00
Dan Poirier 4b611d9f2f Bug 855734 - Strip trailing "." from request host 
People (several per day) are getting to mozilla.org via URLs like
http://www.mozilla.org./en-US/grants/. This causes the HTTP_HOST
header to be 'www.mozilla.org.', which doesn't match Django's
ALLOWED_HOSTS, which then throws errors. Apache redirect people
coming to the site with a HOST that ends in a ".".
 2013-04-19 14:05:08 -04:00
Paul McLanahan 6f6d101c8e Merge pull request #745 from retornam/bug-856081-redirect-about-page 
Bug 856081 redirecting /about/drivers to the wiki
 2013-04-11 10:26:08 -07:00
Paul McLanahan b8f51479b7 Merge pull request #714 from dpoirier/bug-849426-about-history 
Bug 849426 - port  mozilla.org/about/history.html to bedrock
 2013-04-11 08:25:44 -07:00
Dan Poirier 6ad2f434c8 Bug 849426: Port /about/history.html to bedrock 
- new pages created on wiki with old content of some pages:
  - www.mozilla.org/about/bookmarks.html ->
           https://wiki.mozilla.org/Historical_Documents
  - www.mozilla.org/about/timeline.html ->
           https://wiki.mozilla.org/Timeline
- new /about/history/ page on bedrock with existing content from
  old /about/history.html, and links to new wiki pages
- added rewrite rules so new history page is served from bedrock and old
  bookmarks and timeline pages redirect to the new wiki pages
- used about-base.html template for history page
- Added some more information to the install doc about getting the PHP
  and Bedrock sides of the site running locally with Apache.
- Make about.less import about-base.less and then add mosaic to it,
  so it's clear that the only difference is the mosaic.
 2013-04-11 10:24:24 -04:00
Paul McLanahan ecfa90aa6e Bug 797192: Add apache passthrough for plugincheck. 
en-US only so far.
 2013-04-10 09:19:12 -04:00
Paul McLanahan 06b40a7df3 Bug 797192: Revert apache passthrough for plugincheck. 
This reverts commit e6c6bb0665.
 2013-04-09 17:13:09 -04:00
Paul McLanahan e6c6bb0665 Bug 797192: Add apache passthrough for plugincheck. 2013-04-09 11:45:33 -04:00
retornam c758e5bbb4 Bug 856081 redirecting /about/drivers to the wiki 2013-04-04 10:21:09 -07:00
retornam 5524e9c450 Bug 857246 redirect /products/firefox/start/ to start.mozilla.org 2013-04-03 08:26:35 -07:00
retornam 99344bde80 Bug 851727 -Responsify powered-by page 
Migrate /projects/powered-by.html to bedrock. Bug 851727.

UI cleanup. URL redirects added (review needed).

Built on @retornam's initial branch.

Updated img alt attr, fixed phone view.

Updated URL rewrites (thanks @pmclanahan).

Updated URLs/rewrites to replace /projects/ with /about/.
 2013-04-01 15:33:31 -05:00
Jon Petto bce7144008 Update mozilla-based page. Bugs 854561, 830914, 833055. 
- Change /projects/mozilla-based/ to /about/mozilla-based/.

- Redirect /projects/mozilla-based.html to /about/mozilla-based/.

- Update product links.

Localization & URL rewrite fixes.

Wrapped string in l10n blocks. Updated rewrite rule to
handle trailing slash..

Added missing localization.
 2013-04-01 15:07:23 -05:00
Paul McLanahan 567b6dc1cf Bug 835506: Disable /b/ passthrough until page is fixed. 2013-03-29 17:22:20 -04:00
Paul McLanahan a36e7d5345 Bug 835506: Add /b/ passthrough for facebookapps. 2013-03-29 16:59:45 -04:00
Paul McLanahan 5ec19b72ec Bug 845983: Redirect metrofirefox/* to firefox/* 2013-03-18 21:58:58 -04:00
Paul McLanahan 9995453421 Bug 840814: Also redirect incorrect firstrun|whatsnew URLs without locale. 2013-03-04 16:50:35 -05:00
Paul McLanahan 7bcdb9e049 Bug 840814: Redirect bad whatsnew and firstrun URLs. 2013-03-04 12:54:58 -05:00
Steven Garrity 4465d420ac Bug 828674: Add MWC 2013 updates. 
Fix bug 840650, 840960, 842285, 842761, 843358
Fix bug 843687, 828671, 829011, 832523, 833468
Fix bug 833871, 839678, 841231, 843323, 843354
Fix bug 843648, 843678, 843692, 843716

Thanks to contributions from:

@sgarrity
@jpetto
@craigcook
@pmclanahan
@Sancus
 2013-02-24 11:07:19 -05:00
Paul McLanahan aa735bfcf6 Bug 831810: Make /mwc redirect case insensitive. 2013-02-22 11:10:28 -05:00
Paul McLanahan 510ffac3a7 Bug 841393: Do not redirect /zh-TW/firefox/partners/ 2013-02-14 15:29:35 -05:00
Paul McLanahan 5bf5ee1cac Bug 807155: Add /b/ passthrough for embedable contribute form. 2013-02-08 10:42:02 -05:00
Paul McLanahan 21fdc4010a Bug 837883: Redirect /firefox/firefox.exe to home page. 2013-02-05 20:35:51 -05:00
Paul McLanahan 674ce6570c Bug 838249: Move firefox/new-b/ page to firefox/new/. 2013-02-05 15:38:44 -05:00
Paul McLanahan 92f0599845 Bug 833645: Add proxy for en-US bedrock firstrun page. 2013-01-29 22:13:37 -05:00
Andrei Hajdukewycz 3a790ba383 [Bug 764261] revert zh-TW Accept Language rewrite 2013-01-29 13:41:29 -08:00
Andrei Hajdukewycz 30e43361ed [fix Bug 764261] zh-TW accept language redirect for download page 2013-01-24 23:51:23 -08:00
Paul McLanahan 3d614e098c Bug 755826: Add redirect for zh-CN home page. 2013-01-23 16:36:43 -05:00
Paul McLanahan c4dc7a9d8d Bug 764261: Fix still broken moz.org/zh-TW/ redirects. 
Also fix several rules that were forcing many URLs to
be en-US only. Bedrock now takes care of deciding which
pages to redirect to the default lang (en-US) and which
to display as translated as of bug 794059. Allowing all
locales to pass through to bedrock for the ones that were
redirecting all locales to en-US will enable our l10n
managers to turn on locales on a per-page basis without
the need for a code push.
 2013-01-23 16:31:55 -05:00
Paul McLanahan 5e707d4c3d Bug 764261: Add redirects for mozilla.org/zh-TW to mozilla.com.tw. 2013-01-22 11:06:11 -05:00
Paul McLanahan e3346998f4 Bug 831810: Redirect /mwc to /firefox/partners/. 2013-01-17 19:22:36 -05:00
Michael Kelly 38a88303b4 Bug 829091 - MWC 2013 Phase 1 landing page 2013-01-17 18:42:57 -05:00
Andrei Hajdukewycz 73830f7f74 port hacks.mozilla.org newsletter form from php for Bug 815908 2013-01-16 13:15:43 -08:00
Paul McLanahan 56cf51fafc Bug 764261: Remove /zh-TW/ -> mozilla.com.tw until questions resolved. 2013-01-11 20:26:06 -05:00
Paul McLanahan 85e00de58c Bug 764261: Redirect /zh-TW/* to mozilla.com.tw. 2013-01-11 09:39:10 -05:00
Paul McLanahan e8cded664b Bug 827373: Add cache-control and expires headers to tabzilla.js. 2013-01-09 14:58:32 -05:00
Paul McLanahan 121191e920 Merge branch 'bug-614428-add-research-site-b-proxy' 
Conflicts:
	etc/httpd/global.conf
 2013-01-08 17:03:09 -05:00
Paul McLanahan 09c6694824 Bug 683375: Add research site /b/ proxy and redirect. 2013-01-08 16:59:34 -05:00
Paul McLanahan 05fff9baf8 Bug 822817: Add /b/ proxy for telemetry redirect. 2013-01-08 16:39:47 -05:00
Paul McLanahan 14edbaa373 Fix bug 821006: add /b/ redirect for firefox/all/. 
Also fix expires header override for tabzilla.js.
Bug 827373.
 2013-01-08 13:42:27 -05:00
Paul McLanahan 2f00657407 Bug 827373: Fix expires header for tabzilla and fonts. 2013-01-07 13:27:17 -05:00
Paul McLanahan 75e0dca337 Add initial apache config files. 
Fix rule for bug 821006.
 2012-12-20 21:21:53 -05:00