Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7c325469d590e1fef384dc8f7051ae5b4eebeca9 https://github.com/phpmyadmin/phpmyadmin/commit/7c325469d590e1fef384dc8f7051... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-09-25 (Fri, 25 Sep 2015) Changed paths: M ChangeLog M js/functions.js M libraries/StorageEngine.class.php M libraries/create_addfield.lib.php M libraries/tbl_columns_definition_form.inc.php M tbl_create.php M templates/columns_definitions/column_definitions_form.phtml A templates/columns_definitions/partitions_form.phtml Log Message: ----------- Fix #11490 UI for defining partitioning in create table window Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 611222d4146026a89da3ea267c8a08b7b1538763 https://github.com/phpmyadmin/phpmyadmin/commit/611222d4146026a89da3ea267c8a... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-09-27 (Sun, 27 Sep 2015) Changed paths: M js/functions.js M libraries/tbl_columns_definition_form.inc.php M tbl_create.php M templates/columns_definitions/column_definitions_form.phtml M templates/columns_definitions/partitions_form.phtml Log Message: ----------- Only RANGE and LIST type partitions allow having subpartitions Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 257487df03d9db7c529adc7f58b504be313b5b36 https://github.com/phpmyadmin/phpmyadmin/commit/257487df03d9db7c529adc7f58b5... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-09-28 (Mon, 28 Sep 2015) Changed paths: M js/functions.js M libraries/create_addfield.lib.php M tbl_create.php M templates/columns_definitions/partitions_form.phtml Log Message: ----------- Add comments. Improved handling of partition restrictions Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 54c08f8de8753e2869bc952b374c0abf063e67a4 https://github.com/phpmyadmin/phpmyadmin/commit/54c08f8de8753e2869bc952b374c... Author: Marc Delisle <marc@infomarc.info> Date: 2015-09-28 (Mon, 28 Sep 2015) Changed paths: M ChangeLog M js/functions.js M libraries/StorageEngine.class.php M libraries/create_addfield.lib.php M libraries/tbl_columns_definition_form.inc.php M tbl_create.php M templates/columns_definitions/column_definitions_form.phtml A templates/columns_definitions/partitions_form.phtml Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc@infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5191ec0250b6...54c08f8de875