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

3664 Коммитов

Автор SHA1 Сообщение Дата
Paul McLanahan f314928fa0 Fix bug 931310: Add New Relic deployment notification to deploy scripts. 2013-11-25 12:59:41 -05:00
Paul McLanahan 28f82e7fe6 Ignore james ini file. 2013-11-21 11:18:00 -05:00
Alex Gibson 4f36df710d Merge pull request #1425 from icaaq/Bug-941516-esckey-triggers-window_close 
call Tabzilla.close() instead of close()
 2013-11-21 06:32:45 -08:00
Paul McLanahan c13e8cdae8 Merge pull request #1423 from jpetto/bug-928120-som2012-updates 
Update UI for SOM 2012 page. Bug 928120.
 2013-11-21 05:47:22 -08:00
Isac Lagerblad d2738cdb1e call Tabzilla.close() instead of close() 
fixes bug 941516
 2013-11-21 14:44:03 +01:00
Jon Petto defbc57cd9 Update UI for SOM 2012 page. Bug 928120. 
- Add high-res images for circle brand & play icon.

- Remove superfluous comma.

- Remove blue bg on Sustainability section.
 2013-11-21 07:41:24 -06:00
Alex Gibson 17eaec4ba2 Merge pull request #1421 from kyoshino/bug-941065-ffos-privacy-typo 
Bug 941065 - [Privacy]: typo in Privacy Policy for FFOS
 2013-11-21 01:44:28 -08:00
Alex Gibson b23477121f Merge pull request #1424 from flodolo/som2012_langfile 
Bug 928120 - Import 2012/index.lang into 2012/faq
 2013-11-21 01:40:37 -08:00
Francesco Lodolo (:flod) c920900eec Bug 928120 - Import 2012/index.lang in 2012/faq 
In this way we can use only two files (index.lang, faq.lang) and reuse
footer/header strings stored in index.lang
 2013-11-21 09:49:19 +01:00
Craig Cook b944df6d82 Merge pull request #1420 from jpetto/bug-928120-state-of-mozilla-2012 
Add State of Mozilla 2012 page. Bug 928120.
 2013-11-20 16:28:51 -08:00
Jon Petto 194a4948b0 Add State of Mozilla 2012 page. Bug 928120. 
- Update video helper to accept 'preload' & 'id' attributes.

- Add image replacement class to sandstone/lib.less.

- Add default title style to mozilla-modal.js.
 2013-11-20 18:26:46 -06:00
Craig Cook 2d0573e7dd Merge pull request #1417 from flodolo/hp_locales 
Bug 935877 - Home page: enable VTCS and Lightbeam for more locales
 2013-11-20 16:04:32 -08:00
Francesco Lodolo (:flod) 2fd9c7d715 Bug 935877 - Home page: enable VTCS and Lightbeam for more locales 
Added locales:
* Lightbeam+WebMaker: es-MX
* VTCS: es-CL, es-MX
 2013-11-20 22:00:51 +01:00
Kohei Yoshino 435fa5aa3a Bug 941065 - [Privacy]: typo in Privacy Policy for FFOS 2013-11-20 14:42:19 -05:00
Fred Wenzel f3028a77e0 Merge pull request #1411 from fwenzel/careers-teaser 
Careers teaser in comment and error console. Bug 937719.
 2013-11-19 13:58:18 -08:00
Fred Wenzel cebcf013aa Careers teaser in comment and error console. Bug 937719. 2013-11-19 13:56:42 -08:00
Craig Cook 7cfe5b4a97 Merge pull request #1415 from mozilla/bug-939921-nightly-firstrun-logo 
Update logo on Nightly firstrun page (Bug 939921)
 2013-11-19 13:28:18 -08:00
Steven Garrity edc5a1bb28 Update logo on Nightly firstrun page (Bug 939921) 2013-11-19 16:23:22 -04:00
Paul McLanahan eeaa14e804 Merge pull request #1409 from pmclanahan/bug-779751 
Bug 779751: Newsletter updated only accept UUIDs for token.
 2013-11-19 06:58:58 -08:00
Paul McLanahan dfb0dafbc7 Prevent tests from making network calls. 
While fixing bug 779751 I found some tests that
were calling out to basket and salesforce. These
changes should mock all of that.
 2013-11-19 09:56:48 -05:00
Paul McLanahan 46397a017c Bug 779751: Newsletter updated only accept UUIDs for token. 2013-11-19 09:56:48 -05:00
Josh Mize fa01698726 Merge pull request #1412 from flodolo/channel_morelocales 
Bug 925278: add new locales to firefox/channel redirect
 2013-11-19 06:56:31 -08:00
Josh Mize c831fd5473 Merge pull request #1413 from flodolo/morelocales_hp 
Bug 935877 - Home page: enable VTCS for more locales
 2013-11-19 06:55:07 -08:00
Francesco Lodolo (:flod) 05ecf99492 Bug 925278: add new locales to firefox/channel redirect 
Added locales: hy-AM, zh-CN
 2013-11-19 13:56:10 +01:00
Francesco Lodolo (:flod) c8e9ab11c3 Bug 935877 - Home page: enable VTCS for more locales 
Added locales:
* VTCS: cy, is
 2013-11-19 13:55:31 +01:00
Josh Mize d45a59e42a Merge pull request #1410 from pmclanahan/fx-download-broken-link-no-build-924347 
Fix bug 924347: Fall back to en-US download locale.
 2013-11-19 01:11:37 -08:00
Craig Cook 5c1671e560 Merge pull request #1407 from flodolo/channel_locales 
Bug 925278: add new locales to firefox/channel redirect
 2013-11-18 10:26:50 -08:00
Craig Cook e82b4a200f Merge pull request #1406 from flodolo/more_locale_home 
Bug 935877 - Enable VTCS and Lightbeam for more locales
 2013-11-18 10:25:59 -08:00
Paul McLanahan cfa0f8ba92 Fix bug 924347: Fall back to en-US download locale. 
If no localized Fx build exists for the latest version
fall back to an en-US download link.
 2013-11-18 12:09:53 -05:00
Alex Gibson 349838c29f Merge pull request #1408 from flodolo/bug939595 
Bug 939595 - lightbeam/about: make navigation menu localizable
 2013-11-18 05:22:42 -08:00
Francesco Lodolo (:flod) d27a4a27c9 Bug 935877 - Enable VTCS and Lightbeam for more locales 
Added locales:
* VTCS: es-AR, fr, fy-NL, mk, pl, sq, uk
* Lightbeam+Webmaker: cs, cy, fy-NL, pl, uk
 2013-11-18 13:29:57 +01:00
Francesco Lodolo (:flod) 6b4b9ea587 Bug 925278: add new locales to firefox/channel redirect 
Added locales: fy-NL, pl, uk
 2013-11-18 13:24:51 +01:00
Francesco Lodolo (:flod) 8252d4078e Bug 939595 - lightbeam/about: make navigation menu localizable 
Wrap strings like in other pages
 2013-11-18 09:22:18 +01:00
Josh Mize 003d8c9e3c Merge pull request #1404 from mozilla/bug-927522-update-cta-for-greece 
Fix bug 927522 - update CTA for Greece
 2013-11-15 09:53:17 -08:00
Craig Cook 42ec95606b Fix bug 927522 - update CTA for Greece 2013-11-15 09:31:27 -08:00
Paul McLanahan 8118d6908a Merge pull request #1403 from flodolo/home_vtcs 
Bug 935877 - Enable VTCS for more locales
 2013-11-15 07:29:49 -08:00
Paul McLanahan ab7b5cac94 Revert "Bug 914680: Add language select to hacks newsletter form." 
This selector should only contain English and Spanish. This disables
the select for now. Will add it back in another pull-request.

This reverts commit 1913b8ea93.
 2013-11-15 10:21:36 -05:00
Francesco Lodolo (:flod) f5ea8ebd91 Bug 935877 - Enable VTCS for more locales 
Added locales:
* VTCS: da, el, es-ES, tr
 2013-11-15 09:15:36 +01:00
Josh Mize 3b436bd6cc Merge pull request #1402 from pmclanahan/fix-country-required-930485 
Bug 930485: Add required attr to country select for newsletters.
 2013-11-14 13:21:56 -08:00
Paul McLanahan f364ee68a3 Bug 930485: Add required attr to country select for newsletters. 2013-11-14 16:15:29 -05:00
Paul McLanahan 8ef08d0cd3 Merge pull request #1401 from flodolo/locales_home 
Bug 935877 - Enable lightbeam and VTCS for more locales
 2013-11-14 12:17:51 -08:00
Josh Mize 1046dbcc63 Merge pull request #1127 from pmclanahan/enable-database 
Enable the database.
 2013-11-14 12:16:05 -08:00
Paul McLanahan ad72b10d8b Consolidate deploy scripts and add db truncate command. 2013-11-14 15:12:29 -05:00
Paul McLanahan 9cc46b45a3 Bug 920067: Enable the database. 
* Add sqlite config to base settings.
* Update tests to use Django's database aware TestCase.
* Install south.
* Install django-waffle.
* Update jenkins to use the database for CI.

Django admin will be enabled in a separate PR.
 2013-11-14 15:11:02 -05:00
Francesco Lodolo (:flod) e839ab961b Bug 935877 - Enable lightbeam and VTCS for more locales 
Lightbeam: da, es-CL, es-ES, ru
VTCS: de, eu, it, sv-SE, zh-TW
 2013-11-14 20:42:30 +01:00
Alex Gibson 1f9969325e Merge pull request #1398 from jpetto/bug-936182-ga-experiment-fx-download-size 
Add platform test to GA experiment. Bug 936182.
 2013-11-14 11:14:03 -08:00
Steven Garrity 62fcabd54d Merge pull request #1400 from jpetto/bug-938684-videos-showing-on-fx-partners 
Hide videos for JS users on /firefox/partners. Bug 938684.
 2013-11-14 10:55:26 -08:00
Steven Garrity 56f033b301 Merge pull request #1395 from flodolo/new_km_th 
Bug 900493: enable firefox/new redirect for km, th
 2013-11-14 10:45:20 -08:00
Jon Petto f161fb0c16 Hide videos for JS users on /firefox/partners. Bug 938684. 2013-11-14 12:45:12 -06:00
Craig Cook 3d537ecefe Merge pull request #1396 from flodolo/update_channel_redirect 
Bug 925278: add new locales to firefox/channel redirect
 2013-11-14 10:44:59 -08:00