Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: l-hedgehog/bedrock
...
head fork: l-hedgehog/bedrock
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Mar 08, 2013
@sgarrity sgarrity Remove sand.html and mozorg/base.html templates
They were just adding CSS class to the body, not worth a whole template
The /apps/privacy/ pages aren't exposed in production yet
e8b41bc
@sgarrity sgarrity Responsify Do Not Track page (Bug 768507) b2dc861
@sgarrity sgarrity Responsify Geolocation page (Bug 768507) c40e2bc
@sgarrity sgarrity Responsify /firefox/update/ page (Bug 768507) 564097a
Commits on Mar 11, 2013
@sgarrity sgarrity Responsify Firefox for Organizations (Bug 768507) 047fe7c
@craigcook craigcook Bug 842858 - update FxOS wordmark de96586
@craigcook craigcook Bug 842858 - add cachebusters to img src d6ce96d
@sgarrity sgarrity Fix button styles in Style Guide (Bug 842858) 771eda5
@craigcook craigcook Merge pull request #675 from sgarrity/bug-842858-button-styles
Fix button styles in Style Guide (Bug 842858)
88706e0
@AaronMT AaronMT added more ARMv6 tested devices, march 2013 5573b6f
@jpetto jpetto Fix duplicate id on screenshot. Bug 849923.
Platform image generator directly copies supplied
attributes, causing duplicate id's on page. Removed
id from screenshot/platform image. Targeting
containing div instead for styling purposes.
d6925f4
Commits on Mar 12, 2013
@sgarrity sgarrity Merge pull request #677 from jpetto/firefox-new-html5-errors
Fix duplicate id on screenshot. Bug 849923.
2a5d366
@pmclanahan pmclanahan Merge pull request #676 from AaronMT/march-2013-devices
More ARMv6 tested devices into devices.csv - March 2013
6034c32
@AaronMT AaronMT Added initial Alcatel devices de8dca6
@AaronMT AaronMT Added the One Touch 995 Ultra f15c262
@sgarrity sgarrity Fix responsive layout for Collusion (Bug 768507)
Demo page still locks open at destop width to fix the demo animation
5b4f198
@craigcook craigcook Merge pull request #674 from sgarrity/bug-768507-responsify
Bug 768507 responsify
0ab5081
@AaronMT AaronMT Added the One Touch 991 178a74d
@AaronMT AaronMT Added the One Touch 903 e9fcb66
@AaronMT AaronMT Added the One Touch 990 8ab39d5
Commits on Mar 13, 2013
@pmclanahan pmclanahan Bug 850295: Update download buttons for funnelcakes.
* Force funnelcake for en-US Windows release and beta buttons on
  installer-help page.
205dad0
@pmclanahan pmclanahan Merge pull request #681 from pmclanahan/bug-850295-add-button-version…
…-override

Bug 850295: Update download buttons for funnelcakes.
2233e5a
@Osmose Osmose Fix Tabzilla promo to avoid splitting a sentence between strings. 7b73d77
Commits on Mar 14, 2013
@l-hedgehog Merge branch 'master' into merge-latest-playdoh
Conflicts:
	bedrock/base/templates/sand.html
	bedrock/collusion/templates/collusion/demo.html
	bedrock/mozorg/templates/mozorg/base.html
	media/css/collusion/collusion.less
a37886d
@pascalchevrel pascalchevrel Bug 795546, add cn-community@mozilla.com as the contact email address…
… for zh-CN contribute page
30ebc11
@pmclanahan pmclanahan Add option to just print github url to open-compare.py. 45364ca
@jpetto jpetto Update 'Join Us' text/links. Bug 846063.
Anything needed from this end to update .lang files
for localization?
6d314c8
Commits on Mar 15, 2013
@pmclanahan pmclanahan Bug 774239: Add ability to extract specific files to l10n_extract com…
…mand.

Update l10n_extract docs.
45f2f00
@pmclanahan pmclanahan Merge pull request #616 from pmclanahan/bug-774239-extract-specific-t…
…emplates

Bug 774239: Add ability to extract specific files to l10n_extract command.
eeceeb0
@pascalchevrel pascalchevrel Bug 851540: clean up production language list in base.py 671e0b9
@pascalchevrel pascalchevrel replace call to base.lang by call to download_button.lang in base.py …
…+ replace references to base.lang in test files by references to download_button.lang for consistency
965454e
@pascalchevrel pascalchevrel Update l10n.rst
replace references to base.lang by download_button.lang (see bug 851545)
35e6e21
@jpetto jpetto Merge pull request #685 from jpetto/join-us-text-link-change
Update 'Join Us' text/links. Bug 846063.
674a448
@sgarrity sgarrity Merge pull request #678 from AaronMT/march-2013-devices
More devices.csv additions - initial Alcatel devices
12186a5
Commits on Mar 17, 2013
@l-hedgehog Merge branch 'master' into merge-latest-playdoh a242a7c
Commits on Mar 18, 2013
@AaronMT AaronMT minor devices.csv update - company rename ec5cc2e
@pmclanahan pmclanahan Merge pull request #690 from AaronMT/march-2013-devices
minor devices.csv update - company rename
12c646a
@pmclanahan pmclanahan Merge pull request #686 from pascalchevrel/Bug851540_PROD_LANGUAGE_li…
…st_update

Bug 851540: clean up production language list in base.py
f901a90
@pmclanahan pmclanahan Merge pull request #687 from pascalchevrel/Bug851545-download_button_…
…default_lang_file

replace call to base.lang by call to download_button.lang
af1a443
@pmclanahan pmclanahan Merge pull request #688 from pascalchevrel/patch-1
Update l10n.rst
89fab3f
@chrismore chrismore Bug 852343 - fix runfield link
Add slash to runfield demo link.
edec718
Commits on Mar 19, 2013
@pmclanahan pmclanahan Bug 845983: Redirect metrofirefox/* to firefox/* 5ec19b7
@Sancus Sancus Merge pull request #693 from chrismore/patch-2
Bug 852343 - fix runfield link
c5477ce
@pascalchevrel pascalchevrel fix Bug 852759 - Fix a couple of strings for download buttons that ex…
…plose l10n problems
7149be8
Commits on Mar 20, 2013
@craigcook craigcook Fix bug 853148 - update home page news 37afca6
@pmclanahan pmclanahan Merge pull request #697 from craigcook/master
Bug 853148 - update home page news
9645d6e
Commits on Mar 21, 2013
@l-hedgehog Merge branch 'master' into merge-latest-playdoh 35cb20c
@pmclanahan pmclanahan Bug 853470: Fix server errors for grants pages. f89308b
@pmclanahan pmclanahan Merge pull request #698 from pmclanahan/bug-853470-fix-grants-redirect
Bug 853470: Fix server errors for grants pages.
d797851
@gauthierm gauthierm Make focus detection in pager more general using focusin/focusout on …
…the container instead of on specific elements within hte container.
bb0c8b6
@gauthierm gauthierm Prevent starting the auto-roate interval twice. d1b371d
@sgarrity sgarrity Merge pull request #683 from pascalchevrel/Bug795546-contributepage_z…
…h-CN

Bug  795546, add cn-community@mozilla.com as the contact email address f...
d8f9f82
@sgarrity sgarrity Merge pull request #695 from pascalchevrel/Bug852759_Download_Buttons…
…_l10n

fix Bug 852759 - Fix a couple of strings for download buttons that explo...
a1764f4
@sgarrity sgarrity Merge pull request #699 from gauthierm/bug-833327-slideshow-rotate-2
Make focus detection in pager more general using focusin/focusout on the...
3c41a6f
Commits on Mar 25, 2013
@l-hedgehog Merge branch 'master' into merge-latest-playdoh 5da381e