Git April 2016

git@phpmyadmin.net

23 participants
195 discussions

[phpmyadmin/docker] 249e10: Add comment why is there edge
by Michal Čihař 20 Apr '16

20 Apr '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: 249e10deccb76e282eda0271ef17a7bd8c47696a https://github.com/phpmyadmin/docker/commit/249e10deccb76e282eda0271ef17a7b… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M Dockerfile Log Message: ----------- Add comment why is there edge Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/docker] 489380: More links to docker hub
by Michal Čihař 20 Apr '16

20 Apr '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: 4893806cded628eec3f712ed5b3be126d7d08cb2 https://github.com/phpmyadmin/docker/commit/4893806cded628eec3f712ed5b3be12… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M README.md Log Message: ----------- More links to docker hub Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 6dd6b90902e4a124ce20e93f3b456f23b30855d1 https://github.com/phpmyadmin/docker/commit/6dd6b90902e4a124ce20e93f3b456f2… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M Dockerfile Log Message: ----------- Base on alpine:edge to get DNS fixes See https://twitter.com/thockin/status/704909611279781888 and https://github.com/gliderlabs/docker-alpine/issues/8. This will be fixed in 3.4, so at that point we can switch back to using stable. Fixes #23 (DNS issues) Fixes #27 (Kubernetes support) Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/docker/compare/f313ce3a8491...6dd6b90902e4

1 0

[phpmyadmin/docker] f313ce: Add docker badge
by Michal Čihař 20 Apr '16

20 Apr '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: f313ce3a8491a0d9a4d5b1148e4cc694dfd1a586 https://github.com/phpmyadmin/docker/commit/f313ce3a8491a0d9a4d5b1148e4cc69… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-20 (Wed, 20 Apr 2016) Changed paths: M README.md Log Message: ----------- Add docker badge Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/coding-standard]
by nijel 19 Apr '16

19 Apr '16

Branch: refs/tags/0.2 Home: https://github.com/phpmyadmin/coding-standard

1 0

[phpmyadmin/coding-standard] 4736e6: Improve readme
by Michal Čihař 19 Apr '16

19 Apr '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/coding-standard Commit: 4736e6d8e29c2d7a8e86ecea78445e4aa13a8076 https://github.com/phpmyadmin/coding-standard/commit/4736e6d8e29c2d7a8e86ec… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M README.md Log Message: ----------- Improve readme Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] a01546: Fix wrong merge in composer.json
by Michal Čihař 19 Apr '16

19 Apr '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a0154623b5f2c49dd79d300eb4954a0c179fe7e3 https://github.com/phpmyadmin/phpmyadmin/commit/a0154623b5f2c49dd79d300eb49… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M composer.json Log Message: ----------- Fix wrong merge in composer.json Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/coding-standard] a9c9d1: Improve readme
by Michal Čihař 19 Apr '16

19 Apr '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/coding-standard Commit: a9c9d1ef9c6cda7d7681babfbe073e675b377f65 https://github.com/phpmyadmin/coding-standard/commit/a9c9d1ef9c6cda7d7681ba… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M README.md Log Message: ----------- Improve readme Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 8b2991: Use coding standard from phpmyadmin/coding-standar...
by Michal Čihař 19 Apr '16

19 Apr '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8b29917eca5778b61dff701a6082060c83d3e6c5 https://github.com/phpmyadmin/phpmyadmin/commit/8b29917eca5778b61dff701a608… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M .scrutinizer.yml R PMAStandard/Sniffs/Commenting/ClassCommentSniff.php R PMAStandard/Sniffs/Commenting/FileCommentSniff.php R PMAStandard/Sniffs/Commenting/FunctionCommentSniff.php R PMAStandard/Sniffs/Files/SpacesAroundConcatSniff.php R PMAStandard/ruleset.xml M build.xml M composer.json M phpunit.xml.dist Log Message: ----------- Use coding standard from phpmyadmin/coding-standard It is way cleaner to have the coding standard separte and use it when checking. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 04b5ae45ec6fecb89f774da2f65f6d153948323c https://github.com/phpmyadmin/phpmyadmin/commit/04b5ae45ec6fecb89f774da2f65… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M composer.json Log Message: ----------- Move coding standard to dev requires Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3794b829e313...04b5ae45ec6f

1 0

[phpmyadmin/phpmyadmin] 8b2991: Use coding standard from phpmyadmin/coding-standar...
by Michal Čihař 19 Apr '16

19 Apr '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8b29917eca5778b61dff701a6082060c83d3e6c5 https://github.com/phpmyadmin/phpmyadmin/commit/8b29917eca5778b61dff701a608… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M .scrutinizer.yml R PMAStandard/Sniffs/Commenting/ClassCommentSniff.php R PMAStandard/Sniffs/Commenting/FileCommentSniff.php R PMAStandard/Sniffs/Commenting/FunctionCommentSniff.php R PMAStandard/Sniffs/Files/SpacesAroundConcatSniff.php R PMAStandard/ruleset.xml M build.xml M composer.json M phpunit.xml.dist Log Message: ----------- Use coding standard from phpmyadmin/coding-standard It is way cleaner to have the coding standard separte and use it when checking. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: c2419ee951272b3006224f5a7727955780918a5f https://github.com/phpmyadmin/phpmyadmin/commit/c2419ee951272b3006224f5a772… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M .scrutinizer.yml R PMAStandard/Sniffs/Commenting/ClassCommentSniff.php R PMAStandard/Sniffs/Commenting/FileCommentSniff.php R PMAStandard/Sniffs/Commenting/FunctionCommentSniff.php R PMAStandard/Sniffs/Files/SpacesAroundConcatSniff.php R PMAStandard/ruleset.xml M build.xml M composer.json M phpunit.xml.dist Log Message: ----------- Merge branch 'QA_4_6' Commit: 04b5ae45ec6fecb89f774da2f65f6d153948323c https://github.com/phpmyadmin/phpmyadmin/commit/04b5ae45ec6fecb89f774da2f65… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M composer.json Log Message: ----------- Move coding standard to dev requires Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ce745efb3dbf61ad99385a420eb12faa02e4cc4f https://github.com/phpmyadmin/phpmyadmin/commit/ce745efb3dbf61ad99385a420eb… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M composer.json Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d019757f6412...ce745efb3dbf

1 0

[phpmyadmin/phpmyadmin] 425a12: Translated using Weblate (Czech)
by Michal Čihař 19 Apr '16

19 Apr '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 425a12eff9b95607efba368398e841abbc73c33c https://github.com/phpmyadmin/phpmyadmin/commit/425a12eff9b95607efba368398e… Author: Liška <nicefox1(a)gmail.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M po/cs.po Log Message: ----------- Translated using Weblate (Czech) Currently translated at 94.4% (3034 of 3211 strings) [CI skip] Commit: 0f2897ac801f79ecdc8cba406376e0623434156e https://github.com/phpmyadmin/phpmyadmin/commit/0f2897ac801f79ecdc8cba40637… Author: bladerunn3r <tkrzywonos(a)gmail.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M po/pl.po Log Message: ----------- Translated using Weblate (Polish) Currently translated at 82.6% (2655 of 3211 strings) [CI skip] Commit: 3794b829e3137dc91c719ecab7881ffd9bc52e0c https://github.com/phpmyadmin/phpmyadmin/commit/3794b829e3137dc91c719ecab78… Author: Weblate <noreply(a)weblate.org> Date: 2016-04-19 (Tue, 19 Apr 2016) Changed paths: M ChangeLog M libraries/sql-parser/src/Components/Condition.php M libraries/sql-parser/src/Contexts/ContextMySql50000.php M libraries/sql-parser/src/Contexts/ContextMySql50100.php M libraries/sql-parser/src/Contexts/ContextMySql50500.php M libraries/sql-parser/src/Contexts/ContextMySql50600.php M libraries/sql-parser/src/Contexts/ContextMySql50700.php M libraries/sql-parser/src/Parser.php M libraries/sql-parser/src/Statement.php M libraries/sql-parser/src/Utils/BufferedQuery.php M libraries/sql-parser/src/Utils/Formatter.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 Commit: d019757f641217b5d14c6804ccb896f71d596a4f https://github.com/phpmyadmin/phpmyadmin/commit/d019757f641217b5d14c6804ccb… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-04-19 (Tue, 19 Apr 2016) Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3547b4f074b8...d019757f6412

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git April 2016