Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
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
Commits on Dec 18, 2012
@rossbruniges rossbruniges Fix bug 816561 - making the ITU oage ready for translations 088cec2
Commits on Dec 20, 2012
@sgarrity sgarrity For for adding jquery for tabzilla from mjschranz
From the pull request against the mozilla/tabzilla repo
mozilla/tabzilla#48
652b355
Commits on Feb 05, 2013
@icaaq icaaq added support for <main> 45fd12f
Commits on Feb 06, 2013
@sgarrity sgarrity Fix width of button in small layouts (Bug 837914) 5d18d89
@icaaq icaaq Added <main role=main> around the main-content of the page 1153d4f
Commits on Feb 24, 2013
@l-hedgehog move templates to bedrock/base 380f699
@l-hedgehog move css/less files to subdirectories of media/css b19d8eb
@sgarrity sgarrity Bug 828674: Add MWC 2013 updates.
Fix bug 840650, 840960, 842285, 842761, 843358
Fix bug 843687, 828671, 829011, 832523, 833468
Fix bug 833871, 839678, 841231, 843323, 843354
Fix bug 843648, 843678, 843692, 843716

Thanks to contributions from:

@sgarrity
@jpetto
@craigcook
@pmclanahan
@Sancus
4465d42
@sgarrity sgarrity Fix Italian MWC press URL 5f4cd45
@pmclanahan pmclanahan Merge pull request #643 from mozilla/mwc-url-fix
Fix Italian MWC press URL
a5a2e7b
@sgarrity sgarrity Fix URL on home page headline c21b639
@pmclanahan pmclanahan Merge pull request #644 from mozilla/mwc-url-fix
Fix URL on home page headline
81f38c3
@pmclanahan pmclanahan Update tabzilla for cache-bust. a6765a7
@craigcook craigcook Fix bug 833468 - trailing slash for MWC badge URL 1bc95a6
Commits on Feb 25, 2013
@craigcook craigcook Merge pull request #645 from craigcook/master
Bug 833468 - trailing slash for MWC badge URL
496113c
@pascalchevrel pascalchevrel Bug 844860 - remove en-US in link to MDN to allow locale detection e09ff18
@pascalchevrel pascalchevrel Bug 844885 - Allow locale detection in MWC badge on mozilla.org pages 14c0e9a
@pmclanahan pmclanahan Merge pull request #647 from pascalchevrel/Bug844885-MWCBadgeLink-l10n
Bug 844885 - Allow locale detection in MWC badge on mozilla.org pages
1c31104
@pmclanahan pmclanahan Merge pull request #646 from pascalchevrel/Bug844860-linkupdate-l10n
Bug 844860 - remove en-US in link to MDN to allow locale detection
fde87ec
@pmclanahan pmclanahan Add script to open github compare view for any env. 3a33081
@pmclanahan pmclanahan Bug 844885: Allow locale detection in MCW badge on mozilla.org pages.
Include base.html in the fix from
14c0e9a
b4e078a
@pmclanahan pmclanahan Merge pull request #642 from pmclanahan/add-version-compare-script
Add script to open github compare view for any env.
57a71d2
Commits on Feb 26, 2013
@craigcook craigcook Fix bug 844914 - MWC link cleanup
* External links open in new tab/window
* Updated WIPJam link
* Updated mozorg home page news
3f9575d
@craigcook craigcook Fix bug 844915 - update MWC demos schedule 39666e8
@craigcook craigcook Fix bug 844969 - MWC cleanup and presentation tweaks c4a57a3
@craigcook craigcook Fix bug 845389 - copy change in page intro 8f03b48
@pmclanahan pmclanahan Merge pull request #648 from craigcook/mwc-cleanup
MWC cleanup
21e87fb
@cvan cvan do not preventDefault on links to Marketplace apps (bug 806930) d81e536
@cvan cvan rename "Mozilla Marketplace" to "Firefox Marketplace" everywhere (bug…
… 841932)
8631c25
@davidwboswell davidwboswell Adding Janet's signature to the documentation auto-response -- bug 81…
…7018
48cac77
@davidwboswell davidwboswell Updating marketing email address -- bug 831466 d8918d3
@davidwboswell davidwboswell Bug 845476 - updating contact information on Get Involved form bf65fe7
@pmclanahan pmclanahan Merge pull request #652 from pmclanahan/bug-845476-contact-update-dav…
…idboswell

Bug 845476 contact update
546af1a
@pmclanahan pmclanahan Merge pull request #649 from cvan/preventDefault
do not preventDefault on links to Marketplace apps (bug 806930)
3078e34
Commits on Feb 27, 2013
@pmclanahan pmclanahan Merge pull request #650 from cvan/fireplace
rename "Mozilla Marketplace" to "Firefox Marketplace" everywhere (bug 841932)
14b20c9
@pmclanahan pmclanahan Bug 845476: Fix test for locale email CC. ff64dcf
@brianking brianking Bug 841324 : Email for el contribute form ce4c793
@pmclanahan pmclanahan Merge pull request #653 from brianking/contribute
Bug 841324 : Email for el contribute form
11cdfaa
Commits on Feb 28, 2013
@craigcook craigcook Merge pull request #617 from icaaq/bug-831994-html5shiv-main
added support for <main>
3a04241
@craigcook craigcook Merge pull request #622 from icaaq/main-on-new
Added <main role=main> around the main-content of the page
f028fad
@brianking brianking Bug 760823 : Email for hr contribute form 0ccf481
@sgarrity sgarrity Merge pull request #545 from sgarrity/jquery-tabzilla
For for adding jquery for tabzilla from mjschranz
5721251
@sgarrity sgarrity Merge pull request #517 from rossbruniges/bug-816561
Fix bug 816561 - making the ITU page ready for translations
1a5f80c
@craigcook craigcook Bug 842858 - styleguide updates
* Expanded FxOS branding page
* Added FxOS color page
* Added color values to Firefox and Mozilla color pages
* Misc copy updates in communications

FxOS promo materials page still pending, commented out for now but this commit includes the partial page
3ae7493
@Sancus Sancus [Fix Bug 846294] marketplace hero image breaks at mobile sizes 4fe5b46
@craigcook craigcook Fix bug 846537 - remove star ratings 8db3afc
@craigcook craigcook Merge pull request #620 from sgarrity/bug-837914-marketplace-button
Fix width of button in small layouts (Bug 837914)
9a61af5
@craigcook craigcook Merge pull request #658 from Sancus/master
[Fix Bug 846294] marketplace hero image breaks at mobile sizes
f25660d
@sgarrity sgarrity Merge pull request #656 from brianking/contribute
Bug 760823 : Email for hr contribute form
2cb3406
Commits on Mar 01, 2013
@sgarrity sgarrity Merge pull request #657 from craigcook/bug-842858-styleguide-updates
Bug 842858 - styleguide updates
9e0c1ce
@sgarrity sgarrity Bug 831798 Update theme on Firefox First Run page 63499c9
@craigcook craigcook Merge pull request #660 from sgarrity/bug-831798
Bug 831798 Update theme on Firefox First Run page
0537dd4
@craigcook craigcook Merge pull request #659 from craigcook/master
Bug 846537 - remove star ratings
6ac0594
Commits on Mar 03, 2013
@l-hedgehog Merge branch 'master' into merge-latest-playdoh
Conflicts:
	bedrock/firefox/tests.py
	bedrock/firefox/views.py
	bedrock/firefoxos/models.py
	bedrock/firefoxos/templates/firefoxos/faq.html
	bedrock/firefoxos/templates/firefoxos/firefoxos-base.html
	bedrock/firefoxos/templates/firefoxos/firefoxos.html
	bedrock/firefoxos/urls.py
	bedrock/settings/base.py
	bedrock/urls.py
72a6e1e
@l-hedgehog Merge branch 'master' into merge-latest-playdoh 5b0b771
@l-hedgehog move js files to subdirectories of media/js fe176d6