Git December 2014

git@phpmyadmin.net

24 participants
453 discussions

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 0bc4e2: Use spaces to improve readability
by Madhura Jayaratne 23 Dec '14

23 Dec '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0bc4e2e6049f25da1fc3f9ec894d4c76e83396ff https://github.com/phpmyadmin/phpmyadmin/commit/0bc4e2e6049f25da1fc3f9ec894… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M js/functions.js Log Message: ----------- Use spaces to improve readability Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 21b63f: Fix js reports: JSONparse Syntax Error: Unexpected...
by Madhura Jayaratne 23 Dec '14

23 Dec '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 21b63f9af40d2fde8b88eb27c868fd369926cc1f https://github.com/phpmyadmin/phpmyadmin/commit/21b63f9af40d2fde8b88eb27c86… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M js/console.js Log Message: ----------- Fix js reports: JSONparse Syntax Error: Unexpected token '<' Signed-off-by: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Commit: 7cf678f79df2fb017bcb74750cf1108ff4ee55f4 https://github.com/phpmyadmin/phpmyadmin/commit/7cf678f79df2fb017bcb74750cf… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M ChangeLog M libraries/sql.lib.php Log Message: ----------- bug #4664 select min() displays 1 row, but reports the table amount of rows returned Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 974f7afe71e9d37fc08bf16694beb15da3a8da56 https://github.com/phpmyadmin/phpmyadmin/commit/974f7afe71e9d37fc08bf16694b… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M ChangeLog M js/console.js M libraries/sql.lib.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge branch 'QA_4_3' Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 6e688982cc5c21e4ea6119512fc7b7a50049cacc https://github.com/phpmyadmin/phpmyadmin/commit/6e688982cc5c21e4ea6119512fc… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/26ecf0e95495...6e688982cc5c

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 7cf678: bug #4664 select min() displays 1 row, but reports...
by Madhura Jayaratne 23 Dec '14

23 Dec '14

Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7cf678f79df2fb017bcb74750cf1108ff4ee55f4 https://github.com/phpmyadmin/phpmyadmin/commit/7cf678f79df2fb017bcb74750cf… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M ChangeLog M libraries/sql.lib.php Log Message: ----------- bug #4664 select min() displays 1 row, but reports the table amount of rows returned Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 21b63f: Fix js reports: JSONparse Syntax Error: Unexpected...
by Atul Pratap Singh 23 Dec '14

23 Dec '14

Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 21b63f9af40d2fde8b88eb27c868fd369926cc1f https://github.com/phpmyadmin/phpmyadmin/commit/21b63f9af40d2fde8b88eb27c86… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M js/console.js Log Message: ----------- Fix js reports: JSONparse Syntax Error: Unexpected token '<' Signed-off-by: Atul Pratap Singh <atulpratapsingh05(a)gmail.com>

1 0

[Phpmyadmin-git] [phpmyadmin/localized_docs] f82eae: Translated using Weblate (German)
by Ann + J.M 23 Dec '14

23 Dec '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/localized_docs Commit: f82eaedbd78d5808da895e1c438b7cea069ac9eb https://github.com/phpmyadmin/localized_docs/commit/f82eaedbd78d5808da895e1… Author: Ann + J.M <phpMyAdmin(a)ZweiSteinSoft.de> Date: 2014-12-23 (Tue, 23 Dec 2014) Changed paths: M po/de.mo M po/de.po Log Message: ----------- Translated using Weblate (German) Currently translated at 26.7% (444 of 1657 strings) [CI skip]

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 66c7c0: Remove borders in table browse tab (linked to #464...
by Marc Delisle 22 Dec '14

22 Dec '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 66c7c04582e01b0a6e1f968b98197533c0dd9efc https://github.com/phpmyadmin/phpmyadmin/commit/66c7c04582e01b0a6e1f968b981… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2014-12-22 (Mon, 22 Dec 2014) Changed paths: M themes/pmahomme/css/common.css.php Log Message: ----------- Remove borders in table browse tab (linked to #4648). Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com> Commit: f735d2360b91c5cdf101cf8d103eaf9765395295 https://github.com/phpmyadmin/phpmyadmin/commit/f735d2360b91c5cdf101cf8d103… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-12-22 (Mon, 22 Dec 2014) Changed paths: M themes/pmahomme/css/common.css.php Log Message: ----------- Merge pull request #1434 from Tithugues/b4648_qa43_browseTab Remove borders in table browse tab (linked to #4648). Commit: 11f22027dd1f1af5376c831b49bf096b193f62c0 https://github.com/phpmyadmin/phpmyadmin/commit/11f22027dd1f1af5376c831b49b… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-12-22 (Mon, 22 Dec 2014) Changed paths: M themes/pmahomme/css/common.css.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 26ecf0e954959d0b7e0dc6895364ef6d7feba489 https://github.com/phpmyadmin/phpmyadmin/commit/26ecf0e954959d0b7e0dc689536… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-12-22 (Mon, 22 Dec 2014) Log Message: ----------- Merge commit 'f735d23' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/44060b77c9d1...26ecf0e95495

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 66c7c0: Remove borders in table browse tab (linked to #464...
by Marc Delisle 22 Dec '14

22 Dec '14

Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 66c7c04582e01b0a6e1f968b98197533c0dd9efc https://github.com/phpmyadmin/phpmyadmin/commit/66c7c04582e01b0a6e1f968b981… Author: Hugues Peccatte <hugues.peccatte(a)gmail.com> Date: 2014-12-22 (Mon, 22 Dec 2014) Changed paths: M themes/pmahomme/css/common.css.php Log Message: ----------- Remove borders in table browse tab (linked to #4648). Signed-off-by: Hugues Peccatte <hugues.peccatte(a)gmail.com> Commit: f735d2360b91c5cdf101cf8d103eaf9765395295 https://github.com/phpmyadmin/phpmyadmin/commit/f735d2360b91c5cdf101cf8d103… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-12-22 (Mon, 22 Dec 2014) Changed paths: M themes/pmahomme/css/common.css.php Log Message: ----------- Merge pull request #1434 from Tithugues/b4648_qa43_browseTab Remove borders in table browse tab (linked to #4648). Compare: https://github.com/phpmyadmin/phpmyadmin/compare/481e89ac941c...f735d2360b91

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 481e89: Fix merge conflict
by Marc Delisle 22 Dec '14

22 Dec '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 481e89ac941cd5567ad39ee4fcec6ea3eb25e4ae https://github.com/phpmyadmin/phpmyadmin/commit/481e89ac941cd5567ad39ee4fce… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-12-22 (Mon, 22 Dec 2014) Changed paths: M ChangeLog M js/console.js Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 44060b77c9d1b5ff47ae9ed17712cccedd4b8a60 https://github.com/phpmyadmin/phpmyadmin/commit/44060b77c9d1b5ff47ae9ed1771… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-12-22 (Mon, 22 Dec 2014) Changed paths: M ChangeLog M js/console.js Log Message: ----------- Merge branch 'QA_4_3' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3621900b96c2...44060b77c9d1

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 481e89: Fix merge conflict
by Madhura Jayaratne 22 Dec '14

22 Dec '14

Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 481e89ac941cd5567ad39ee4fcec6ea3eb25e4ae https://github.com/phpmyadmin/phpmyadmin/commit/481e89ac941cd5567ad39ee4fce… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-12-22 (Mon, 22 Dec 2014) Changed paths: M ChangeLog M js/console.js Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc(a)infomarc.info>

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 05a75c: Fix comment
by Madhura Jayaratne 22 Dec '14

22 Dec '14

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 05a75cdae93c30bdfd6f89397322c6efa9b1c6f5 https://github.com/phpmyadmin/phpmyadmin/commit/05a75cdae93c30bdfd6f8939732… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-12-22 (Mon, 22 Dec 2014) Changed paths: M js/console.js Log Message: ----------- Fix comment Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: fbe587ce7386de47f728ad8c8f167fc945e18501 https://github.com/phpmyadmin/phpmyadmin/commit/fbe587ce7386de47f728ad8c8f1… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-12-22 (Mon, 22 Dec 2014) Changed paths: M ChangeLog M import.php Log Message: ----------- bug #4661 Drag and drop file import always fails Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 3621900b96c2cdf519ed5a0eddeab346513af967 https://github.com/phpmyadmin/phpmyadmin/commit/3621900b96c2cdf519ed5a0edde… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-12-22 (Mon, 22 Dec 2014) Changed paths: M ChangeLog M import.php Log Message: ----------- Merge branch 'QA_4_3' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f6165c649f19...3621900b96c2

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git December 2014