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

4335 Коммитов

Автор SHA1 Сообщение Дата
Alex Gibson 01afe45125 [fix bug 986052] Add documentation for running Mozilla.UITour on Bedrock 2014-03-26 10:37:12 +00:00
Alex Gibson e4f6150806 Merge pull request #1768 from mmmavis/bug-981092-add-gigabit-copy
Bug 981092 - Update /gigabit copy according to the given text on GDoc
2014-03-17 18:00:02 +00:00
Steven Garrity 34de9349d4 Merge pull request #1784 from retornam/fixaddress
Bug 983863 - Change Mozilla MTV office address from 650 Castro Street to...
2014-03-17 14:15:30 -03:00
Mavis Ou f6025a39be Bug 981092 - update /gigabit copy according to https://docs.google.com/a/mozillafoundation.org/document/d/1DLFHbXvxsynWqacUkn8wVxSDJfzvKEuFYhOfEW8iFOY/edit?disco=AAAAAGAHhqo&pli=1# 2014-03-17 10:11:55 -07:00
Paul McLanahan 9d5b044ff8 Merge pull request #1778 from mozilla/australis-tour-updates
[fix bug 975099] Australis /firstrun and /whatsnew onboarding tour for beta
2014-03-17 12:34:42 -04:00
Alex Gibson 9094b580a4 Merge pull request #1772 from jpetto/bug-981176-fxos-1.3-release-notes
Add FxOS 1.3 release notes. Bug 981176.
2014-03-17 16:27:32 +00:00
Jon Petto d31eeb29b9 Add FxOS 1.3 release notes. Bug 981176. 2014-03-17 11:19:04 -05:00
Alex Gibson f3ef36aeef [fix bug 975099] Australis /firstrun and /whatsnew onboarding tour for beta 2014-03-17 15:34:34 +00:00
retornam 0e086df179 Bug 983863 - Change Mozilla MTV office address from 650 Castro Street to 331 E. Evelyn Avenue. 2014-03-14 16:31:03 -07:00
Paul McLanahan 071101fbad Merge pull request #1754 from jgmize/release-notes-improvements
Improve release_notes view to fix multiple bugs
2014-03-14 17:18:04 -04:00
Josh Mize cb30adf937 Improve release_notes view to fix multiple bugs
Map URLs within bedrock for bug 978931

Map firefox os release notes urls to new RNA powered release_notes
view, with fallback to manual templates for 1.0.1, 1.1, and 1.2 to
support the template development for bug 978988

respect Release.is_public flag unless settings.DEV is True

Map auroranotes to RNA release_notes view

Beta notes will also work if the version # matches the version_re,
which for example 28.0b1 will, but 28.0beta will not

We no longer "fix" version numbers like 27.0 -> 27.0.0 -- this was
an artifact of data migrations that we need to fix in the nucleus
DB now that we've gotten past those migrations

The release_notes view now expects the version string to be unique per
product

mobile release notes are not yet supported, further work
will be done as part of Bug 965012.
2014-03-14 21:06:56 +00:00
Paul McLanahan d315460946 Add example basic auth config for demo servers. 2014-03-14 13:26:49 -04:00
Alex Gibson 88499dccba Merge pull request #1777 from kyoshino/bug-983201-som12-links
Fix Bug 983201 - Missing links to latest financial documents
2014-03-14 12:58:07 +00:00
Kohei Yoshino b2e50ace8f Fix Bug 983201 - Missing links to latest financial documents 2014-03-13 17:45:48 -04:00
Josh Mize 9c6189556a Merge pull request #1776 from sgarrity/bug-866190-python-nss-redirect
Redirect python-nss page to MDN (Bug 866190)
2014-03-13 15:24:07 -05:00
Steven Garrity f94743f23a Redirect python-nss page to MDN (Bug 866190) 2014-03-13 15:29:55 -03:00
Paul McLanahan 229fbe5493 Merge pull request #1774 from pmclanahan/fix-pot-to-langfile-982755
Fix bug 982755: Fix POT file conversion when string ends with quote.
2014-03-12 16:38:34 -04:00
Paul McLanahan 95a490bc2a Fix bug 982755: Fix POT file conversion when string ends with quote. 2014-03-12 16:35:51 -04:00
Paul McLanahan 06c0b1f0e9 Merge pull request #1764 from pmclanahan/upgrade-playdoh-lib-django-1.5
Fix bug 946880: Upgrade playdoh-lib to latest master with Django 1.5
2014-03-12 13:06:08 -04:00
Paul McLanahan 24bf377476 Fix bug 946880: Upgrade playdoh-lib to latest master with Django 1.5
Upgrades a number of things:

* 83cee01 Merge pull request #59 from peterbe/upgrade-test_utils
* 57c1b29 upgrade test_utils
* ce50051 Merge pull request #58 from glogiotatidis/master
* 19e16ab Upgrade test-utils to support Django 1.5.
* ee0b875 Merge pull request #57 from pmclanahan/upgrade-django-nose
* b5273fe Upgrade django-nose
* 1117ecc Merge pull request #56 from willkg/update-funfactory
* 6bc7ee1 Update funfactory to latest master tip
* f4936a8 Update jingo to latest master tip (5e985a5)
* 892ed74 Update to Django 1.5.5
* 2c89fe7 Upgrade bleach to 1.2.2
* db88c21 Django 1.4.10, r=willkg
* 94dcac7 Merge pull request #53 from willkg/remove-schematic-2
* c66e513 Remove schematic submodule
* 2ad6d1e Merge pull request #50 from willkg/sort-vendorpth
* 16d21ce Cosmetic: Resort vendor.pth
* 707fdfc updating django-mobility and django-multidb-router
* 4d482c3 Merge pull request #49 from akatsoulas/update-funfactory
* 730f35d Update funfactory to latest master.
* 65d7a52 upgrade to django-browserid 0.9
* a1def31 Merge pull request #47 from pmclanahan/update-funfactory
* 9b22ad9 Update funfactory to latest master.

Also removes reliance on deprecated things:

* django.conf.urls.defaults
* verify_exists kwarg on UrlField
2014-03-12 12:57:46 -04:00
Alex Gibson a68a10d6ae Merge pull request #1770 from jpetto/bug-981953-fxos-ie8-css-bugs
Fix CSS bugs on /firefox/os/. Bug 981953.
2014-03-12 14:10:16 +00:00
Jon Petto 69a51e213e Fix CSS bugs on /firefox/os/. Bug 981953. 2014-03-11 16:05:10 -05:00
Steven Garrity 51b593427c Merge pull request #1769 from kyoshino/bug-981878-spaces-guidelines
Fix Bug 981878 - Add Portland, San Francisco and Vancouver MozSpaces guidelines
2014-03-11 09:28:17 -03:00
Kohei Yoshino 0cb1daef53 Fix Bug 981878 - Add Portland, San Francisco and Vancouver MozSpaces guidelines 2014-03-10 23:18:06 -04:00
Jon Petto 0d2a0a028b Merge pull request #1765 from alexgibson/add-callback-to-close-australis-tour
[fix bug 981542] Add callback to the new close button in Australis Tour door-hanger menu
2014-03-10 14:10:37 -05:00
Alex Gibson bd5e0b5dc7 [fix bug 981542] Add callback to the new close button in door-hanger 2014-03-10 19:07:53 +00:00
Alex Gibson 33e4f44cc0 Merge pull request #1767 from kyoshino/bug-981625-contribute-support-email
Fix Bug 981625 - Change autoreply addresses for the contribute support email
2014-03-10 17:07:10 +00:00
Paul McLanahan 1c0d698a40 Merge pull request #1766 from alexgibson/add-editor-config-file-to-bedrock
Add .editorconfig file to Bedrock
2014-03-10 10:54:39 -04:00
Paul McLanahan d0337561a0 Merge pull request #1762 from pmclanahan/move-jenkins-config-to-settings
Move jenkins settings to a dedicated file.
2014-03-10 10:47:11 -04:00
Paul McLanahan 35b0e75a38 Add docs for testing and a note for jenkins settings.
Also clean up some docs errors and
make jenkins.py nicer when run without
jenkins.sh.
2014-03-10 10:41:59 -04:00
Kohei Yoshino f78860ffc0 Fix Bug 981625 - Change autoreply addresses for the contribute support email 2014-03-10 10:35:18 -04:00
Alex Gibson a83904f016 Add .editorconfig file to Bedrock 2014-03-10 11:13:42 +00:00
Steven Garrity b8780b5743 Merge pull request #1761 from jpetto/bug-980005-add-image-for-fx-whatsnew-test
Add image for pt-BR fx whatsnew test. Bug 980005.
2014-03-07 16:23:45 -04:00
Andrei Hajdukewycz 9bf708372e Merge pull request #1763 from Sancus/master
[Fix Bug 981063] catch-all redirect for old calendar urls
2014-03-07 12:06:02 -08:00
Paul McLanahan fc4a91f7b1 Move jenkins settings to a dedicated file.
This makes test settings a lot easier to discover,
as well as making it easier to run the tests under jenkins
conditions.

JENKINS_HOME=1 python manage.py test
2014-03-07 14:50:44 -05:00
Jon Petto b52b5d3cb0 Add image for pt-BR fx whatsnew test. Bug 980005.
- Image just needs to be in CDN. Testing will be done
  elsewhere.
2014-03-07 13:27:31 -06:00
Andrei Hajdukewycz 0d40c20369 [Fix Bug 981063] catch-all redirect for old calendar urls 2014-03-06 17:52:14 -08:00
Paul McLanahan d4d4846838 Merge pull request #1604 from kyoshino/bug-809697-linux64-btn
Fix Bug 809697 - [download buttons] Offer linux64 builds to Linux x86_64 user agents
2014-03-06 14:07:42 -05:00
Craig Cook 52cc1052d3 Merge pull request #1693 from kyoshino/bug-972231-newsletter-rtl
Fix Bug 972231 - Fix the newsletter form RTL layout
2014-03-06 10:37:22 -08:00
Kohei Yoshino 880afdcdb6 Fix Bug 809697 - [download buttons] Offer linux64 builds to Linux x86_64 user agents 2014-03-06 13:36:59 -05:00
Alex Gibson 9975aece8e Merge pull request #1758 from jpetto/bug-958333-fxos-devices-update
Add Poland to available countries for Alcatel OTF. Bug 958333.
2014-03-06 18:18:51 +00:00
Steven Garrity b790fca4a1 Merge pull request #1757 from pascalchevrel/bug-980212-en-GB_and_en-ZA_firefox_download_redirects
Bug 980212: redirect download pages for en-GB and en-ZA to bedrock
2014-03-06 14:02:48 -04:00
Jon Petto 530a7d24dc Add Poland to available countries for Alcatel OTF. Bug 958333. 2014-03-06 09:37:09 -06:00
Alex Gibson 1c64a0e55b Merge pull request #1753 from jpetto/bug-877202-remove-fx-firstrun-tests
Remove Fx firstrun test. Bug 877202.
2014-03-06 14:28:01 +00:00
rard 28a04898de [fix bug 979810] Update link to Buddy forum in support email 2014-03-06 14:08:04 +00:00
pascalc c77449cbba Bug 980212: redirect download pages for en-GB and en-ZA to bedrock 2014-03-06 09:25:29 +01:00
Josh Mize 30ec18e07b Merge pull request #1756 from pmclanahan/add-apache-rule-holidays-952429
Bug 952429: Fix some urls for the new calendar holidays page.
2014-03-05 14:21:17 -06:00
Paul McLanahan 086302275b Bug 952429: Fix some urls for the new calendar holidays page.
Also change the redirects for bug 971244 to 301s.
2014-03-05 15:07:15 -05:00
Jon Petto f0532852d0 Remove Fx firstrun test. Bug 877202.
- Removes images, CSS & JS files, & templates.

- Class-based view remains for later use.

- Updated class-based views & tests to use/expect a list
  of template names (conform to django intention)
2014-03-05 10:57:27 -06:00
Alex Gibson 59b958df89 Merge pull request #1745 from retornam/bug-9669776-gigabit-site
Bug 969776 - Gigabit Site - Wrong preview image on Facebook
2014-03-05 15:38:20 +00:00