commit d0ace76e46e798d0c2e6b8222671a549828a67d8
Merge: 7855800 c544b89
Author: Yannick Berthoud <contact@VIVAFauneDesktop.local>
Date:   Mon Oct 31 11:33:10 2011 +0100

    Merge branch 'master' of ssh.alwaysdata.com:/home/vivafaune/git/vivafaune

commit 7855800197250af8699745fbc7d9d6aa83abb066
Author: Yannick Berthoud <contact@VIVAFauneDesktop.local>
Date:   Mon Oct 31 11:32:49 2011 +0100

    trying

commit c544b89dc9f81a04cdc8b2a3c491baf190a19fd7
Merge: 3085d11 6803f29
Author: vivafaune <vivafaune@mybox.(none)>
Date:   Mon Oct 31 11:17:44 2011 +0100

    Merge branch 'master' of /home/vivafaune/live/../git/vivafaune

    Conflicts:
    	.gitignore
    	settings.py

commit 3085d11a6e4cff9b706bec13167767917fd46202
Author: vivafaune <vivafaune@mybox.(none)>
Date:   Mon Oct 31 11:16:03 2011 +0100

    Make settings.py be the same everywhere.
    You will need to make a local private_settings.py with
    DATABASES =
    MEDIA_ROOT =
    MEDIA_URL =
    and anything else that changes between development and production.

commit 6803f2902c0d34ca8a6d909d64597264804126f7
Author: Yannick Berthoud <contact@VIVAFauneDesktop.local>
Date:   Mon Oct 31 10:39:06 2011 +0100

    New django-friends plugin + finished forms

commit ce7db98ec5492f4c4b6e89a49a00a323d5ca81c2
Author: Yannick Berthoud <contact@VIVAFauneDesktop.local>
Date:   Sun Oct 30 17:45:23 2011 +0100

    All form save/upload see the errors.txt

commit 760a794516c0f489c7c20f7aaa5fddfc59025cbc
Author: Yannick Berthoud <contact@VIVAFauneDesktop.local>
Date:   Sat Oct 29 03:51:27 2011 +0200

    Edit all forms and views related

commit 332f8a80ff1b2a7e4bf847ea4c7dde93cb4ff871
Author: Yannick Berthoud <contact@VIVAFauneDesktop.local>
Date:   Sat Oct 29 03:28:44 2011 +0200

    Multi Edit forms

commit df7e74afec98efaf0972ab91e78923a26666cf64
Author: Yannick Berthoud <contact@VIVAFauneDesktop.local>
Date:   Thu Oct 27 23:11:04 2011 +0200

    Configuring form for event, fiches, etc. see the rest of the errors.txt file

commit 997cb5fc747f36c9cf8c5ea73a7ca38212826156
Author: Yannick Berthoud <contact@iMac-de-Yannick-Berthoud.local>
Date:   Wed Oct 26 03:32:54 2011 +0200

    See the errors.txt

commit 6974cdc70bd13145c805971a4a55951ea341d62a
Author: Yannick Berthoud <contact@iMac-de-Yannick-Berthoud.local>
Date:   Tue Oct 25 16:18:23 2011 +0200

    new plugin: articles

commit 97f88c6649b5e957080177a0524758c0dd45cb59
Author: Yannick Berthoud <contact@iMac-de-Yannick-Berthoud.local>
Date:   Tue Oct 25 15:40:24 2011 +0200

    most corrections + add templatestag - see errors.txt

commit d07835efcb0dbedcc217d97dafe11ec5258e24b1
Author: Yannick Berthoud <contact@iMac-de-Yannick-Berthoud.local>
Date:   Mon Oct 24 10:10:19 2011 +0200

    x Modifs templates + annuaire

commit 29c9e04d77049c771467aafad203861729cb1416
Author: Yannick Berthoud <contact@iMac-de-Yannick-Berthoud.local>
Date:   Sat Oct 22 12:53:56 2011 +0200

    Add templates and vivaApp related

commit a883c725f171202ad1936ab1e34c3de10631919d
Author: Yannick Berthoud <contact@iMac-de-Yannick-Berthoud.local>
Date:   Fri Oct 21 12:49:19 2011 +0200

    Adding django-userena and configuring her template

commit 2efc01417a869b4e66b16d6caafa769054560367
Author: Yannick Berthoud <contact@iMac-de-Yannick-Berthoud.local>
Date:   Fri Oct 21 00:08:13 2011 +0200

    Add templates/css/picture editing tpl

commit a93f74342b9989d95fc540cdb1781ba87ec756c5
Author: Yannick Berthoud <contact@iMac-de-Yannick-Berthoud.local>
Date:   Wed Oct 19 16:15:15 2011 +0200

    Adding messages app

commit 6d0028464e0157c4e14138b796e1e25f324f5ea1
Author: Yannick Berthoud <contact@iMac-de-Yannick-Berthoud.local>
Date:   Wed Oct 19 15:45:44 2011 +0200

    Installing photologue

commit 4623fb3bfe43140d9815b5b07d25b62c8ee94769
Author: Yannick Berthoud <contact@iMac-de-Yannick-Berthoud.local>
Date:   Wed Oct 19 15:32:17 2011 +0200

    installed app friends - django-friends

commit f40337f47c599910b72b00804c460232a408477b
Author: Yannick Berthoud <contact@iMac-de-Yannick-Berthoud.local>
Date:   Wed Oct 19 14:50:02 2011 +0200

    TemplateTag Python Code Alpha

commit f0b4847474909eddfac281381bb29d685d0795e2
Author: Yannick Berthoud <contact@iMac-de-Yannick-Berthoud.local>
Date:   Wed Oct 19 13:48:05 2011 +0200

    Adding templates annuaire and petitesannonces

commit c394a7887c61a2af302dfa6178937b0e46deaa0f
Author: Yannick Berthoud <contact@iMac-de-Yannick-Berthoud.local>
Date:   Wed Oct 19 13:24:01 2011 +0200

    New apps: Annuaire

commit 9d920fad946d78521539bbb61468b7b9240e1087
Author: Yannick Berthoud <contact@iMac-de-Yannick-Berthoud.local>
Date:   Wed Oct 19 12:11:01 2011 +0200

    deleting bad path, add petitesannonces apps, editing divers file

commit 3b908c8b8645b7fd11714037fa931e9a4b9af197
Author: Yannick Berthoud <contact@iMac-de-Yannick-Berthoud.local>
Date:   Tue Oct 18 13:18:54 2011 +0200

    deleting userprofile

commit 9be65f8a8aed0adbe2fcc5307c2008d68abec75e
Author: Yannick Berthoud <contact@iMac-de-Yannick-Berthoud.local>
Date:   Tue Oct 18 13:14:16 2011 +0200

    refacto, using django-userena

commit 7178412647935d430ad66a95e16384f484023195
Author: Yannick Berthoud <contact@iMac-de-Yannick-Berthoud.local>
Date:   Fri Oct 14 13:40:43 2011 +0200

    first upload

commit 42c208c47faa2237f0394c2b27e6d9952bc83d7d
Author: cmjg <jang@ioctl.org>
Date:   Fri Oct 14 11:27:23 2011 +0100

    Checking in.

commit 6e616b9068668b5fe3ce3475aea405676f0d8b8e
Author: vivafaune <vivafaune@mybox.(none)>
Date:   Fri Oct 14 12:25:02 2011 +0200

    First go.