django installation
adding django toolbar
adding reqs.txt
Merge pull request #1 from ercchy/master

There is new Django 1.6 inhere
added basic template pages and removed db
Merge pull request #2 from ialja/master

added basic template pages and removed db
adding static folder
static folder, dummy content and pure css added

Starting with some dummy content for the main and add pages, linked Pure CSS, added a static folder with favicon and custom CSS
Merge pull request #3 from ialja/master

static folder, dummy content and pure css added
merging upstream and adding social auth
Conflicts:
	codeweekeu/codeweekeu/settings.py
	codeweekeu/codeweekeu/urls.py
	codeweekeu/web/templates/base.html
Squashed commit of the following:

commit 882abb4aa33d000612ad8e3ec167a79156994a39
Author: ercchy <erika@serox.si>
Date:   Fri Feb 14 14:33:52 2014 +0100

    adding gravatar

commit b5bb71399659cfeb36ea75891b304a46dfc6ca2f
Author: ercchy <erika@serox.si>
Date:   Fri Feb 14 13:59:18 2014 +0100

    adding social login

commit bbcaf6d07808e4c61802a988dfbf145b7f11e208
Author: ercchy <erika@serox.si>
Date:   Fri Feb 14 11:32:02 2014 +0100

    merging master

commit 9a9af79238ba0647925692b4f89f77f29924b91b
Merge: 558acaf 31acea5
Author: ercchy <erika@serox.si>
Date:   Fri Feb 14 11:09:50 2014 +0100

    Merge branch 'master' of github.com:codeeu/coding-events into social_login

    Conflicts:
    	codeweekeu/web/templates/base.html

commit 31acea549f5d7bb0aed347ecfa9ee1ef0b8d2afb
Merge: d44a382 e5c3a71
Author: Alja Isakovic <ialja@me.com>
Date:   Fri Feb 14 11:05:08 2014 +0100

    Merge pull request #3 from ialja/master

    static folder, dummy content and pure css added

commit e5c3a712c3d45f378afd8caf59751730c863b7ea
Author: Alja Isakovic <ialja@me.com>
Date:   Fri Feb 14 11:01:52 2014 +0100

    static folder, dummy content and pure css added

    Starting with some dummy content for the main and add pages, linked Pure CSS, added a static folder with favicon and custom CSS

commit 558acaf881350be87e0250aa9a5cf30054ca63fb
Author: ercchy <erika@serox.si>
Date:   Fri Feb 14 00:09:55 2014 +0100

    working on social logins

commit 137d366f97c2a2c9620ad3910f970197bd8aa52b
Merge: 02a996d d44a382
Author: ercchy <erika@serox.si>
Date:   Fri Feb 14 00:07:15 2014 +0100

    Merge branch 'master' of github.com:codeeu/coding-events into social_login

    Conflicts:
    	codeweekeu/web/templates/base.html

commit 02a996d1eb00ba3dac1cce41085702bdc5302f73
Author: ercchy <erika@serox.si>
Date:   Fri Feb 14 00:03:56 2014 +0100

    adding social login

commit 5bf019caf1bca90d2ed8711db6887840ad4c3c4b
Author: ercchy <erika@serox.si>
Date:   Fri Feb 14 00:02:43 2014 +0100

    adding social login

commit ba4ea9a7552a49728aedac4788bae75f8cc7f907
Author: ercchy <erika@serox.si>
Date:   Fri Feb 14 00:02:00 2014 +0100

    adding settings local to ignore
worjing on avatar
cleaning up
cleaning up
basic add event form added

created a django form based on proposed models; currently it doesn't post any data, just redirects the user to thankyou page after submitting
Merge pull request #5 from ialja/master

basic add event form added
definition of models
Merge pull request #6 from Konviser/master

Definition of models
add and view event pages now working

The add form actually saves to database, view displays event data. Still missing dango-taggit support for tag field and the ability to display pictures. Run syncdb before testing.
Merge pull request #7 from ialja/master

add and view event pages now working