Updates merge scripts.
[platal.git] / upgrade / 1.0.1 / merge.php
2011-12-10 Stéphane JacobUpdates merge scripts.
2011-11-14 Stéphane JacobMore merge updates.
2011-10-26 Stéphane JacobMerge branch 'xorg/maint' into xorg/master
2011-10-24 Stéphane JacobMerge branch 'xorg/maint' into xorg/master
2011-10-24 Stéphane JacobAdds title to profiles.
2011-03-14 Stéphane JacobMerge branch 'xorg/master' into xorg/f/xnet-accounts
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-20 Stéphane JacobOoops
2010-12-20 Stéphane JacobDeals with unknown corps.
2010-12-17 Stéphane JacobGives mail flag to ax addresses.
2010-12-16 Florent BruneauMerge remote branch 'origin/xorg/maint' into xorg/1...
2010-12-13 Stéphane JacobFixes corps insertion.
2010-12-13 Stéphane JacobRetrieves ax last modification date if more recent...
2010-12-12 Stéphane JacobFixes education inclusion.
2010-12-12 Stéphane JacobFixes education and job inclusions.
2010-12-10 Stéphane JacobFixes job insertion.
2010-11-02 Stéphane JacobMerge remote branch 'origin/platal-1.0.1'
2010-11-01 Stéphane JacobPrevents empty education inclusions.
2010-10-26 Florent BruneauMerge remote branch 'origin/platal-1.0.1'
2010-10-26 Stéphane JacobFixes nationalities merge.
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-20 Stéphane JacobUpdates merge script: direct use of MySQL is much faste...
2010-10-16 Florent BruneauMerge remote branch 'origin/platal-1.0.1'
2010-10-15 Stéphane JacobMerge