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.

Sign up for GitHub

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

Jump to bottom

Django templating #32

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

Django templating #32

wants to merge 187 commits into from

Commits on Apr 15, 2015

  1. added gitignore and modified manage.py

    @anjakammer
    anjakammer committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    573fc22 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from NewsdiffsDE/Setup/Project 

    added gitignore and modified manage.py
    @thomaspuppe
    thomaspuppe committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    c6e220e View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2015

  1. translated article_history_missing.html

    @Relana
    Relana committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    674ef0a View commit details
    Browse the repository at this point in the history

  2. Update 404.html

    @Relana
    Relana committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    b1d1b7c View commit details
    Browse the repository at this point in the history

  3. translated 500.html

    @Relana
    Relana committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    5f49eb0 View commit details
    Browse the repository at this point in the history

  4. translated about.html

    @Relana
    Relana committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    6082ecd View commit details
    Browse the repository at this point in the history

  5. translated article_history.html

    @Relana
    Relana committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    1ca3ea8 View commit details
    Browse the repository at this point in the history

  6. translated article_history.xml

    @Relana
    Relana committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    7abf9ca View commit details
    Browse the repository at this point in the history

  7. translated browse.html

    @Relana
    Relana committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    89e4aad View commit details
    Browse the repository at this point in the history

  8. translated browse_base.html

    @Relana
    Relana committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    416b2e7 View commit details
    Browse the repository at this point in the history

  9. translated contact.html

    @Relana
    Relana committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    e600556 View commit details
    Browse the repository at this point in the history

  10. translated diffview.html

    @Relana
    Relana committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    9ba5037 View commit details
    Browse the repository at this point in the history

  11. translated part of examples.html 

    only translated heading and intro, not the actual examples
    @Relana
    Relana committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    336fed6 View commit details
    Browse the repository at this point in the history

  12. translated feed.xml

    @Relana
    Relana committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    518efb0 View commit details
    Browse the repository at this point in the history

  13. translated find_by_uri.html

    @Relana
    Relana committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    7d79ccd View commit details
    Browse the repository at this point in the history

  14. edited front.html 

    cut examples, press praise etc.
and translated the rest
    @Relana
    Relana committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    6e0bd13 View commit details
    Browse the repository at this point in the history

  15. translated navigation

    @Relana
    Relana committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    10afc18 View commit details
    Browse the repository at this point in the history

  16. translated upvote.html

    @Relana
    Relana committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    14f67a4 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2015

  1. minor changes like href fixes

    @Relana
    Relana committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    28d69ca View commit details
    Browse the repository at this point in the history

  2. corrected Twitterhandle and url

    @Relana
    Relana committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    1fd2e30 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2015

  1. deleted images in about and front

    @Relana
    Relana committed May 1, 2015
    Configuration menu
    Copy the full SHA
    5b142d1 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2015

  1. corrected some links, deleted unused pages/routing

    @anjakammer
    anjakammer committed May 4, 2015
    Configuration menu
    Copy the full SHA
    0ddf9e0 View commit details
    Browse the repository at this point in the history

  2. deleted unused links

    @anjakammer
    anjakammer committed May 4, 2015
    Configuration menu
    Copy the full SHA
    d1004ed View commit details
    Browse the repository at this point in the history

  3. deleted contactForm script

    @anjakammer
    anjakammer committed May 4, 2015
    Configuration menu
    Copy the full SHA
    0655d21 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3 from NewsdiffsDE/Frontend/ContentTranslation 

    Frontend/content translation
    @anjakammer
    anjakammer committed May 4, 2015
    Configuration menu
    Copy the full SHA
    9caa86b View commit details
    Browse the repository at this point in the history

Commits on May 6, 2015

  1. added static HTML templates

    @PashGit
    PashGit committed May 6, 2015
    Configuration menu
    Copy the full SHA
    8c3069b View commit details
    Browse the repository at this point in the history

  2. Fixed stylesheet link in html files

    @PashGit
    PashGit committed May 6, 2015
    Configuration menu
    Copy the full SHA
    0bb521e View commit details
    Browse the repository at this point in the history

Commits on May 7, 2015

  1. modified article-list-page and made diff-list-page to include paulas … 

    …new nav, search, and footer, included custom css for those two pages, added jquery
    @Relana
    Relana committed May 7, 2015
    Configuration menu
    Copy the full SHA
    063461e View commit details
    Browse the repository at this point in the history

  2. some major changes in htmls, minor in css

    @Relana
    Relana committed May 7, 2015
    Configuration menu
    Copy the full SHA
    72bdf07 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2015

  1. included new index and custom, and old bootstrap

    @Relana
    Relana committed May 8, 2015
    Configuration menu
    Copy the full SHA
    a99f94b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #6 from NewsdiffsDE/Frontend/Static-HTML-Templates… 

    …_article-and-diff-list-pages

Frontend/static html templates article and diff list pages
    paulahaertel committed May 8, 2015
    Configuration menu
    Copy the full SHA
    1bf663c View commit details
    Browse the repository at this point in the history

  3. added colspan for header and footer; changed side-margins for #search… 

    …-bar and #description to auto
    @Relana
    Relana committed May 8, 2015
    Configuration menu
    Copy the full SHA
    e027f8d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'Frontend/Static-HTML-Templates' of https://github.com/N… 

    …ewsdiffsDE/newsdiffs into Frontend/Static-HTML-Templates
    paulahaertel committed May 8, 2015
    Configuration menu
    Copy the full SHA
    0d008b6 View commit details
    Browse the repository at this point in the history

  5. made everything in footer white

    @Relana
    Relana committed May 8, 2015
    Configuration menu
    Copy the full SHA
    0407f4f View commit details
    Browse the repository at this point in the history

  6. Merge branch 'Frontend/Static-HTML-Templates' of https://github.com/N… 

    …ewsdiffsDE/newsdiffs into Frontend/Static-HTML-Templates
    paulahaertel committed May 8, 2015
    Configuration menu
    Copy the full SHA
    b385d7b View commit details
    Browse the repository at this point in the history

  7. changed small things

    @Relana
    Relana committed May 8, 2015
    Configuration menu
    Copy the full SHA
    f23eed0 View commit details
    Browse the repository at this point in the history

  8. added article details html file

    @PashGit
    PashGit committed May 8, 2015
    Configuration menu
    Copy the full SHA
    ac8c7d2 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'Frontend/Static-HTML-Templates' of https://github.com/N… 

    …ewsdiffsDE/newsdiffs into Frontend/Static-HTML-Templates
    @PashGit
    PashGit committed May 8, 2015
    Configuration menu
    Copy the full SHA
    1b00752 View commit details
    Browse the repository at this point in the history

  10. Added social media icons

    @PashGit
    PashGit committed May 8, 2015
    Configuration menu
    Copy the full SHA
    8af1557 View commit details
    Browse the repository at this point in the history

  11. Added html and css file for Article display

    @PashGit
    PashGit committed May 8, 2015
    Configuration menu
    Copy the full SHA
    9d716a4 View commit details
    Browse the repository at this point in the history

  12. Added compare and archive icons

    @PashGit
    PashGit committed May 8, 2015
    Configuration menu
    Copy the full SHA
    19e8e7b View commit details
    Browse the repository at this point in the history

Commits on May 10, 2015

  1. Merge branch 'Frontend/Static-HTML-Templates' of https://github.com/N… 

    …ewsdiffsDE/newsdiffs into Frontend/Static-HTML-Templates
    paulahaertel committed May 10, 2015
    Configuration menu
    Copy the full SHA
    df1b67b View commit details
    Browse the repository at this point in the history

  2. add stylesheet for anything related to searchbar

    paulahaertel committed May 10, 2015
    Configuration menu
    Copy the full SHA
    bc771b7 View commit details
    Browse the repository at this point in the history

  3. add folder for images related to searchbar

    paulahaertel committed May 10, 2015
    Configuration menu
    Copy the full SHA
    2045afc View commit details
    Browse the repository at this point in the history

  4. Edited Logo font

    @PashGit
    PashGit committed May 10, 2015
    Configuration menu
    Copy the full SHA
    144e202 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2015

  1. Please enter the commit message for your changes. Lines startin

    paulahaertel committed May 12, 2015
    Configuration menu
    Copy the full SHA
    cbc07ea View commit details
    Browse the repository at this point in the history

  2. set size of items in searchbar

    @anjakammer
    anjakammer committed May 12, 2015
    Configuration menu
    Copy the full SHA
    8d08cab View commit details
    Browse the repository at this point in the history

  3. foldout under input

    @anjakammer
    anjakammer committed May 12, 2015
    Configuration menu
    Copy the full SHA
    59d5cac View commit details
    Browse the repository at this point in the history

  4. inserted rows

    @anjakammer
    anjakammer committed May 12, 2015
    Configuration menu
    Copy the full SHA
    7ae8c68 View commit details
    Browse the repository at this point in the history

  5. checked logic

    @anjakammer
    anjakammer committed May 12, 2015
    Configuration menu
    Copy the full SHA
    73ad5ce View commit details
    Browse the repository at this point in the history

  6. Added Buttons on Article Page for prior and next version

    @PashGit
    PashGit committed May 12, 2015
    Configuration menu
    Copy the full SHA
    4e39c75 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2015

  1. changes on article-list and diff-list html and css, and smaller icons

    @Relana
    Relana committed May 13, 2015
    Configuration menu
    Copy the full SHA
    f48e6d2 View commit details
    Browse the repository at this point in the history

  2. cleaned up article-list and diff-list htmls

    @Relana
    Relana committed May 13, 2015
    Configuration menu
    Copy the full SHA
    c6639ae View commit details
    Browse the repository at this point in the history

Commits on May 14, 2015

  1. fixed HTML syntax errors

    @thomaspuppe
    thomaspuppe committed May 14, 2015
    Configuration menu
    Copy the full SHA
    9aa7eec View commit details
    Browse the repository at this point in the history

  2. layout with nav, content, sticky footer

    @thomaspuppe
    thomaspuppe committed May 14, 2015
    Configuration menu
    Copy the full SHA
    2b5f428 View commit details
    Browse the repository at this point in the history

  3. nav styling

    @thomaspuppe
    thomaspuppe committed May 14, 2015
    Configuration menu
    Copy the full SHA
    cc72f38 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2015

  1. use not-fixed-to-top-navbar in index.html, delete searchbar content f… 

    …rom custom.css and put it in custom-searchbar.css, modify searchbar code in index.html, create a javascript file for foldout-effect
    paulahaertel committed May 15, 2015
    Configuration menu
    Copy the full SHA
    3d63ead View commit details
    Browse the repository at this point in the history

Commits on May 16, 2015

  1. remove unwanted navbar-fixed-top class

    @thomaspuppe
    thomaspuppe committed May 16, 2015
    Configuration menu
    Copy the full SHA
    194e967 View commit details
    Browse the repository at this point in the history

  2. added explanation for Bootstrap Grid Layout

    @thomaspuppe
    thomaspuppe committed May 16, 2015
    Configuration menu
    Copy the full SHA
    f5ae3f4 View commit details
    Browse the repository at this point in the history

  3. added explanation for article list pages

    @thomaspuppe
    thomaspuppe committed May 16, 2015
    Configuration menu
    Copy the full SHA
    bd3c79b View commit details
    Browse the repository at this point in the history

Commits on May 18, 2015

  1. Update ND_2015-05-14_frontent-review.md

    @Relana
    Relana committed May 18, 2015
    Configuration menu
    Copy the full SHA
    c81c75e View commit details
    Browse the repository at this point in the history

Commits on May 22, 2015

  1. delete text below search bar and adjusted search bar width

    paulahaertel committed May 22, 2015
    Configuration menu
    Copy the full SHA
    5278e1a View commit details
    Browse the repository at this point in the history

Commits on May 23, 2015

  1. adjusted search bar details, tried out new logo, tried out different … 

    …menu order, fixed small things
    paulahaertel committed May 23, 2015
    Configuration menu
    Copy the full SHA
    f6999ad View commit details
    Browse the repository at this point in the history

  2. added borders to menu for topic grouping

    paulahaertel committed May 23, 2015
    Configuration menu
    Copy the full SHA
    c795129 View commit details
    Browse the repository at this point in the history

  3. made technical and visual improvements on border: no accidental pixel… 

    … shift because all elements have border; aand smaller border
    paulahaertel committed May 23, 2015
    Configuration menu
    Copy the full SHA
    6e62889 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2015

  1. deleted navbar-fixed-top in list-htmls

    @Relana
    Relana committed May 25, 2015
    Configuration menu
    Copy the full SHA
    f32f88a View commit details
    Browse the repository at this point in the history

  2. filled list-htmls with 'real' content

    @Relana
    Relana committed May 25, 2015
    Configuration menu
    Copy the full SHA
    e7b377e View commit details
    Browse the repository at this point in the history

  3. changed button tags to a tags for Quellen, Vergleichen, Artikelverlau… 

    …f in list-htmls
    @Relana
    Relana committed May 25, 2015
    Configuration menu
    Copy the full SHA
    39b6352 View commit details
    Browse the repository at this point in the history

  4. changed another button tag to a tag in diff-list-html

    @Relana
    Relana committed May 25, 2015
    Configuration menu
    Copy the full SHA
    7f161a6 View commit details
    Browse the repository at this point in the history

  5. added correct links to source a-tags

    @Relana
    Relana committed May 25, 2015
    Configuration menu
    Copy the full SHA
    6b7fc08 View commit details
    Browse the repository at this point in the history

  6. deleted seperate column for 'Zeitungen/Quelle', put link to newssite … 

    …in parenthesis instead (as requested in ND_2015-05-14_frontent-review 2d)
    @Relana
    Relana committed May 25, 2015
    Configuration menu
    Copy the full SHA
    81d9606 View commit details
    Browse the repository at this point in the history

  7. changed structure a little in diff-list

    @Relana
    Relana committed May 25, 2015
    Configuration menu
    Copy the full SHA
    027029c View commit details
    Browse the repository at this point in the history

  8. Merge pull request #13 from NewsdiffsDE/Frontend/Static-HTML-Template… 

    …s-Fixes

Frontend/static html templates fixes
    @PashGit
    PashGit committed May 25, 2015
    Configuration menu
    Copy the full SHA
    aa19fe4 View commit details
    Browse the repository at this point in the history

  9. added faq page, added contact page with submit form

    @PashGit
    PashGit committed May 25, 2015
    Configuration menu
    Copy the full SHA
    ae22c1a View commit details
    Browse the repository at this point in the history

  10. removed ul- and li-tags in table (as requested in ND_2015-05-14_front… 

    …ent-review 2d) and changed css accordingly
    @Relana
    Relana committed May 25, 2015
    Configuration menu
    Copy the full SHA
    9808381 View commit details
    Browse the repository at this point in the history

  11. changed some margins, paddings etc. in article-list-page

    @Relana
    Relana committed May 25, 2015
    Configuration menu
    Copy the full SHA
    1c1a81a View commit details
    Browse the repository at this point in the history

Commits on May 27, 2015

  1. used only 5 menu items in index.html and highlights.html

    paulahaertel committed May 27, 2015
    Configuration menu
    Copy the full SHA
    d2ed002 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2015

  1. removed buttons in table, removed some margins

    @Relana
    Relana committed May 31, 2015
    Configuration menu
    Copy the full SHA
    9d71bc9 View commit details
    Browse the repository at this point in the history

  2. made diff table resposive with bootstrap class

    @Relana
    Relana committed May 31, 2015
    Configuration menu
    Copy the full SHA
    4a3864d View commit details
    Browse the repository at this point in the history

  3. assimilated diff-list to article-list a bit

    @Relana
    Relana committed May 31, 2015
    Configuration menu
    Copy the full SHA
    3ad9c9f View commit details
    Browse the repository at this point in the history

  4. changed hrefs, corrected icon association

    @Relana
    Relana committed May 31, 2015
    Configuration menu
    Copy the full SHA
    7894690 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2015

  1. css with @media query and removed table-responsive class from diff-li… 

    …st table to get line breaks (no side scrolling)
    @Relana
    Relana committed Jun 2, 2015
    Configuration menu
    Copy the full SHA
    5892246 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2015

  1. changed console.log statement in the javascript file

    paulahaertel committed Jun 3, 2015
    Configuration menu
    Copy the full SHA
    b820e07 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #14 from NewsdiffsDE/Frontend/Static-HTML-Template… 

    …s-Fixes

Frontend/static html templates fixes
    paulahaertel committed Jun 3, 2015
    Configuration menu
    Copy the full SHA
    f1e7337 View commit details
    Browse the repository at this point in the history

  3. icons in links are no longer underlined on :hover

    @Relana
    Relana committed Jun 3, 2015
    Configuration menu
    Copy the full SHA
    8a97fd2 View commit details
    Browse the repository at this point in the history

  4. added javascript snippet to listen on click of category links - does … 

    …not work yet
    paulahaertel committed Jun 3, 2015
    Configuration menu
    Copy the full SHA
    2a235a5 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2015

  1. add foldout functionality to search bar - not 100% done yet

    paulahaertel committed Jun 5, 2015
    Configuration menu
    Copy the full SHA
    a449bce View commit details
    Browse the repository at this point in the history

  2. shift placeholder text to the right, change colors of foldout links

    paulahaertel committed Jun 5, 2015
    Configuration menu
    Copy the full SHA
    917dcd9 View commit details
    Browse the repository at this point in the history

  3. add footer hover color, add general link color settings

    paulahaertel committed Jun 5, 2015
    Configuration menu
    Copy the full SHA
    c66b8e8 View commit details
    Browse the repository at this point in the history

  4. add home link to logo

    paulahaertel committed Jun 5, 2015
    Configuration menu
    Copy the full SHA
    8755725 View commit details
    Browse the repository at this point in the history

  5. change link color back to blue

    paulahaertel committed Jun 5, 2015
    Configuration menu
    Copy the full SHA
    6b0c59a View commit details
    Browse the repository at this point in the history

  6. add about page including sections Einführung, F.A.Q. and Presse - no … 

    …scrolling yet
    paulahaertel committed Jun 5, 2015
    Configuration menu
    Copy the full SHA
    0fb8c56 View commit details
    Browse the repository at this point in the history

  7. add styling for about page

    paulahaertel committed Jun 5, 2015
    Configuration menu
    Copy the full SHA
    8355ac0 View commit details
    Browse the repository at this point in the history

  8. try out solution for toggled navbar problem, add about page link to menu

    paulahaertel committed Jun 5, 2015
    Configuration menu
    Copy the full SHA
    c6f2e4d View commit details
    Browse the repository at this point in the history

  9. align page content with header and footer

    paulahaertel committed Jun 5, 2015
    Configuration menu
    Copy the full SHA
    b7938fd View commit details
    Browse the repository at this point in the history

  10. moved description css to into custom-searchbar.css

    paulahaertel committed Jun 5, 2015
    Configuration menu
    Copy the full SHA
    610c95c View commit details
    Browse the repository at this point in the history

  11. add margin to description because container is now container-fluid

    paulahaertel committed Jun 5, 2015
    Configuration menu
    Copy the full SHA
    bcbf8ad View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2015

  1. changed bottom margin of searchbar

    paulahaertel committed Jun 8, 2015
    Configuration menu
    Copy the full SHA
    c4a022e View commit details
    Browse the repository at this point in the history

  2. changed nothing

    paulahaertel committed Jun 8, 2015
    Configuration menu
    Copy the full SHA
    17f6ded View commit details
    Browse the repository at this point in the history

  3. deleted description text

    paulahaertel committed Jun 8, 2015
    Configuration menu
    Copy the full SHA
    244ceb1 View commit details
    Browse the repository at this point in the history

  4. implemented smooth scrolling and submenu - submenu to be discussed

    paulahaertel committed Jun 8, 2015
    Configuration menu
    Copy the full SHA
    5e914d1 View commit details
    Browse the repository at this point in the history

  5. styled submenu, optimized section height, took away section coloring

    paulahaertel committed Jun 8, 2015
    Configuration menu
    Copy the full SHA
    a3fb714 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2015

  1. detected unused css rules

    paulahaertel committed Jun 15, 2015
    Configuration menu
    Copy the full SHA
    c465ea0 View commit details
    Browse the repository at this point in the history

  2. used consistent container, put menu in own container and added a row

    paulahaertel committed Jun 15, 2015
    Configuration menu
    Copy the full SHA
    bad2374 View commit details
    Browse the repository at this point in the history

  3. adjusted padding of logo

    paulahaertel committed Jun 15, 2015
    Configuration menu
    Copy the full SHA
    d5e1e43 View commit details
    Browse the repository at this point in the history

  4. deleted unused css rule

    paulahaertel committed Jun 15, 2015
    Configuration menu
    Copy the full SHA
    6b743e1 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2015

  1. views angepasst

    catcosmo authored and catcosmo committed Jun 17, 2015
    Configuration menu
    Copy the full SHA
    d04b476 View commit details
    Browse the repository at this point in the history

  2. views angepasst

    catcosmo authored and catcosmo committed Jun 17, 2015
    Configuration menu
    Copy the full SHA
    622a7e4 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2015

  1. moved html files to templates, static files to static folder

    catcosmo authored and catcosmo committed Jun 18, 2015
    Configuration menu
    Copy the full SHA
    aeb5091 View commit details
    Browse the repository at this point in the history

  2. created headerfooter html for templating

    catcosmo authored and catcosmo committed Jun 18, 2015
    Configuration menu
    Copy the full SHA
    34ed007 View commit details
    Browse the repository at this point in the history

  3. built on headerfooter, created favicon

    catcosmo authored and catcosmo committed Jun 18, 2015
    Configuration menu
    Copy the full SHA
    ffb866f View commit details
    Browse the repository at this point in the history

  4. integrated sticky footer styles into custom css

    @Relana
    Relana committed Jun 18, 2015
    Configuration menu
    Copy the full SHA
    381f705 View commit details
    Browse the repository at this point in the history

  5. added images regex url

    @Relana
    Relana committed Jun 18, 2015
    Configuration menu
    Copy the full SHA
    aa62038 View commit details
    Browse the repository at this point in the history

  6. added fav, image functionality test

    catcosmo authored and catcosmo committed Jun 18, 2015
    Configuration menu
    Copy the full SHA
    99147d6 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new… 

    …sdiffs into DjangoTemplating
    catcosmo authored and catcosmo committed Jun 18, 2015
    Configuration menu
    Copy the full SHA
    728db10 View commit details
    Browse the repository at this point in the history

  8. tried something else with the img url

    @Relana
    Relana committed Jun 18, 2015
    Configuration menu
    Copy the full SHA
    326e9cf View commit details
    Browse the repository at this point in the history

  9. images source reference in headerfooter equivalent to styles references

    @Relana
    Relana committed Jun 18, 2015
    Configuration menu
    Copy the full SHA
    70bf69f View commit details
    Browse the repository at this point in the history

  10. functional templates for header footer and index content

    catcosmo authored and catcosmo committed Jun 18, 2015
    Configuration menu
    Copy the full SHA
    8defb90 View commit details
    Browse the repository at this point in the history

  11. entdecken template created and adjusted in views/urls

    catcosmo authored and catcosmo committed Jun 18, 2015
    Configuration menu
    Copy the full SHA
    9c44c73 View commit details
    Browse the repository at this point in the history

  12. templated diff-list-page

    @Relana
    Relana committed Jun 18, 2015
    Configuration menu
    Copy the full SHA
    cd84f75 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new… 

    …sdiffs into DjangoTemplating
    @Relana
    Relana committed Jun 18, 2015
    Configuration menu
    Copy the full SHA
    ff10271 View commit details
    Browse the repository at this point in the history

  14. complete django templating for main menue pages

    catcosmo authored and catcosmo committed Jun 18, 2015
    Configuration menu
    Copy the full SHA
    598fdb8 View commit details
    Browse the repository at this point in the history

  15. uniforming of links and variables

    catcosmo authored and catcosmo committed Jun 18, 2015
    Configuration menu
    Copy the full SHA
    9b6e18a View commit details
    Browse the repository at this point in the history

  16. Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new… 

    …sdiffs into DjangoTemplating
    catcosmo authored and catcosmo committed Jun 18, 2015
    Configuration menu
    Copy the full SHA
    c94a23e View commit details
    Browse the repository at this point in the history

  17. renamed diff-list to article_history in all files

    @Relana
    Relana committed Jun 18, 2015
    Configuration menu
    Copy the full SHA
    edf80b2 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new… 

    …sdiffs into DjangoTemplating
    @Relana
    Relana committed Jun 18, 2015
    Configuration menu
    Copy the full SHA
    358f160 View commit details
    Browse the repository at this point in the history

  19. 'outsourced' the searchbar into an html of its own

    @Relana
    Relana committed Jun 18, 2015
    Configuration menu
    Copy the full SHA
    b06e23d View commit details
    Browse the repository at this point in the history

  20. article-hostory-missing template

    catcosmo authored and catcosmo committed Jun 18, 2015
    Configuration menu
    Copy the full SHA
    b0d0ab4 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2015

  1. fixed social media icons

    catcosmo authored and catcosmo committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    5f7d3d6 View commit details
    Browse the repository at this point in the history

  2. links underlined instead of blue

    catcosmo authored and catcosmo committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    98ea461 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2015

  1. start: trying to merge frontend and templates

    catcosmo authored and catcosmo committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    796ae1a View commit details
    Browse the repository at this point in the history

  2. url/view einbindung von kontakt/impressum. created impressum.html

    catcosmo authored and catcosmo committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    c774acc View commit details
    Browse the repository at this point in the history

  3. added mac relevant file name

    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    db22d97 View commit details
    Browse the repository at this point in the history

  4. merged css

    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    11f3dd4 View commit details
    Browse the repository at this point in the history

  5. included about text

    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    aa49e4e View commit details
    Browse the repository at this point in the history

  6. specified link coloring for more precision

    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    bcd37bb View commit details
    Browse the repository at this point in the history

  7. included heading and floated it with submenu

    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    6a06d84 View commit details
    Browse the repository at this point in the history

  8. added class

    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    7dcbb8c View commit details
    Browse the repository at this point in the history

  9. included heading, deleted searchbar, added maincontent class

    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    1d58a3a View commit details
    Browse the repository at this point in the history

  10. article is now diffview

    @Relana
    Relana committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    21aa1f6 View commit details
    Browse the repository at this point in the history

  11. url/view changes for unity

    catcosmo authored and catcosmo committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    bbf6a7a View commit details
    Browse the repository at this point in the history

  12. Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new… 

    …sdiffs into DjangoTemplating
    catcosmo authored and catcosmo committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    b6eb459 View commit details
    Browse the repository at this point in the history

  13. followed bootstrap convention, aligned header

    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    87e8bf3 View commit details
    Browse the repository at this point in the history

  14. styling for searchbar dropdown links: cursor, underline

    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    d2c6d6c View commit details
    Browse the repository at this point in the history

  15. Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new… 

    …sdiffs into DjangoTemplating
    catcosmo authored and catcosmo committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    950a17c View commit details
    Browse the repository at this point in the history

  16. url/view einbindung von suchergebnissen. anpassung srticle missing

    catcosmo authored and catcosmo committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    749a7e3 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new… 

    …sdiffs into DjangoTemplating

Merging because I need the integration of suchergebnisse.html into the templating model.
    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    1a84655 View commit details
    Browse the repository at this point in the history

  18. uncommented unneeded styling

    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    f508385 View commit details
    Browse the repository at this point in the history

  19. began with diffview template

    @Relana
    Relana committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    865d3ed View commit details
    Browse the repository at this point in the history

  20. Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new… 

    …sdiffs into DjangoTemplating
    @Relana
    Relana committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    a28d177 View commit details
    Browse the repository at this point in the history

  21. added endblock syntax and corrected icon links

    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    655f407 View commit details
    Browse the repository at this point in the history

  22. Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new… 

    …sdiffs into DjangoTemplating

Pulling changes from Cat/Relana
    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    70fcdea View commit details
    Browse the repository at this point in the history

  23. included search, corrected text

    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    dd3890e View commit details
    Browse the repository at this point in the history

  24. deleted unnecessary css link

    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    72ee430 View commit details
    Browse the repository at this point in the history

  25. updated from static

    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    0f080dc View commit details
    Browse the repository at this point in the history

  26. included css to avoid including it in the other html files

    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    b5aaee4 View commit details
    Browse the repository at this point in the history

  27. deleted margin because text is now below search bar

    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    7dd9d78 View commit details
    Browse the repository at this point in the history

  28. included search, updated from static

    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    deffde6 View commit details
    Browse the repository at this point in the history

  29. included search correctly, updated from static (align)

    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    5c1cb5b View commit details
    Browse the repository at this point in the history

  30. included search correctly, updated from static (align), changed title… 

    …, added text
    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    64ebd0c View commit details
    Browse the repository at this point in the history

  31. included search bar correctly, added breadcrumbs

    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    90ce710 View commit details
    Browse the repository at this point in the history

  32. included search bar correctly, updated from static (align), included … 

    …breadcrumbs. not tested yet bc not running
    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    c6040ee View commit details
    Browse the repository at this point in the history

  33. renamed css, updated from static (align), included search

    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    10e45c8 View commit details
    Browse the repository at this point in the history

  34. did basic set up for file

    paulahaertel committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    5df8219 View commit details
    Browse the repository at this point in the history

  35. url/view einbindung von diffview and article_history. update tazparser

    catcosmo authored and catcosmo committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    cb67164 View commit details
    Browse the repository at this point in the history

  36. Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new… 

    …sdiffs into DjangoTemplating

Conflicts:
	website/frontend/templates/suchergebnisse.html
    catcosmo authored and catcosmo committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    b8989b3 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2015

  1. included scroll javascript

    paulahaertel committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    b629763 View commit details
    Browse the repository at this point in the history

  2. updated icon links, made suchergebisse table responsive

    paulahaertel committed Jun 25, 2015
    Configuration menu
    Copy the full SHA
    4283b5c View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2015

  1. deleted the questionmark 

    Why "About NewsDiffsDE?"? Be confident! "About NewsDiffsDE" :)
    @Relana
    Relana committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    885a4c5 View commit details
    Browse the repository at this point in the history

  2. Moved static tagcloud to Templating branch, Modifications

    @PashGit
    PashGit committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    f0d6f43 View commit details
    Browse the repository at this point in the history

  3. Moved tagcloud css to Templating branch

    @PashGit
    PashGit committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    17bb956 View commit details
    Browse the repository at this point in the history

  4. fixed googleapi-links <- those do not need the django template langua… 

    …ge stuff around them
    @Relana
    Relana committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    4229444 View commit details
    Browse the repository at this point in the history

  5. included missing closing-div-tag

    @Relana
    Relana committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    8a3cf01 View commit details
    Browse the repository at this point in the history

  6. Changed tagcloud font colors to different shades of grey.

    @PashGit
    PashGit committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    67a7327 View commit details
    Browse the repository at this point in the history

  7. put social column on the right hand side (as it was in the static htm… 

    …ls) and aligned it, so it is not apart from everything else
    @Relana
    Relana committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    092adf3 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new… 

    …sdiffs into DjangoTemplating
    @Relana
    Relana committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    5a2ebf0 View commit details
    Browse the repository at this point in the history

  9. changed some selectors and removed border from a's in .cloud ('.mainc… 

    …ontent a' from custom.css was favoured over custom-cloud stuff)
    @Relana
    Relana committed Jun 26, 2015
    Configuration menu
    Copy the full SHA
    42a8c5f View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2015

  1. added filter-column

    @Relana
    Relana committed Jun 27, 2015
    Configuration menu
    Copy the full SHA
    b28616c View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2015

  1. added link configuration for archiv

    paulahaertel committed Jun 28, 2015
    Configuration menu
    Copy the full SHA
    d2afc9d View commit details
    Browse the repository at this point in the history

  2. rearranged faq and integrated javascript

    paulahaertel committed Jun 28, 2015
    Configuration menu
    Copy the full SHA
    e343bd2 View commit details
    Browse the repository at this point in the history

  3. deleted empty statement

    paulahaertel committed Jun 28, 2015
    Configuration menu
    Copy the full SHA
    02ed5b0 View commit details
    Browse the repository at this point in the history

  4. added top identifier for about-scroll-function

    paulahaertel committed Jun 28, 2015
    Configuration menu
    Copy the full SHA
    d079925 View commit details
    Browse the repository at this point in the history

  5. separated image from link for css styling

    paulahaertel committed Jun 28, 2015
    Configuration menu
    Copy the full SHA
    f631fe3 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'DjangoTemplating' of https://github.com/NewsdiffsDE/new… 

    …sdiffs into DjangoTemplating
    paulahaertel committed Jun 28, 2015
    Configuration menu
    Copy the full SHA
    68b5fb3 View commit details
    Browse the repository at this point in the history

  7. Added categories filter html to Discover

    @PashGit
    PashGit committed Jun 28, 2015
    Configuration menu
    Copy the full SHA
    0d6fe4e View commit details
    Browse the repository at this point in the history

  8. Added required css classes for categories filter

    @PashGit
    PashGit committed Jun 28, 2015
    Configuration menu
    Copy the full SHA
    eda691c View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2015

  1. safely deleted unused css styling

    paulahaertel committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    92ac9f1 View commit details
    Browse the repository at this point in the history