webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-28 07:41:55 +03:00
Code Activity
114,388 Commits 12 Branches 481 Tags
25e480666e8a615aed346d22bc2e267df6b22f97
Commit Graph

1120 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
25e480666e Fix doc comments alignment 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-07 15:09:32 -02:00
Maurício Meneghini Fauth
23c3579804 Format array declarations 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-07 14:31:39 -02:00
Maurício Meneghini Fauth
4cee0cbc12 Adds space after not (!) and type cast 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-05 21:56:34 -02:00
Maurício Meneghini Fauth
999b4d14f0 Fix some coding standard errors 
- Fixes array identation
- Removes empty statements

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-05 21:25:08 -02:00
Maurício Meneghini Fauth
3a7e1503ac Fix some coding standard errors 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-04 19:42:10 -02:00
Feliks Toomsoo
d6dde0180d Fix the table chart by not escaping null values 
Signed-off-by: Feliks Toomsoo <feliks.toomsoo@gmail.com>
 2018-12-26 20:10:02 +02:00
Maurício Meneghini Fauth
38e5b12c1c Define an absolute path to use for require statements 
Fixes #6167

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-12-22 14:37:31 -02:00
William Desportes
fe587e05b4 Merge branch 'QA_4_8' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-21 17:10:11 +01:00
William Desportes
3da7230faf Merge remote-tracking branch 'williamdes/issues-14635-14762-git-dir-removed' into QA_4_8 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-21 16:16:16 +01:00
William Desportes
b6f38940f4 Merge pull request #14799 from williamdes/issue-13788-export-view 
Fix #13788 - Exporting a view structure, no database selected error

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-21 16:15:06 +01:00
William Desportes
99cee9e389 Fix #14635 - Git revision error 
See: #14762
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-21 15:02:13 +01:00
William Desportes
3ca6646137 Fix found by phpstan 
See: cc2665121d
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-21 11:49:00 +01:00
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
a04a596829 Merge pull request #14792 from mauriciofauth/bootstrap-buttons 
Use Bootstrap buttons component
 2018-12-21 02:01:10 -02:00
Maurício Meneghini Fauth
2edd97a62b Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-12-21 01:55:50 -02:00
Maurício Meneghini Fauth
ef5d7dd66b Use Bootstrap buttons component 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-12-21 01:01:12 -02:00
Maurício Meneghini Fauth
5bce6d9fa6 Add Bootstrap javascript file 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-12-20 22:34:12 -02:00
Maurício Meneghini Fauth
f367a1b98d Merge pull request #14793 from mauriciofauth/html-closing-tags 
Remove unnecessary HTML closing tags
 2018-12-20 22:30:39 -02:00
William Desportes
cfc96202fe Fix #13788 - Exporting a view structure, no database selected error 
Fix #13788 - Exporting a view structure based on another view with a sub-query throws no database selected error

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-20 11:20:49 +01: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
William Desportes
789287c1b5 Merge branch 'QA_4_8' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-19 15:45:00 +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
3d28438949 Merge branch 'QA_4_8' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-12-19 11:04:28 +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
Maurício Meneghini Fauth
9eba565bf4 Remove unnecessary HTML closing tags 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-12-19 00:12:54 -02:00
Madhura Jayaratne
abb690e536 Escape SQL query in copy query functionality. Thanks to Ashish Kamble for reporting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-12-14 23:23:55 +11: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
Maurício Meneghini Fauth
129086398f Remove unnecessary superglobals declarations 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-12-12 21:17:06 -02:00
Maurício Meneghini Fauth
76d8bfdafa Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-12-12 21:04:19 -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
bd0383ee71 Prepare for version 4.8.4 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-12-10 14:49:35 -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
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
e7f1e2697a Retrieve parameters from $_POST in server variables 2018-12-04 19:08:16 +11:00
William Desportes
69fb1d0237 Merge branch 'QA_4_8' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-11-30 23:50:56 +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
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
William Desportes
4a7ab3a1cb Merge pull request #14750 from williamdes/type-error-routine-definition 
Fix #14749 - Uncaught TypeError in routines

Closes: #14749
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-11-29 19:49:12 +01:00
Mohammad Reza Mansouri
95167e6893 Fix missed padding on query results (#14730) 
Solves missed paddings on query results.

Fixes #14053 

Signed-off-by: Mohammad Reza Mansouri <beekalam@gmail.com>
 2018-11-28 20:52:36 -02: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
William Desportes
ca072c96d9 fix #14749 - Uncaught TypeError in routines 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-11-27 11:57:38 +01: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
ales-bulko
23ce7cec52 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>
 2018-11-26 20:34:09 -02:00
Tomas Votruba
38301a6a9f fixup! [cs] remove unused brackets, clean unused property assign 
Signed-off-by: Tomas Votruba <tomas.vot@gmail.com>
 2018-11-26 17:55:14 +01:00
Tomas Votruba
637fe6de06 [cs] remove unused brackets, clean unused property assign 
Signed-off-by: Tomas Votruba <tomas.vot@gmail.com>
 2018-11-26 17:54:40 +01:00