[Phpmyadmin-devel] Merging GSoC branches
Hi all as the GSoC is almost over, it's time to start merging branches. The first one I'm about to merge is Lori Lee's tree. Any objections against merging it? The git repo is here: http://repo.or.cz/w/phpmyadmin/lorilee.git/shortlog/refs/heads/gsoc Demo here: http://demo.phpmyadmin.net/gsoc-lorilee/ -- Michal Čihař | http://cihar.com | http://blog.cihar.com
Michal Čihař a écrit :
Hi all
as the GSoC is almost over, it's time to start merging branches.
The first one I'm about to merge is Lori Lee's tree. Any objections against merging it?
The git repo is here:
http://repo.or.cz/w/phpmyadmin/lorilee.git/shortlog/refs/heads/gsoc
Demo here:
Fine with me. -- Marc Delisle http://infomarc.info
Hi Michal, On 17/08/2010, Michal Čihař <michal@cihar.com> wrote:
Hi all
as the GSoC is almost over, it's time to start merging branches. Am I correct in assuming that the latest version will be merged into the main branch, and not the commit at the GSoC deadline yesterday?
Though I did not ajaxify any new actions last week, I did fix a few typos here and there and added some documentation. I'm still trying to get the jQuery scripts to work well with JSDoc. I also remember that some links were removed on the Database Structure page (Drop, Truncate Selected tables) and moved into a dropdown menu on the main branch. The JS code has not been adjusted to this change, and I'll do it in a couple of days. So, my branch will be changing over the next few days. -- Ninad S. Pundalik
Ninad Pundalik a écrit :
Hi Michal,
On 17/08/2010, Michal Čihař <michal@cihar.com> wrote:
Hi all
as the GSoC is almost over, it's time to start merging branches. Am I correct in assuming that the latest version will be merged into the main branch, and not the commit at the GSoC deadline yesterday?
Though I did not ajaxify any new actions last week, I did fix a few typos here and there and added some documentation. I'm still trying to get the jQuery scripts to work well with JSDoc. I also remember that some links were removed on the Database Structure page (Drop, Truncate Selected tables) and moved into a dropdown menu on the main branch. The JS code has not been adjusted to this change, and I'll do it in a couple of days. So, my branch will be changing over the next few days.
The deadline is for GSoC evaluation purpose, but of course you are free to continue working on your repository. When the time comes to merge your work we'll discuss about what goes in or not. -- Marc Delisle http://infomarc.info
Hi Dne Tue, 17 Aug 2010 18:02:28 +0530 Ninad Pundalik <ninadsp16289@gmail.com> napsal(a):
Am I correct in assuming that the latest version will be merged into the main branch, and not the commit at the GSoC deadline yesterday?
Yes, current head of the branch will be merged.
Though I did not ajaxify any new actions last week, I did fix a few typos here and there and added some documentation. I'm still trying to get the jQuery scripts to work well with JSDoc. I also remember that some links were removed on the Database Structure page (Drop, Truncate Selected tables) and moved into a dropdown menu on the main branch. The JS code has not been adjusted to this change, and I'll do it in a couple of days. So, my branch will be changing over the next few days.
No problem with that, the deadline is just for GSoC evaluation, you are welcome to continue in development after is. -- Michal Čihař | http://cihar.com | http://blog.cihar.com
Hi Dne Tue, 17 Aug 2010 13:27:06 +0200 Michal Čihař <michal@cihar.com> napsal(a):
as the GSoC is almost over, it's time to start merging branches.
The first one I'm about to merge is Lori Lee's tree. Any objections against merging it?
Just merged it. -- Michal Čihař | http://cihar.com | http://blog.cihar.com
Hi, I am merging master into my fork and adding missing options to user preferences and setup script. Is "custom-no-form" value for Export/method usable at all? The only places I see it are the documentation, two comparisons in display_export.lib.php and one check in export.js. -- Piotr Przybylski 2010/8/19 Michal Čihař <michal@cihar.com>:
Hi
Dne Tue, 17 Aug 2010 13:27:06 +0200 Michal Čihař <michal@cihar.com> napsal(a):
as the GSoC is almost over, it's time to start merging branches.
The first one I'm about to merge is Lori Lee's tree. Any objections against merging it?
Just merged it.
-- Michal Čihař | http://cihar.com | http://blog.cihar.com
------------------------------------------------------------------------------ This SF.net email is sponsored by
Make an app they can't live without Enter the BlackBerry Developer Challenge http://p.sf.net/sfu/RIM-dev2dev _______________________________________________ Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel
What do you mean "usable"? 2010/8/19 Piotr Przybylski <piotr.prz@gmail.com>
Hi,
I am merging master into my fork and adding missing options to user preferences and setup script. Is "custom-no-form" value for Export/method usable at all? The only places I see it are the documentation, two comparisons in display_export.lib.php and one check in export.js.
-- Piotr Przybylski
2010/8/19 Michal Čihař <michal@cihar.com>:
Hi
Dne Tue, 17 Aug 2010 13:27:06 +0200 Michal Čihař <michal@cihar.com> napsal(a):
as the GSoC is almost over, it's time to start merging branches.
The first one I'm about to merge is Lori Lee's tree. Any objections against merging it?
Just merged it.
-- Michal Čihař | http://cihar.com | http://blog.cihar.com
------------------------------------------------------------------------------
This SF.net email is sponsored by
Make an app they can't live without Enter the BlackBerry Developer Challenge http://p.sf.net/sfu/RIM-dev2dev _______________________________________________ Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel
------------------------------------------------------------------------------ This SF.net email is sponsored by
Make an app they can't live without Enter the BlackBerry Developer Challenge http://p.sf.net/sfu/RIM-dev2dev _______________________________________________ Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel
-- Thanks, Lori
W dniu 19 sierpnia 2010 19:02 użytkownik Lori Lee <leelorik@gmail.com> napisał:
2010/8/19 Piotr Przybylski <piotr.prz@gmail.com>
Hi,
I am merging master into my fork and adding missing options to user preferences and setup script. Is "custom-no-form" value for Export/method usable at all? The only places I see it are the documentation, two comparisons in display_export.lib.php and one check in export.js.
What do you mean "usable"?
-- Thanks, Lori
Sorry, I figured out how it works, all is fine. -- Piotr Przybylski
participants (5)
-
Lori Lee -
Marc Delisle -
Michal Čihař -
Ninad Pundalik -
Piotr Przybylski