gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,312 Commits 12 Branches 481 Tags 2.4 GiB
a6b6792cfb
Commit Graph

113312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Desportes
a6b6792cfb
Added tests for Config::checkGitRevision and Config::isGitRevision 
#14253
Cherry-Picked-From: 9687dfbfd2
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-21 11:48:59 +01:00
William Desportes
1ead268e42
Add support for commondir file in .git dir 
- See : https://git-scm.com/docs/gitrepository-layout/2.5.1
- See : https://git-scm.com/docs/gitrepository-layout
#14391
Cherry-picked-from: 13e34b400a
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-21 11:48:49 +01:00
Maurício Meneghini Fauth
d7bea5c1fa Add ChangeLog entry for #14217 
[ci skip]

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-12-21 01:32:21 -02:00
Hosted Weblate
17589938b4
Merge branch 'origin/QA_4_8' into Weblate. 2018-12-21 04:28:30 +01:00
F4LL
964ca9b9da
Translated using Weblate (Japanese) 
Currently translated at 70.4% (2320 of 3296 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ja/
Signed-off-by: F4LL <yuutavx0319@gmail.com>
 2018-12-21 04:28:28 +01:00
Maurício Meneghini Fauth
289ef55f54
Merge pull request #14788 from mauriciofauth/mysql8-grant 
Fix issue when adding user on MySQL 8.0.11
 2018-12-21 01:28:22 -02:00
Isaac Bennetch
255d16f55f ChangeLog entry for commit 77bbfec0a9 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-12-19 19:41:04 -05:00
Maurício Meneghini Fauth
12f898d871 Fix issue when adding user on MySQL 8.0.11 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-12-19 22:23:46 -02:00
Maurício Meneghini Fauth
fd3b39d379 Allow failures for OSX on Travis 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-12-19 22:20:38 -02:00
Maurício Meneghini Fauth
a76816622f Revert "Add brew link step for PHP on OSX" 
This reverts commit 185061c008.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-12-19 22:19:42 -02:00
Maurício Meneghini Fauth
185061c008 Add brew link step for PHP on OSX 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-12-19 22:04:54 -02:00
Maurício Meneghini Fauth
15ee24e9eb Revert "Use PHP 7.3 for OSX on build matrix" 
This reverts commit 4f6ba939ee.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-12-19 22:04:05 -02:00
Maurício Meneghini Fauth
4f6ba939ee Use PHP 7.3 for OSX on build matrix 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-12-19 21:39:22 -02:00
William Desportes
a059bc28aa
Add ChangeLog entry for #14775 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-19 15:42:19 +01:00
William Desportes
9511484142
Fix #14775 - export to SQL format not available for tables 
Fixes: #14775 - export to SQL format not available for tables
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-19 15:41:13 +01:00
William Desportes
348f1fbd2e
Fix export issues/warnings 
- Fix php warning quick_export_onserver_overwrite
- Fix issues introduced by c1cdaac2f4
- Fix refresh an export displayed as text (token had mimatch because it was urlencoded)

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-19 15:40:46 +01:00
William Desportes
84977e3101
Add ChangeLog entry for #14791 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-19 10:56:47 +01:00
William Desportes
09e2585158
Fix #14791 - php warning, db_export.php#91 urldecode() 
Fixes: #14791 - php warning, db_export.php#91 urldecode() expects parameter 1 to be string, array given
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-19 10:56:47 +01:00
William Desportes
8fcd557d62
Add ChangeLog entries for #14794 and #14786 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-19 10:56:11 +01:00
William Desportes
3d2a2066f2
Fix #14786 - Table level Operations functions missing 
Fixes: #14786 - Table level Operations functions missing
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-19 10:56:10 +01:00
William Desportes
d98e8df824
Fix #14794 - Not responding to click, frozen interface 
Fixes: #14794 - Not responding to click, frozen interface, plugin Text_Plain_Sql error
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-19 10:56:09 +01:00
Walter Cheuk
7bc9dca84a
Translated using Weblate (Chinese (Traditional)) 
Currently translated at 98.7% (3254 of 3296 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/zh_Hant/
Signed-off-by: Walter Cheuk <wwycheuk@gmail.com>
 2018-12-19 10:25:25 +01:00
Madhura Jayaratne
2485b6191e
Translated using Weblate (Sinhala) 
Currently translated at 56.7% (1868 of 3296 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/si/
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-12-18 23:09:58 +01:00
Xavier Navarro
f1cf363d4d
Translated using Weblate (Catalan) 
Currently translated at 100.0% (3296 of 3296 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ca/
Signed-off-by: Xavier Navarro <xvnavarro@gmail.com>
 2018-12-17 21:35:44 +01:00
Maurício Meneghini Fauth
77bbfec0a9 Remove debug line 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-12-12 22:47:10 -02:00
Isaac Bennetch
09c188497e Prepare for 4.8.5-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-12-11 09:23:27 -05:00
Isaac Bennetch
a5f6178900 Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-12-10 21:07:06 -05:00
Isaac Bennetch
56ba19808f Adding composer lock for 4.8.4 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-12-10 21:03:41 -05:00
Isaac Bennetch
bd0383ee71 Prepare for version 4.8.4 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-12-10 14:49:35 -05:00
Isaac Bennetch
01c0c9f852 ChangeLog for security issues PMASA-2018-6, PMASA-2018-7, and PMASA-2018-08 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-12-10 14:46:18 -05:00
Madhura Jayaratne
752d544805
Merge pull request #262 from phpmyadmin/bug260 
Fix #260 Stored Cross-Site Scripting (XSS) in navigation tree
 2018-12-08 10:45:03 +11:00
Madhura Jayaratne
048670f1a5 Merge branch 'QA_4_8' into QA_4_8-security 2018-12-07 16:33:18 +11:00
Eddie Chang
b293ff5f23 Fix https://github.com/phpmyadmin/phpmyadmin-security/issues/260 Stored Cross-Site Scripting (XSS) in navigation tree 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-12-07 16:28:48 +11:00
Maurício Meneghini Fauth
d9e17d0316 Archive 2017 ChangeLog entries to the history repository 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-12-04 17:45:55 -02:00
Madhura Jayaratne
d4ed31339a
Merge pull request #257 from phpmyadmin/bug-245 
Fix #245 Remove transformation plugin includes
 2018-12-04 19:55:29 +11:00
Madhura Jayaratne
7fe8b4c39c
Merge pull request #253 from phpmyadmin/request_to_post 2018-12-04 19:27:05 +11:00
Madhura Jayaratne
e7f1e2697a Retrieve parameters from $_POST in server variables 2018-12-04 19:08:16 +11:00
William Desportes
6858635d60
Add ChangeLog entry for #14764 
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-01 22:22:20 +01:00
William Desportes
b5372b840c
Fix #14764 - left/right icons hidden 
Closes: #14764

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-01 22:20:57 +01:00
William Desportes
41e10d1c53
Add ChangeLog entry for #14352 
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-11-30 23:48:56 +01:00
William Desportes
9885df31fc
Merge pull request #14760 from williamdes/issue-14352-designer-php-error 
Fix #14352 - JavaScript errors with Designer

Closes: #14352
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-11-30 23:46:23 +01:00
William Desportes
cc2b1c8b99
Fix #14352 - JavaScript errors with Designer 
Closes: #14352

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-11-30 11:29:31 +01:00
William Desportes
84e99092ee
Add ChangeLog entry for #14617 and #13032 
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-11-29 20:28:01 +01:00
William Desportes
3f8305f10b
Merge pull request #14753 from williamdes/fix/designer-13032-QA_4_8 
Fixes designer errors when database is empty.
Fixes designer errors when database contains special chars.

Closes: #13032
Closes: #14744
Closes: #14617

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-11-29 20:23:35 +01:00
William Desportes
18c23df20f
Issue #13032 - fix designer on QA_4_8 
Used cherry-pick : Merge pull request #14376 from williamdes/issue-13032-designer

Cherry-picked-from: cb2dae58be

Issue #13032 - fix designer

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-11-29 20:19:02 +01:00
Kurt Eilertsen
8b106a44f9
Translated using Weblate (Norwegian Bokmål) 
Currently translated at 60.7% (2002 of 3296 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/nb_NO/
Signed-off-by: Kurt Eilertsen <kurt@kheds.com>
 2018-11-29 06:08:58 +01:00
Walter Cheuk
7d843bccd1
Translated using Weblate (Chinese (Traditional)) 
Currently translated at 98.5% (3248 of 3296 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/zh_Hant/
Signed-off-by: Walter Cheuk <wwycheuk@gmail.com>
 2018-11-29 06:08:46 +01:00
Maurício Meneghini Fauth
6a1ba61e29 Remove transformation plugin includes 
Tranformation plugins should be loaded by the autoloader.

Fixes https://github.com/phpmyadmin/phpmyadmin-security/issues/245

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-11-27 18:44:30 -02:00
ales-bulko
0be9c13689 Fixes #14658 - Regression on multi table query (#14681) 
Added functionality to generate SELECT query with JOINs of requested tables. It was mentioned that it's just a bug and it was working in previous versions, but I did not see any code fragments that would make it possible. Please, feel free to suggest any better solution if you don't like that one.

Fixes #14658

Signed-off-by: Aleš Buľko <ales.bulko@student.tuke.sk>
(cherry picked from commit 23ce7cec52)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-11-26 20:59:58 -02:00
Maurício Meneghini Fauth
5e8642b387 Fix DocBlocks issues 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-11-26 13:40:00 -02:00