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

328 Коммитов

Автор SHA1 Сообщение Дата
Steven Garrity f43719ea68 Clean up Firefox menu 2012-03-02 10:58:52 -04:00
Steven Garrity 729310f4fc Merge branch 'dev' of github.com:mozilla/bedrock into firefox 2012-03-01 21:37:49 -04:00
James Long 0b34be4ee4 add devices landing page 2012-03-01 15:11:22 -08:00
Steven Garrity 7742150af8 Move firefox templates around a bit 2012-03-01 16:44:41 -04:00
Steven Garrity 22c00d77c2 Bring over header menu for Firefox pages 2012-03-01 15:50:21 -04:00
Steven Garrity 673ea144bb Merge branch 'master' of github.com:mozilla/bedrock into firefox 2012-03-01 09:17:54 -04:00
Steven Garrity 3f8d27bfe6 Work on download buttons 2012-02-29 16:45:02 -04:00
Steven Garrity 347f19b351 Fix typo (my typo) 2012-02-29 13:52:15 -04:00
Steven Garrity abfcf7642c Wording/link change to /apps page 
Bug 729651 - mozilla.org/apps developer CTA content change
 2012-02-29 13:46:54 -04:00
Steven Garrity 7675b13586 Merge branch 'master' of github.com:mozilla/bedrock into firefox 2012-02-29 13:40:35 -04:00
Steven Garrity cc981e5ffb Fix video URL for MP4 version 
Bug 731650 - Apps video isn't playing on Mac OS X and Windows Safari browsers
 2012-02-29 13:02:26 -04:00
Steven Garrity e439bca4ab Add links to B2G page for Bug 731402 2012-02-28 20:19:43 -04:00
James Long 685c088324 Merge pull request #15 from gavinsharp/patch-1 
Fix typo in collusion.html
 2012-02-28 14:45:45 -08:00
Gavin Sharp 8b6c3acc5e Fix typo in collusion.html 2012-02-28 14:43:22 -08:00
Steven Garrity 436e2c0234 Merge remote branch 'upstream/dev' into security-test 2012-02-28 15:45:14 -04:00
Steven Garrity 0b2453fd93 Further cleanup of templates 2012-02-28 15:23:02 -04:00
Steven Garrity ddcf2ad9b9 Test port of Firefox Security page 2012-02-28 15:21:15 -04:00
Steven Garrity 3ff55a972c Merge remote branch 'upstream/master' 2012-02-28 10:05:11 -04:00
James Long 524d8daffa Revert "change CTA on apps page" 
This reverts commit 2deab60740.
 2012-02-27 17:33:25 -08:00
James Long a5982386e8 fix collusion addon link 2012-02-27 16:47:40 -08:00
James Long 2deab60740 change CTA on apps page 2012-02-27 16:38:39 -08:00
James Long a8d47e98d1 fix types on collusion page 2012-02-27 16:25:06 -08:00
James Long e724d74125 make collusion demo link use url tag 2012-02-27 16:16:01 -08:00
James Long 45f273d571 update b2g faq 2012-02-27 16:13:19 -08:00
James Long a17db36d9f Revert "Add links to footer of B2G page" 
This reverts commit 419d5b4d56.
 2012-02-27 15:59:43 -08:00
James Long c357bb181b write url/media helpers and don't hardcode urls 2012-02-27 15:55:23 -08:00
Steven Garrity 17414656ac Merge remote branch 'upstream/master' 2012-02-27 15:03:30 -04:00
Steven Garrity a3b048c77e Revert "Wording change to /apps page" 
This has to wait until tomorrow (Bug 729651)

This reverts commit 06751c5892.
 2012-02-27 14:48:32 -04:00
Steven Garrity 06751c5892 Wording change to /apps page 
Bug 729651 - mozilla.org/apps developer CTA content change
 2012-02-27 14:46:34 -04:00
Steven Garrity c2b7a41feb Merge branch 'master' of github.com:mozilla/bedrock 2012-02-27 14:45:07 -04:00
Steven Garrity 419d5b4d56 Add links to footer of B2G page 2012-02-27 14:44:14 -04:00
James Long a1e1a6b3b7 check for DEBUG instead of DEV when forcing SSL 2012-02-27 10:14:44 -08:00
Steven Garrity 11e29ba51b Bug 730121 - Add a video to the mozilla.org/apps page 2012-02-27 13:52:40 -04:00
Steven Garrity adae134897 Build out basic style-guide for Sandstone 2012-02-27 11:51:00 -04:00
Steven Garrity 3da0230c23 Merge remote branch 'upstream/master' 2012-02-27 10:19:17 -04:00
Fred Wenzel aded291484 indentation. sorry. 2012-02-24 16:18:10 -08:00
Fred Wenzel 815f654df8 Use Django's standard URL reversal for b2g URLs. Bug 727876#c57 2012-02-24 16:11:48 -08:00
Fred Wenzel 40e8e338b0 Merge branch 'master' of github.com:mozilla/bedrock 2012-02-24 15:29:50 -08:00
Steven Garrity ccd22a669e Change form URL and re-map privacy field ID 2012-02-24 17:11:16 -04:00
Steven Garrity 81de9dd405 Wording change from Jono 2012-02-24 16:56:23 -04:00
Steven Garrity 3018bffa55 Revert "Remove email form" 
This reverts commit 215f0b35ce.
 2012-02-24 16:49:29 -04:00
Steven Garrity b46f54e751 Minor padding tweak on B2G page (Bug 730012) 2012-02-24 16:21:04 -04:00
Steven Garrity 45cdb23ac2 Finalish updates to B2G page for Bug 730012 2012-02-24 16:19:05 -04:00
Steven Garrity c354e8df9d Fix stray closing tags in webtrends include 
(Bug 730171)
 2012-02-24 15:58:28 -04:00
Steven Garrity 215f0b35ce Remove email form 2012-02-24 15:49:34 -04:00
Steven Garrity 60e21991fd Merge branch 'master' of github.com:mozilla/bedrock 2012-02-24 15:40:14 -04:00
Steven Garrity 87388b02fd More cleanup to collusion demo for Bug 730012 
(thanks Jono)
 2012-02-24 15:38:56 -04:00
James Long 0d21df0ca4 add webtrends tracking 2012-02-24 14:31:51 -05:00
Steven Garrity e128b3fc56 Initial setup of Collusion page 
Bug 730012 - [Collusion] Build Collusion Landing Page on mozilla.org for Gary for TED
 2012-02-24 12:50:10 -04:00
Steven Garrity 59d9b1c78d Text updates for B2G pages from Bug 727876 2012-02-24 11:00:48 -04:00