Permalink
Browse files

Merge pull request #457 from craigcook/bug-797379-state-of-mozilla

Bug 797379 State of Mozilla
  • Loading branch information...
2 parents 15f3da1 + 064ebf0 commit 7beb38df88110d4d0164c7e905f572b135f9e489 @rik rik committed Nov 14, 2012
Showing with 3,153 additions and 2 deletions.
  1. +1 −1 apps/foundation/templates/foundation/_country_select.html
  2. +929 −0 apps/foundation/templates/foundation/annualreport/2011.html
  3. +394 −0 apps/foundation/templates/foundation/annualreport/2011faq.html
  4. +8 −0 apps/foundation/urls.py
  5. +1,177 −0 media/css/foundation/annual2011.less
  6. +218 −0 media/css/foundation/annual2011print.css
  7. +22 −0 media/css/sandstone/fonts.less
  8. +5 −0 media/css/sandstone/lib.less
  9. +6 −1 media/css/sandstone/mixins.less
  10. BIN media/img/foundation/annualreport/2011/act-collusion.jpg
  11. BIN media/img/foundation/annualreport/2011/act-donottrack.jpg
  12. BIN media/img/foundation/annualreport/2011/act-intro.jpg
  13. BIN media/img/foundation/annualreport/2011/act-sopa.jpg
  14. BIN media/img/foundation/annualreport/2011/bg-curtains.jpg
  15. BIN media/img/foundation/annualreport/2011/bg-faq.png
  16. BIN media/img/foundation/annualreport/2011/btn-play.png
  17. BIN media/img/foundation/annualreport/2011/com-emerging.jpg
  18. BIN media/img/foundation/annualreport/2011/com-intro.png
  19. BIN media/img/foundation/annualreport/2011/com-mozcamp.jpg
  20. BIN media/img/foundation/annualreport/2011/com-reps.jpg
  21. BIN media/img/foundation/annualreport/2011/community-meet.png
  22. BIN media/img/foundation/annualreport/2011/contributors/brian-poster.jpg
  23. BIN media/img/foundation/annualreport/2011/contributors/brian-thumb.jpg
  24. BIN media/img/foundation/annualreport/2011/contributors/channy-poster.jpg
  25. BIN media/img/foundation/annualreport/2011/contributors/channy-thumb.jpg
  26. BIN media/img/foundation/annualreport/2011/contributors/chit-poster.jpg
  27. BIN media/img/foundation/annualreport/2011/contributors/chit-thumb.jpg
  28. BIN media/img/foundation/annualreport/2011/contributors/claire-poster.jpg
  29. BIN media/img/foundation/annualreport/2011/contributors/claire-thumb.jpg
  30. BIN media/img/foundation/annualreport/2011/contributors/haitham-poster.jpg
  31. BIN media/img/foundation/annualreport/2011/contributors/haitham-thumb.jpg
  32. BIN media/img/foundation/annualreport/2011/contributors/ioana-poster.jpg
  33. BIN media/img/foundation/annualreport/2011/contributors/ioana-thumb.jpg
  34. BIN media/img/foundation/annualreport/2011/contributors/keng-poster.jpg
  35. BIN media/img/foundation/annualreport/2011/contributors/keng-thumb.jpg
  36. BIN media/img/foundation/annualreport/2011/contributors/mohomodou-poster.jpg
  37. BIN media/img/foundation/annualreport/2011/contributors/mohomodou-thumb.jpg
  38. BIN media/img/foundation/annualreport/2011/contributors/viking-poster.jpg
  39. BIN media/img/foundation/annualreport/2011/contributors/viking-thumb.jpg
  40. BIN media/img/foundation/annualreport/2011/control-arrows.png
  41. BIN media/img/foundation/annualreport/2011/fxandroid-phone.png
  42. BIN media/img/foundation/annualreport/2011/grain.png
  43. BIN media/img/foundation/annualreport/2011/logo-donottrack.png
  44. BIN media/img/foundation/annualreport/2011/logo-firefox.png
  45. BIN media/img/foundation/annualreport/2011/logo-firefoxflicks.png
  46. BIN media/img/foundation/annualreport/2011/logo-firefoxos.png
  47. BIN media/img/foundation/annualreport/2011/logo-mozcamp.png
  48. BIN media/img/foundation/annualreport/2011/logo-webmaker.png
  49. BIN media/img/foundation/annualreport/2011/mob-firefoxos.jpg
  50. BIN media/img/foundation/annualreport/2011/mob-fxandroid.jpg
  51. BIN media/img/foundation/annualreport/2011/mob-fxdesktop.jpg
  52. BIN media/img/foundation/annualreport/2011/mob-standards.jpg
  53. BIN media/img/foundation/annualreport/2011/mob-webmaker.jpg
  54. BIN media/img/foundation/annualreport/2011/mozilla-rep.png
  55. BIN media/img/foundation/annualreport/2011/vid-kovacsted.jpg
  56. BIN media/img/foundation/annualreport/2011/vid-mozcamp.jpg
  57. BIN media/img/foundation/annualreport/2011/vid-webmaker.jpg
  58. BIN media/img/foundation/annualreport/2011/vid-welcome.jpg
  59. +349 −0 media/js/annual2011.js
  60. +9 −0 media/js/libs/jquery.hoverIntent.minified.js
  61. +16 −0 media/js/libs/jquery.jcarousel.min.js
  62. +8 −0 media/js/libs/jquery.waypoints.min.js
  63. +10 −0 settings/base.py
  64. +1 −0 urls.py
@@ -231,4 +231,4 @@
<option value="YE">Yemen</option>
<option value="ZM">Zambia</option>
<option value="ZW">Zimbabwe</option>
-</select>
+</select>

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 7beb38d

Please sign in to comment.