Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Django templating #32

Open
wants to merge 187 commits into
base: master
Choose a base branch
from
Open

Conversation

catcosmo
Copy link

@catcosmo catcosmo commented Jul 5, 2015

No description provided.

anjakammer and others added 30 commits April 15, 2015 16:54
added gitignore and modified manage.py
only translated heading and intro, not the actual examples
cut examples, press praise etc.
and translated the rest
…new nav, search, and footer, included custom css for those two pages, added jquery
paulahaertel and others added 27 commits June 24, 2015 20:49
…breadcrumbs. not tested yet bc not running
…sdiffs into DjangoTemplating

Conflicts:
	website/frontend/templates/suchergebnisse.html
Why "About NewsDiffsDE?"? Be confident! "About NewsDiffsDE" :)
…ls) and aligned it, so it is not apart from everything else
…ontent a' from custom.css was favoured over custom-cloud stuff)
@ecprice
Copy link
Owner

ecprice commented Jul 7, 2015

Wouldn't this turn the website into the german version, including translating the website?

I'd be happy to upstream what's actually relevant, though.

@paupowpow
Copy link

Yes, you're absolutely right! It seems this was an accidental pull request, as the github interface can be a bit tricky... and we are not able to delete our pull request, either. Please feel free to delete this pull request and the one before. Thanks for noticing!

@Relana Relana deleted the DjangoTemplating branch July 27, 2015 12:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants