Fixes bestalias update when two local_part are identical (Closes #1517).
[platal.git] / modules / fusionax /
2011-05-02 Stéphane JacobMerge branch 'xorg/maint' into xorg/master
2011-04-25 Stéphane JacobAdapts merge to properly take into account M/D.
2011-04-23 Stéphane JacobUpdates education merge script.
2011-03-14 Stéphane JacobMerge branch 'xorg/master' into xorg/f/xnet-accounts
2011-02-12 Florent BruneauMerge remote branch 'origin/xorg/maint' into xorg/master
2011-02-09 Stéphane JacobUpdates formatting of AX education...
2011-01-16 Florent BruneauMerge branch 'xorg/1.0.2/master' into xorg/master
2011-01-16 Florent BruneauMerge branch 'xorg/maint' into xorg/1.0.2/master
2011-01-09 Stéphane JacobAlso merges masters and doctorates info; XXX: to be...
2011-01-07 Stéphane JacobMerge branch 'xorg/master' into xorg/f/xnet-accounts
2011-01-02 Florent BruneauMerge remote branch 'origin/xorg/maint' into xorg/1...
2010-12-28 Florent BruneauMerge remote branch 'origin/xorg/maint' into xorg/1...
2010-12-28 Stéphane JacobMerge branch 'xorg/1.0.2/master'
2010-12-16 Florent BruneauMerge remote branch 'origin/xorg/maint' into xorg/1...
2010-12-13 Stéphane JacobRetrieves ax last modification date if more recent...
2010-12-12 Stéphane JacobFixes education inclusion.
2010-12-10 Stéphane JacobTrims corps before inserting them.
2010-11-02 Stéphane JacobMerge remote branch 'origin/platal-1.0.1'
2010-11-01 Stéphane JacobA few fixes in ax table creation (forces charset, incre...
2010-11-01 Stéphane JacobNew script for formatting AX education.
2010-10-26 Florent BruneauMerge remote branch 'origin/platal-1.0.1'
2010-10-25 Stéphane JacobPrevents joins in merge.php.
2010-10-25 Florent BruneauMerge remote branch 'origin/platal-1.0.0' into platal...
2010-10-25 Stéphane JacobFixes merge.php (it now works properly in a reasonable...
2010-10-24 Stéphane JacobA few fixes on how to deal with AX export.
2010-10-20 Stéphane JacobUpdates merge module.
2010-10-11 Florent BruneauMerge remote branch 'origin/platal-1.0.0'
2010-10-10 Florent BruneauMerge remote branch 'origin/platal-1.0.0'
2010-10-08 Stéphane JacobUpdates and improves code for Xorg/AX directory merge.
2010-10-03 Florent BruneauMerge branch 'platal-1.0.0'
2010-09-20 Stéphane JacobMerge remote branch 'origin/platal-1.0.0'
2010-09-17 Florent BruneauMerge branch 'platal-1.0.0'
2010-08-29 Stéphane JacobMerge remote branch 'origin/platal-1.0.0'
2010-08-22 Florent BruneauMerge remote branch 'origin/platal-1.0.0'
2010-08-14 Florent BruneauMerge branch 'platal-1.0.0'
2010-08-09 Stéphane JacobMerge remote branch 'origin/platal-1.0.0'
2010-08-09 Stéphane JacobMerge remote branch 'origin/platal-1.0.0'
2010-08-09 Stéphane JacobMerge remote branch 'origin/master' into xnet_accounts
2010-08-08 Stéphane JacobRemoves trailing spaces.
2010-05-21 Florent BruneauMerge remote branch 'origin/platal-0.10.2'
2010-05-17 Florent BruneauMerge branch 'platal-0.10.2'
2010-03-23 Raphaël BarroisMerge branch 'account'
2010-03-21 Florent BruneauMerge remote branch 'origin/master' into account
2010-02-28 Stéphane JacobMerge remote branch 'origin/master' into account
2010-02-14 Florent BruneauMerge commit 'origin/master' into account
2009-11-13 Vincent ZanottiMerge branch 'master' into account
2009-11-13 Stéphane JacobMerge commit 'origin/fusionax' into account
2009-11-13 Stéphane JacobMerge commit 'origin/master' into fusionax
2009-11-08 Stéphane JacobMerge commit 'origin/fusionax' into account
2009-11-07 Stéphane JacobMerge commit 'origin/master' into fusionax
2009-09-09 Stéphane JacobAdds IHEDN and CHEAr to the education list.
2009-08-28 Stéphane JacobMerge commit 'origin/master' into fusionax
2009-08-06 Vincent ZanottiMerge commit 'origin/master' into fusionax
2009-07-30 Vincent ZanottiMerge branch 'master' into fusionax
2009-07-20 Stéphane JacobMerge commit 'origin/master' into fusionax
2009-07-20 Stéphane JacobMerge commit 'origin/master' into fusionax
2009-04-30 Stéphane JacobMerge commit 'origin/master' into fusionax
2009-04-11 Vincent ZanottiMerge commit 'origin/master' into fusionax
2009-04-10 Vincent ZanottiMerge commit 'origin/master' into fusionax
2009-03-23 Stéphane JacobMerge commit 'origin/master' into fusionax
2009-03-04 Florent BruneauMerge commit 'origin/master' into fusionax
2009-02-22 Florent BruneauMerge commit 'origin/master' into fusionax
2009-02-16 Stéphane JacobMerge commit 'origin/master' into fusionax
2009-02-07 Florent BruneauMerge commit 'origin/master' into fusionax
2009-02-01 Florent BruneauMerge commit 'origin/master' into fusionax
2009-01-25 Florent BruneauMerge commit 'origin/master' into fusionax
2009-01-12 Florent BruneauMerge commit 'origin/master' into fusionax
2009-01-05 Florent BruneauMerge commit 'origin/master' into fusionax
2008-12-30 Florent BruneauMerge commit 'origin/master' into fusionax
2008-12-29 Florent BruneauMerge commit 'origin/master' into fusionax
2008-12-27 Florent BruneauMerge commit 'origin/master' into fusionax
2008-12-22 Florent BruneauMerge commit 'origin/master' into fusionax
2008-12-21 Florent BruneauMerge commit 'origin/master' into fusionax
2008-12-21 Florent BruneauMerge commit 'origin/master' into fusionax
2008-12-16 Stéphane JacobMerge commit 'origin/master' into fusionax
2008-12-13 Stéphane JacobMerge commit 'origin/master' into fusionax
2008-12-13 Stéphane JacobMerge commit 'origin/master' into fusionax
2008-12-07 Florent BruneauMerge commit 'origin/master' into fusionax
2008-11-23 Florent BruneauMerge commit 'origin/master' into fusionax
2008-11-16 Florent BruneauMerge commit 'origin/master' into fusionax
2008-11-15 Florent BruneauMerge commit 'origin/master' into fusionax
2008-11-14 Florent BruneauMerge commit 'origin/master' into fusionax
2008-10-23 Stéphane JacobMerge commit 'origin/master' into fusionax
2008-10-20 Stéphane JacobUpdates education and adapts AX data to merge them...
2008-10-19 Vincent ZanottiMerge commit 'origin/master' into fusionax
2008-10-19 Vincent ZanottiMerge commit 'origin/master' into fusionax
2008-10-07 Stéphane JacobMerge commit 'origin/master' into fusionax
2008-10-07 Stéphane JacobFinishes the interrelation of the id of both databases...
2008-09-29 Stéphane JacobSome fixes and updates.
2008-09-17 Stéphane JacobFixes a few errors.
2008-09-14 Stéphane JacobMerge commit 'origin/master' into fusionax
2008-09-14 Stéphane JacobUpdates fusionax scripts for better compliance and...
2008-09-12 Stéphane JacobUpdates fusionax scripts for better compliance.
2008-09-01 Stéphane JacobMerge commit 'origin/master' into fusionax
2008-08-21 Stéphane JacobMerge commit 'origin/master' into fusionax
2008-08-15 Florent BruneauMerge commit 'origin/master' into fusionax
2008-08-10 Stéphane JacobMerge commit 'origin/master' into fusionax
2008-08-10 Florent BruneauMerge commit 'origin/master' into fusionax
2008-07-22 Pascal CorpetMerge commit 'origin/master' into fusionax
2008-07-22 Pascal Corpetmerge with master
next