Branch: refs/heads/master
Home: https://github.com/phpmyadmin/scripts
Commit: 250da7f9b368188888edb3d0991b31f3f4fd25cd
https://github.com/phpmyadmin/scripts/commit/250da7f9b368188888edb3d0991b31…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-12-18 (Wed, 18 Dec 2013)
Changed paths:
M demo/maintenance/make-snapshot
M demo/maintenance/restore-snapshot
Log Message:
-----------
Use full path to lvm tools
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 207466d59ccf530d97b253c21db952dc629480b7
https://github.com/phpmyadmin/phpmyadmin/commit/207466d59ccf530d97b253c21db…
Author: Hugues Peccatte <hugues.peccatte(a)gmail.com>
Date: 2013-12-18 (Wed, 18 Dec 2013)
Changed paths:
M libraries/DBQbe.class.php
M libraries/TableSearch.class.php
M libraries/Tracker.class.php
M libraries/Util.class.php
M libraries/config/Form.class.php
M libraries/config/Validator.class.php
M libraries/schema/Pdf_Relation_Schema.class.php
M libraries/server_privileges.lib.php
M libraries/tbl_views.lib.php
Log Message:
-----------
Don't use function in for loop test.
Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 493f9c5a1ad716bb94ad97bd1c104ef28d6314a5
https://github.com/phpmyadmin/phpmyadmin/commit/493f9c5a1ad716bb94ad97bd1c1…
Author: Hugues Peccatte <hugues.peccatte(a)gmail.com>
Date: 2013-12-18 (Wed, 18 Dec 2013)
Changed paths:
M libraries/TableSearch.class.php
M libraries/dbi/DBIDummy.class.php
M libraries/gis/pma_gis_polygon.php
M libraries/insert_edit.lib.php
M libraries/rte/rte_routines.lib.php
M libraries/server_plugins.lib.php
M setup/lib/ConfigGenerator.class.php
Log Message:
-----------
Don't use function in for loop test.
Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 9876aeb550766e7774460a2e4e65bef619d07261
https://github.com/phpmyadmin/phpmyadmin/commit/9876aeb550766e7774460a2e4e6…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-12-18 (Wed, 18 Dec 2013)
Changed paths:
M libraries/config.default.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/config/user_preferences.forms.php
Log Message:
-----------
Finish removing the gather suboption of the error handler
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: b2305dcefc4191f0c23e1b315f369f2605c09d85
https://github.com/phpmyadmin/phpmyadmin/commit/b2305dcefc4191f0c23e1b315f3…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-12-18 (Wed, 18 Dec 2013)
Changed paths:
M libraries/config.default.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/config/user_preferences.forms.php
Log Message:
-----------
Fix merge conflicts
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/680e5497240c...b2305dcefc41
Branch: refs/heads/QA_4_1
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 9876aeb550766e7774460a2e4e65bef619d07261
https://github.com/phpmyadmin/phpmyadmin/commit/9876aeb550766e7774460a2e4e6…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-12-18 (Wed, 18 Dec 2013)
Changed paths:
M libraries/config.default.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/config/user_preferences.forms.php
Log Message:
-----------
Finish removing the gather suboption of the error handler
Signed-off-by: Marc Delisle <marc(a)infomarc.info>