- Git - lists.phpmyadmin.net

[phpmyadmin/phpmyadmin] 317eb5: Silent errors from git cat-file
by Michal Čihař 29 Feb '16

29 Feb '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 317eb54abdd90fd7363b6c6a65d793433374cb95 https://github.com/phpmyadmin/phpmyadmin/commit/317eb54abdd90fd7363b6c6a65d… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-29 (Mon, 29 Feb 2016) Changed paths: M scripts/create-release.sh Log Message: ----------- Silent errors from git cat-file There doesn't seem to be better way to check for existence of file in branch, so let's just ignore the errors from it. Fixes #12015 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 88e094: Honor vendor configuration for gettext inclusion
by Michal Čihař 29 Feb '16

29 Feb '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 88e0944cfd6c74c32bd57e209eaedbb32dd8314f https://github.com/phpmyadmin/phpmyadmin/commit/88e0944cfd6c74c32bd57e209ea… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-29 (Mon, 29 Feb 2016) Changed paths: M ChangeLog M libraries/sql-parser/autoload.php Log Message: ----------- Honor vendor configuration for gettext inclusion Fixes #12048 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 2ebabd11fd37c74140097d26f5a73334064fb554 https://github.com/phpmyadmin/phpmyadmin/commit/2ebabd11fd37c74140097d26f5a… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-29 (Mon, 29 Feb 2016) Changed paths: M ChangeLog M libraries/sql-parser/autoload.php Log Message: ----------- Merge branch 'QA_4_5' into QA_4_6 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/19c7a069c78d...2ebabd11fd37

1 0

[phpmyadmin/phpmyadmin] 88e094: Honor vendor configuration for gettext inclusion
by Michal Čihař 29 Feb '16

29 Feb '16

Branch: refs/heads/MAINT_4_5_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 88e0944cfd6c74c32bd57e209eaedbb32dd8314f https://github.com/phpmyadmin/phpmyadmin/commit/88e0944cfd6c74c32bd57e209ea… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-29 (Mon, 29 Feb 2016) Changed paths: M ChangeLog M libraries/sql-parser/autoload.php Log Message: ----------- Honor vendor configuration for gettext inclusion Fixes #12048 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 88e094: Honor vendor configuration for gettext inclusion
by Michal Čihař 29 Feb '16

29 Feb '16

Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 88e0944cfd6c74c32bd57e209eaedbb32dd8314f https://github.com/phpmyadmin/phpmyadmin/commit/88e0944cfd6c74c32bd57e209ea… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-29 (Mon, 29 Feb 2016) Changed paths: M ChangeLog M libraries/sql-parser/autoload.php Log Message: ----------- Honor vendor configuration for gettext inclusion Fixes #12048 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 193082: Translated using Weblate (Portuguese (Brazil))
by Michal Čihař 29 Feb '16

29 Feb '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 19308231b3604c7fd9fa77fde2f6b27afe6a68af https://github.com/phpmyadmin/phpmyadmin/commit/19308231b3604c7fd9fa77fde2f… Author: Ray Santos <ray.smgl(a)gmail.com> Date: 2016-02-26 (Fri, 26 Feb 2016) Changed paths: M po/pt_BR.po Log Message: ----------- Translated using Weblate (Portuguese (Brazil)) Currently translated at 92.2% (2962 of 3211 strings) [CI skip] Commit: 19c7a069c78d2367ab6050565271c4fcd71eb0d8 https://github.com/phpmyadmin/phpmyadmin/commit/19c7a069c78d2367ab605056527… Author: Weblate <noreply(a)weblate.org> Date: 2016-02-26 (Fri, 26 Feb 2016) Changed paths: M libraries/server_privileges.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: 88e0944cfd6c74c32bd57e209eaedbb32dd8314f https://github.com/phpmyadmin/phpmyadmin/commit/88e0944cfd6c74c32bd57e209ea… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-29 (Mon, 29 Feb 2016) Changed paths: M ChangeLog M libraries/sql-parser/autoload.php Log Message: ----------- Honor vendor configuration for gettext inclusion Fixes #12048 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 2ebabd11fd37c74140097d26f5a73334064fb554 https://github.com/phpmyadmin/phpmyadmin/commit/2ebabd11fd37c74140097d26f5a… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-29 (Mon, 29 Feb 2016) Changed paths: M ChangeLog M libraries/sql-parser/autoload.php Log Message: ----------- Merge branch 'QA_4_5' into QA_4_6 Commit: d5650a757ae150ab52cfcf733a5e3bc688a1f577 https://github.com/phpmyadmin/phpmyadmin/commit/d5650a757ae150ab52cfcf733a5… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-29 (Mon, 29 Feb 2016) Changed paths: M ChangeLog M po/pt_BR.po Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/805cede33ebc...d5650a757ae1

1 0

[phpmyadmin/phpmyadmin] 6735f3: Icons added and code changed to display icons
by Michal Čihař 29 Feb '16

29 Feb '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6735f332971f158b66479bd7029bf7d87363e044 https://github.com/phpmyadmin/phpmyadmin/commit/6735f332971f158b66479bd7029… Author: Chintan Zaveri <zaveri_chintan(a)rediff.com> Date: 2016-02-25 (Thu, 25 Feb 2016) Changed paths: M libraries/navigation/Navigation.php M libraries/navigation/nodes/NodeDatabase.php M libraries/navigation/nodes/NodeDatabaseChild.php A themes/original/img/hide.png A themes/original/img/show.png A themes/pmahomme/img/hide.png A themes/pmahomme/img/show.png Log Message: ----------- Icons added and code changed to display icons Signed-off-by: Chintan Zaveri <zaveri_chintan(a)rediff.com> icons added:wq Commit: 238a87903b928ce21872b4b8c0d3a06fabb4f54d https://github.com/phpmyadmin/phpmyadmin/commit/238a87903b928ce21872b4b8c0d… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-29 (Mon, 29 Feb 2016) Changed paths: M libraries/navigation/Navigation.php M libraries/navigation/nodes/NodeDatabase.php M libraries/navigation/nodes/NodeDatabaseChild.php A themes/original/img/hide.png A themes/original/img/show.png A themes/pmahomme/img/hide.png A themes/pmahomme/img/show.png Log Message: ----------- Merge remote-tracking branch 'origin/pull/12032' Commit: c5934574f2e1a9687634511c70ecb1e3638c0edf https://github.com/phpmyadmin/phpmyadmin/commit/c5934574f2e1a9687634511c70e… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-29 (Mon, 29 Feb 2016) Changed paths: M test/classes/navigation/NavigationTest.php M test/classes/navigation/NodeDatabaseChildTest.php Log Message: ----------- Fix tests after #12032 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 805cede33ebc9667d74cae05b696d4b7708656bf https://github.com/phpmyadmin/phpmyadmin/commit/805cede33ebc9667d74cae05b69… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-29 (Mon, 29 Feb 2016) Changed paths: M themes/original/img/sprites.png M themes/original/sprites.lib.php M themes/pmahomme/img/sprites.png M themes/pmahomme/sprites.lib.php Log Message: ----------- Update sprites for new icons (see #12032) Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e0709eea5619...805cede33ebc

1 0

[phpmyadmin/phpmyadmin] bf6349: Fix example in `test/README.rst`
by Michal Čihař 29 Feb '16

29 Feb '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: bf6349212fb857271618a2e5dd9798f5c913f636 https://github.com/phpmyadmin/phpmyadmin/commit/bf6349212fb857271618a2e5dd9… Author: Nisarg Jhaveri <nisargjhaveri(a)users.noreply.github.com> Date: 2016-02-28 (Sun, 28 Feb 2016) Changed paths: M test/README.rst Log Message: ----------- Fix example in `test/README.rst` Signed-off-by: Nisarg Jhaveri <nisargjhaveri(a)gmail.com> Commit: e0709eea5619fe8873ee00412fa36eb7ff84d19f https://github.com/phpmyadmin/phpmyadmin/commit/e0709eea5619fe8873ee00412fa… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-02-29 (Mon, 29 Feb 2016) Changed paths: M test/README.rst Log Message: ----------- Merge pull request #12044 from nisargjhaveri/patch-1 Fix example in `test/README.rst` Compare: https://github.com/phpmyadmin/phpmyadmin/compare/027d5d963ac3...e0709eea5619

1 0

[phpmyadmin/phpmyadmin] 3c56e4: Templating Console.php, Issue #12007
by Atul Pratap Singh 29 Feb '16

29 Feb '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3c56e4b9afe64620b1653b04c2e0f1d643a7181e https://github.com/phpmyadmin/phpmyadmin/commit/3c56e4b9afe64620b1653b04c2e… Author: Durgesh <007durgesh219(a)gmail.com> Date: 2016-02-29 (Mon, 29 Feb 2016) Changed paths: M libraries/Console.php A templates/console/bookmark_content.phtml A templates/console/display.phtml A templates/console/query_action.phtml A templates/console/toolbar.phtml Log Message: ----------- Templating Console.php, Issue #12007 Signed-off-by: Durgesh <007durgesh219(a)gmail.com> Commit: 027d5d963ac358f31fe002684ea0f00f3128af5d https://github.com/phpmyadmin/phpmyadmin/commit/027d5d963ac358f31fe002684ea… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2016-02-29 (Mon, 29 Feb 2016) Changed paths: M libraries/Console.php A templates/console/bookmark_content.phtml A templates/console/display.phtml A templates/console/query_action.phtml A templates/console/toolbar.phtml Log Message: ----------- Merge pull request #12022 from 007durgesh219/Issue#12007 Templating Console.php, Issue#12007 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4d09f855bbd3...027d5d963ac3

1 0

[phpmyadmin/phpmyadmin] 4d09f8: Rename some templates, formatting changes
by Atul Pratap Singh 29 Feb '16

29 Feb '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4d09f855bbd390c8306274b8edd6b91d3b72169e https://github.com/phpmyadmin/phpmyadmin/commit/4d09f855bbd390c8306274b8edd… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2016-02-29 (Mon, 29 Feb 2016) Changed paths: M libraries/Util.php A templates/div_for_slider_effect.phtml R templates/getDivForSliderEffect.phtml R templates/toggleButton.phtml A templates/toggle_button.phtml M test/libraries/common/PMA_getDivForSliderEffect_test.php Log Message: ----------- Rename some templates, formatting changes Signed-off-by: Atul Pratap Singh <atulpratapsingh05(a)gmail.com>

1 0

[phpmyadmin/phpmyadmin] 2e64ae: Templating toggleButton() and getDivForSliderEffec...
by Atul Pratap Singh 29 Feb '16

29 Feb '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2e64aec16e23d8f640c97b8abb4ec9e32b46c0cf https://github.com/phpmyadmin/phpmyadmin/commit/2e64aec16e23d8f640c97b8abb4… Author: Piyush Agrawal <poush12(a)gmail.com> Date: 2016-02-25 (Thu, 25 Feb 2016) Changed paths: M libraries/Util.php A templates/getDivForSliderEffect.phtml A templates/toggleButton.phtml M test/libraries/common/PMA_getDivForSliderEffect_test.php Log Message: ----------- Templating toggleButton() and getDivForSliderEffect() Signed-off-by: Piyush Agrawal <poush12(a)gmail.com> Commit: 386cbc8f6cd01dd14f832b98700f7f251c2b870a https://github.com/phpmyadmin/phpmyadmin/commit/386cbc8f6cd01dd14f832b98700… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2016-02-29 (Mon, 29 Feb 2016) Changed paths: M libraries/Util.php A templates/getDivForSliderEffect.phtml A templates/toggleButton.phtml M test/libraries/common/PMA_getDivForSliderEffect_test.php Log Message: ----------- Merge pull request #12009 from poush/fix_#12005 Templating toggleButton() and getDivForSliderEffect() (Fix #12005) Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d799a9a9976b...386cbc8f6cd0

1 0