Git May 2015

git@phpmyadmin.net

29 participants
514 discussions

Start a nNew thread

[Phpmyadmin-git] [phpmyadmin/phpmyadmin]

by lem9

Branch: refs/tags/RELEASE_4_4_6 Home: https://github.com/phpmyadmin/phpmyadmin

9 years, 4 months

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] dba2af: 4.4.6 release

by Marc Delisle

Branch: refs/heads/MAINT_4_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: dba2af651a53d5037296a1dc827081a94ef1062c https://github.com/phpmyadmin/phpmyadmin/commit/dba2af651a53d5037296a1dc827… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.4.6 release Signed-off-by: Marc Delisle <marc(a)infomarc.info>

9 years, 4 months

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5cb429: 4.4.7-dev

by Marc Delisle

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5cb4292e6a9fd89eb34df7e1b855e492f53e78be https://github.com/phpmyadmin/phpmyadmin/commit/5cb4292e6a9fd89eb34df7e1b85… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.4.7-dev Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 6bf603d47efc3ec3dbd7d67d6a718e5a1c90a0f5 https://github.com/phpmyadmin/phpmyadmin/commit/6bf603d47efc3ec3dbd7d67d6a7… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Log Message: ----------- Merge branch 'QA_4_4' Commit: 73fdb59e728f592efe751bd62c45f381be7c5fa5 https://github.com/phpmyadmin/phpmyadmin/commit/73fdb59e728f592efe751bd62c4… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M ChangeLog Log Message: ----------- 4.4.6 release Signed-off-by: Marc Delisle <marc(a)infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6dd341f5c501...73fdb59e728f

9 years, 4 months

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5cb429: 4.4.7-dev

by Marc Delisle

Branch: refs/heads/QA_4_4 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5cb4292e6a9fd89eb34df7e1b855e492f53e78be https://github.com/phpmyadmin/phpmyadmin/commit/5cb4292e6a9fd89eb34df7e1b85… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.4.7-dev Signed-off-by: Marc Delisle <marc(a)infomarc.info>

9 years, 4 months

[Phpmyadmin-git] [phpmyadmin/phpmyadmin]

by lem9

Branch: refs/heads/MAINT_4_4_6 Home: https://github.com/phpmyadmin/phpmyadmin

9 years, 4 months

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 504b80: phpunit 4.2: assertTag is deprecated

by Marc Delisle

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 504b80adbf7a2c614b92dbe467dcc91198f7a45a https://github.com/phpmyadmin/phpmyadmin/commit/504b80adbf7a2c614b92dbe467d… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M test/bootstrap-dist.php M test/libraries/rte/PMA_RTN_getExecuteForm_test.php M test/libraries/rte/PMA_TRI_getEditorForm_test.php Log Message: ----------- phpunit 4.2: assertTag is deprecated Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 5d9a7a748cc378351b8ec22ecd0a6bcb6836a15e https://github.com/phpmyadmin/phpmyadmin/commit/5d9a7a748cc378351b8ec22ecd0… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M test/bootstrap-dist.php M test/libraries/rte/PMA_RTN_getExecuteForm_test.php M test/libraries/rte/PMA_TRI_getEditorForm_test.php Log Message: ----------- Fix merge conflicts Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 6dd341f5c501ba3dd54719f0794b849c28c016d4 https://github.com/phpmyadmin/phpmyadmin/commit/6dd341f5c501ba3dd54719f0794… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M test/libraries/PMA_central_columns_test.php Log Message: ----------- phpunit 4.2: assertTag is deprecated Signed-off-by: Marc Delisle <marc(a)infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a5398611f706...6dd341f5c501

9 years, 4 months

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 504b80: phpunit 4.2: assertTag is deprecated

by Marc Delisle

Branch: refs/heads/QA_4_4 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 504b80adbf7a2c614b92dbe467dcc91198f7a45a https://github.com/phpmyadmin/phpmyadmin/commit/504b80adbf7a2c614b92dbe467d… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M test/bootstrap-dist.php M test/libraries/rte/PMA_RTN_getExecuteForm_test.php M test/libraries/rte/PMA_TRI_getEditorForm_test.php Log Message: ----------- phpunit 4.2: assertTag is deprecated Signed-off-by: Marc Delisle <marc(a)infomarc.info>

9 years, 4 months

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 9306a9: phpunit 4.2: assertTag is deprecated

by Marc Delisle

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9306a93bec4179230d989e3331402b9b6526272f https://github.com/phpmyadmin/phpmyadmin/commit/9306a93bec4179230d989e33314… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M test/libraries/rte/PMA_RTN_getEditorForm_test.php Log Message: ----------- phpunit 4.2: assertTag is deprecated Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 53677b8e250e98bc5310097cbbbe6c9a49b77a5f https://github.com/phpmyadmin/phpmyadmin/commit/53677b8e250e98bc5310097cbbb… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M ChangeLog M libraries/config/messages.inc.php M libraries/plugins/import/AbstractImportCsv.class.php Log Message: ----------- Merge branch 'QA_4_4' of https://github.com/phpmyadmin/phpmyadmin into QA_4_4 Commit: a5398611f706067cca986e545af4256ca15df898 https://github.com/phpmyadmin/phpmyadmin/commit/a5398611f706067cca986e545af… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M test/libraries/rte/PMA_RTN_getEditorForm_test.php Log Message: ----------- Fix merge conflicts Signed-off-by: Marc Delisle <marc(a)infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0e7ac33cb42f...a5398611f706

9 years, 4 months

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 9306a9: phpunit 4.2: assertTag is deprecated

by Marc Delisle

Branch: refs/heads/QA_4_4 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9306a93bec4179230d989e3331402b9b6526272f https://github.com/phpmyadmin/phpmyadmin/commit/9306a93bec4179230d989e33314… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M test/libraries/rte/PMA_RTN_getEditorForm_test.php Log Message: ----------- phpunit 4.2: assertTag is deprecated Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 53677b8e250e98bc5310097cbbbe6c9a49b77a5f https://github.com/phpmyadmin/phpmyadmin/commit/53677b8e250e98bc5310097cbbb… Author: Marc Delisle <marc(a)infomarc.info> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M ChangeLog M libraries/config/messages.inc.php M libraries/plugins/import/AbstractImportCsv.class.php Log Message: ----------- Merge branch 'QA_4_4' of https://github.com/phpmyadmin/phpmyadmin into QA_4_4 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a0d89755448e...53677b8e250e

9 years, 4 months

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 166399: bug #4891 CSV Import ignores "Replace table data w...

by Madhura Jayaratne

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1663995c59bb989b43f7b91736c147abd6358fa2 https://github.com/phpmyadmin/phpmyadmin/commit/1663995c59bb989b43f7b91736c… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M ChangeLog M libraries/config/messages.inc.php M libraries/plugins/import/AbstractImportCsv.class.php Log Message: ----------- bug #4891 CSV Import ignores "Replace table data with file" checkbox Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: a0d89755448e3ff4e3a34fa0ef1405593fe7ac24 https://github.com/phpmyadmin/phpmyadmin/commit/a0d89755448e3ff4e3a34fa0ef1… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M ChangeLog M libraries/config/messages.inc.php M libraries/plugins/import/AbstractImportCsv.class.php Log Message: ----------- Merge pull request #1663 from madhuracj/bug4891 bug #4891 CSV Import ignores "Replace table data with file" checkbox Commit: 0e7ac33cb42f84e30e3fdd90951803f810a94434 https://github.com/phpmyadmin/phpmyadmin/commit/0e7ac33cb42f84e30e3fdd90951… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-05-07 (Thu, 07 May 2015) Changed paths: M ChangeLog M libraries/config/messages.inc.php M libraries/plugins/import/AbstractImportCsv.class.php Log Message: ----------- Merge branch 'QA_4_4' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7199825abd4a...0e7ac33cb42f

9 years, 4 months

← Newer
1
...
37
38
39
40
41
42
43
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git May 2015