[Phpmyadmin-devel] Merging grid editing

[Marc Delisle]

Aris Feryanto a écrit :
> Hi Marc,
> 
>> From: Marc Delisle <marc at infomarc.info>
> 
>> Aris, I would like to merge this feature but I get merge conflicts,
>> can you have a look at this?
>> 
> 
> I just fixed the merge conflict in my master branch. Kindly merge the
> grid editing from there. The master branch also contain some fix for
> recent tables and configuration for qTip hint. Thanks.

Done.
> 
> Btw, I'm currently refactoring and cleaning code in js/makegrid.js
> and there will be a significant code structure changes in that file.
> I'll update you once it is finished.

OK.

-- 
Marc Delisle
http://infomarc.info