Git July 2017

git@phpmyadmin.net

29 participants
241 discussions

[phpmyadmin/phpmyadmin] 51fb18: Move Theme object out of session
by Michal Čihař 18 Jul '17

18 Jul '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 51fb18612aec88a62f95006fd1906b55b17b91d2 https://github.com/phpmyadmin/phpmyadmin/commit/51fb18612aec88a62f95006fd19… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M js/get_image.js.php M js/messages.php M libraries/classes/Config.php M libraries/classes/Header.php M libraries/classes/ThemeManager.php M libraries/classes/Util.php M templates/database/designer/database_tables.phtml M templates/database/designer/side_menu.phtml M templates/database/designer/table_list.phtml M test/bootstrap-dist.php M test/classes/ConfigTest.php M test/classes/HeaderTest.php M test/classes/MenuTest.php M test/classes/ThemeTest.php M test/classes/config/FormDisplayTest.php M test/classes/config/FormTest.php M test/classes/navigation/NodeDatabaseChildTest.php M test/libraries/PMA_relation_test.php M test/libraries/common/PMA_checkParameters_test.php M test/libraries/rte/PMA_RTN_getEditorForm_test.php Log Message: ----------- Move Theme object out of session Honestly I don't see good reason for storing Theme in session as loading it from the session will take about same time as loading it from the disk. Additionally it seems that current code really didn't really use the object stored in session, it was constructed with every request anyway (by ThemeManager::initializeTheme). Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 942e44afe70f5fb5984b577b994a2959f17734fa https://github.com/phpmyadmin/phpmyadmin/commit/942e44afe70f5fb5984b577b994… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-18 (Tue, 18 Jul 2017) Changed paths: M js/get_image.js.php M js/messages.php M libraries/classes/Config.php M libraries/classes/Header.php M libraries/classes/ThemeManager.php M libraries/classes/Util.php M templates/database/designer/database_tables.phtml M templates/database/designer/side_menu.phtml M templates/database/designer/table_list.phtml M test/bootstrap-dist.php M test/classes/ConfigTest.php M test/classes/HeaderTest.php M test/classes/MenuTest.php M test/classes/ThemeTest.php M test/classes/config/FormDisplayTest.php M test/classes/config/FormTest.php M test/classes/navigation/NodeDatabaseChildTest.php M test/libraries/PMA_relation_test.php M test/libraries/common/PMA_checkParameters_test.php M test/libraries/rte/PMA_RTN_getEditorForm_test.php Log Message: ----------- Merge pull request #13499 from nijel/theme Move Theme object out of session Compare: https://github.com/phpmyadmin/phpmyadmin/compare/964f3d896356...942e44afe70f

1 0

[phpmyadmin/scripts] 03bd80: Add git merge options to allow non interactive run
by Michal Čihař 17 Jul '17

17 Jul '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/scripts Commit: 03bd80d67e58de3e71446af0a5560f2492c963d7 https://github.com/phpmyadmin/scripts/commit/03bd80d67e58de3e71446af0a5560f… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M website/daily-composer Log Message: ----------- Add git merge options to allow non interactive run There might be conflicting changes (eg. README.rst on release) and we do not want to handle these manually. Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 8841a2: Fixed size of index edit dialog
by Michal Čihař 17 Jul '17

17 Jul '17

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8841a26788e297e5734481eb3123bd7f59b570ce https://github.com/phpmyadmin/phpmyadmin/commit/8841a26788e297e5734481eb312… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M ChangeLog M js/functions.js Log Message: ----------- Fixed size of index edit dialog Fixes #13382 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 8841a2: Fixed size of index edit dialog
by Michal Čihař 17 Jul '17

17 Jul '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8841a26788e297e5734481eb3123bd7f59b570ce https://github.com/phpmyadmin/phpmyadmin/commit/8841a26788e297e5734481eb312… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M ChangeLog M js/functions.js Log Message: ----------- Fixed size of index edit dialog Fixes #13382 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 964f3d896356ad0d934b2927698dfdb71b7f79bd https://github.com/phpmyadmin/phpmyadmin/commit/964f3d896356ad0d934b2927698… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M ChangeLog M js/functions.js Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ff84a36e09db...964f3d896356

1 0

[phpmyadmin/phpmyadmin] 6a3d51: Make hex inline editor accept 0x at the begining
by Michal Čihař 17 Jul '17

17 Jul '17

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6a3d51e084d4f37b51891ecb5d12de8a4fedb8dd https://github.com/phpmyadmin/phpmyadmin/commit/6a3d51e084d4f37b51891ecb5d1… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M js/makegrid.js M libraries/insert_edit.lib.php Log Message: ----------- Make hex inline editor accept 0x at the begining Issue #13387 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: d0ab548f7647dc7a3044f650c3de0f5119ac7930 https://github.com/phpmyadmin/phpmyadmin/commit/d0ab548f7647dc7a3044f650c3d… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M ChangeLog M libraries/insert_edit.lib.php Log Message: ----------- Fixed inline editing of hex values Fixes #13387 Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b0123cdc9fd3...d0ab548f7647

1 0

[phpmyadmin/phpmyadmin] 6a3d51: Make hex inline editor accept 0x at the begining
by Michal Čihař 17 Jul '17

17 Jul '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6a3d51e084d4f37b51891ecb5d12de8a4fedb8dd https://github.com/phpmyadmin/phpmyadmin/commit/6a3d51e084d4f37b51891ecb5d1… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M js/makegrid.js M libraries/insert_edit.lib.php Log Message: ----------- Make hex inline editor accept 0x at the begining Issue #13387 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: d0ab548f7647dc7a3044f650c3de0f5119ac7930 https://github.com/phpmyadmin/phpmyadmin/commit/d0ab548f7647dc7a3044f650c3d… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M ChangeLog M libraries/insert_edit.lib.php Log Message: ----------- Fixed inline editing of hex values Fixes #13387 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ff84a36e09db1b7abf43276893154d7b295ae207 https://github.com/phpmyadmin/phpmyadmin/commit/ff84a36e09db1b7abf432768931… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M ChangeLog M js/makegrid.js M libraries/insert_edit.lib.php Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3755046e5e4d...ff84a36e09db

1 0

[phpmyadmin/phpmyadmin] b0123c: Translated using Weblate (Catalan)
by Michal Čihař 17 Jul '17

17 Jul '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b0123cdc9fd3203294e6acddcab5b85d11c5998c https://github.com/phpmyadmin/phpmyadmin/commit/b0123cdc9fd3203294e6acddcab… Author: Xavier Navarro <xvnavarro(a)gmail.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M po/ca.po Log Message: ----------- Translated using Weblate (Catalan) Currently translated at 100.0% (3203 of 3203 strings) [CI skip] Commit: 3755046e5e4d638577552432775c25411d185ee3 https://github.com/phpmyadmin/phpmyadmin/commit/3755046e5e4d638577552432775… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/366a8f9410c3...3755046e5e4d

1 0

[phpmyadmin/phpmyadmin] b0123c: Translated using Weblate (Catalan)
by Xavier Navarro 17 Jul '17

17 Jul '17

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: b0123cdc9fd3203294e6acddcab5b85d11c5998c https://github.com/phpmyadmin/phpmyadmin/commit/b0123cdc9fd3203294e6acddcab… Author: Xavier Navarro <xvnavarro(a)gmail.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M po/ca.po Log Message: ----------- Translated using Weblate (Catalan) Currently translated at 100.0% (3203 of 3203 strings) [CI skip]

1 0

[phpmyadmin/phpmyadmin] 366a8f: Simplify condition for showing comment
by Michal Čihař 17 Jul '17

17 Jul '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 366a8f9410c30690699570530a667a8a99e8b831 https://github.com/phpmyadmin/phpmyadmin/commit/366a8f9410c30690699570530a6… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M templates/table/structure/display_table_stats.twig Log Message: ----------- Simplify condition for showing comment It can be unset as well. Fixes #13469 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 8b00b9: Remove last uses of PMA_MYSQL_INT_VERSION define
by Michal Čihař 17 Jul '17

17 Jul '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8b00b9037238a1320e71a0063dcc9e271fdbda2a https://github.com/phpmyadmin/phpmyadmin/commit/8b00b9037238a1320e71a0063dc… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-07-17 (Mon, 17 Jul 2017) Changed paths: M db_operations.php M libraries/classes/Advisor.php M libraries/classes/DatabaseInterface.php M libraries/classes/Partition.php M libraries/classes/StorageEngine.php M libraries/classes/Table.php M libraries/classes/Util.php M libraries/common.inc.php M libraries/display_change_password.lib.php M libraries/operations.lib.php M libraries/plugins/export/ExportSql.php M libraries/tbl_columns_definition_form.inc.php M templates/columns_definitions/column_comment.phtml M templates/table/structure/display_structure.phtml M test/bootstrap-dist.php M test/classes/plugin/auth/AuthenticationConfigTest.php Log Message: ----------- Remove last uses of PMA_MYSQL_INT_VERSION define It is only kept as name in Advisor for now. Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git July 2017