From: Vincent Zanotti Date: Thu, 30 Jul 2009 15:18:25 +0000 (+0200) Subject: Merge branch 'master' into fusionax X-Git-Tag: xorg/1.0.0~332^2~313^2~4 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=8a43972f58f0a77015ae9e509f1c073d188874d2;p=platal.git Merge branch 'master' into fusionax Conflicts: ChangeLog Signed-off-by: Vincent Zanotti --- 8a43972f58f0a77015ae9e509f1c073d188874d2 diff --cc ChangeLog index d3ea9c1,c95d381..897a582 --- a/ChangeLog +++ b/ChangeLog @@@ -1,23 -1,10 +1,28 @@@ ================================================================================ +VERSION 0.f.0 XX XX XXXX + +New: + * Core: + - Centralises email management through an email combobox -JAC + +Bug/Wish: + * Profile: + - #16, #528, #917: Changes job interface, updates business sectors -JAC + - #188: Adds informations about the Corps d'État -JAC + - #209: Thoroughly changes education's implementation -JAC + - #373: User now chooses the name we use to talk to him/her -JAC + - #386: Adds the possibility to fill in multiple nationalities -JAC + - #443: Adds concept of ordinary firstname -JAC + - #450: Adds marital name, thus ordinary name can be any name -JAC + - #891: Improves education display -JAC + +================================================================================ - VERSION 0.10.1 XX XX XXXX + VERSION 0.10.2 XX XX XXXX + + New: + + ================================================================================ + VERSION 0.10.1 30 07 2009 New: