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

115020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Desportes
1bb68a8925
Merge branch 'QA_4_8' 
Closes:  #15075
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-25 20:37:34 +01:00
William Desportes
4cae76832f
Add ChangeLog entry for #15074 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-25 20:33:30 +01:00
Agha Saad Fraz
ad61fad2cf Fix #15074 - Make the server logo visible on theme "original" 
Signed-off-by: Agha Saad Fraz <agha.saad04@gmail.com>
I have added the styling for the logo to make it visible. To make the code consistent, I have added the same padding for the logo which is being used in other themes for the same logo

Cherry-picked-from: d460093b05
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-25 20:31:58 +01:00
William Desportes
10cd180442 Fix #15095 - Wrong format of comments 
Fixes commit: 5ba97aa1de
Closes: #15108
Closes: #15107
Closes: #15097
Fixes: #15095
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-25 19:50:04 +01:00
William Desportes
5ba97aa1de
Fix #15095 - Wrong format of comments 
Closes: #15108
Closes: #15107
Closes: #15097
Fixes: #15095
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-25 18:58:42 +01:00
Agha Saad Fraz
b5384b9443 Remove unneccessary comment 
I have removed the unnecessary styling part from the file.
Signed-off-by: Agha Saad Fraz <agha.saad04@gmail.com>
 2019-03-25 18:53:07 +01:00
William Desportes
7fba7ff3a0
Fix #15071 - Improper display of hover box for original and pmahomme 
See: 88185f585c
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-25 18:28:45 +01:00
William Desportes
88185f585c
Fix #15071 - Improper display of hover box 
Fixes: #15071
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-25 14:08:42 +01:00
William Desportes
36359ec8f4
Fix #15065 - login page layout on theme original 
Fixes: #15065

[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-25 13:59:26 +01:00
Isaac Bennetch
eed0d5e740 ChangeLog entry for pull request #15061, committed as b09d956 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-03-24 19:34:46 -04:00
Nupur Agrawal
b09d9565df Deleted redundant help/tool tip on page settings (#15061) 
Removed redundant help/tool tip in page settings "Query history length" area.

Fixes issue #15029

Signed-off-by: Nupur Agrawal <nupur202000@gmail.com>
 2019-03-24 19:31:58 -04:00
Maurício Meneghini Fauth
f9cb2ad2d0 Create PhpMyAdmin\InternalRelations 
Extracts libraries/information_schema_relations.inc.php and
libraries/mysql_relations.inc.php relations to InternalRelations class.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-24 17:23:42 -03:00
Nitish Bahl
7ecd5cb28f removed overflow prop in server status 
Signed-off-by: Nitish Bahl <nitishbahl24@gmail.com>
 2019-03-24 09:18:08 +05:30
Maurício Meneghini Fauth
4d9da96469 Create server, database and table SqlControllers 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-23 22:41:29 -03:00
Agha Saad Fraz
683fcad837
Fix login page layout of theme original 
Signed-off-by: Agha Saad Fraz <agha.saad04@gmail.com>
I have fixed the login page layout of the theme original.
 2019-03-24 00:04:32 +05:00
Isaac Bennetch
b247fbedfe Fix typo 
Partially fixes: #15015

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-03-23 08:38:13 -04:00
William Desportes
aa5a18659b
Merge branch 'QA_4_8' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-23 09:08:01 +01:00
William Desportes
8282a7f1b6
Add ChangeLog entry for #14931 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-23 09:01:47 +01:00
William Desportes
2da5d8f390
Fix #14931 - count(): Parameter must be an array or an object that implements Countable, ./libraries/classes/Sql.php#1623 
Fixes: #14931
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-23 08:53:12 +01:00
Maurício Meneghini Fauth
aa0796c7db Move special_schema_links.inc.php to Config\SpecialSchemaLinks 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-22 21:29:58 -03:00
Maurício Meneghini Fauth
f1f109ac26 Create Database\MultiTableQueryController 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-22 12:22:27 -03:00
Hosted Weblate
463706cac2
Merge branch 'origin/QA_4_8' into Weblate. 2019-03-22 12:04:20 +01:00
blygs
7ad3284ca7
Translated using Weblate (Korean) 
Currently translated at 80.5% (2656 of 3298 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ko/
Signed-off-by: blygs <blygs@naver.com>
 2019-03-22 12:04:16 +01:00
Maurício Meneghini Fauth
a9115725b2 Create database RTE controllers 
- Create PhpMyAdmin\Controllers\Database\RoutinesController
- Create PhpMyAdmin\Controllers\Database\TriggersController
- Create PhpMyAdmin\Controllers\Database\EventsController
- Remove libraries/rte/rte_main.inc.php

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-22 02:35:45 -03:00
Maurício Meneghini Fauth
f009dfdb4f Merge branch 'QA_4_8' 2019-03-21 03:37:58 -03:00
Maurício Meneghini Fauth
9ffda070fe Add ChangeLog entry for #14916 
[ci skip]

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-21 03:37:08 -03:00
Maurício Meneghini Fauth
832a0e986e
Merge pull request #15058 from mauriciofauth/fix-create-edit-view 
Fix bug when creating or editing views
 2019-03-21 03:34:31 -03:00
Maurício Meneghini Fauth
33f510bfb4 Fix bug when creating or editing views 
Fixes #14916

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-20 19:14:02 -03:00
Maurício Meneghini Fauth
525326bd25 Update yarn.lock 
Related to 39c32d2fd2

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-20 17:46:54 -03:00
Maurício Meneghini Fauth
b46a4639b0 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-20 16:39:26 -03:00
Maurício Meneghini Fauth
3de704cf71 Skip test when PHP GD extension is not loaded 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-20 16:15:14 -03:00
Maurício Meneghini Fauth
fc3af85a7b Remove PHP nightly and fix osx build for 4.8 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-20 16:08:47 -03:00
William Desportes
39c32d2fd2
Upgrade codemirror to v5.45.0 
Previous update: 393204ccd0 (v5.37.0)
Fixes: #14475

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-20 20:02:39 +01:00
Maurício Meneghini Fauth
81bacd5ba6 Ignore Composer platform requirements for PHP nightly 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-20 15:46:46 -03:00
Hosted Weblate
26caa0236c
Merge branch 'origin/master' into Weblate. 
[CI skip]

Translation: phpMyAdmin/Development
Translate-URL:
 2019-03-20 16:25:55 +01:00
Alvaro Enrique Ruano
c16b39adbd
Translated using Weblate (Spanish) 
Currently translated at 96.4% (3197 of 3316 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/es/
Signed-off-by: Alvaro Enrique Ruano <alvaro.ruano90@outlook.com>
 2019-03-20 16:25:54 +01:00
Hosted Weblate
cdc0e6bfdd
Merge branch 'origin/QA_4_8' into Weblate. 2019-03-20 16:25:31 +01:00
Jamaro Ja Ma Ro
894ce01eb3
Translated using Weblate (Spanish) 
Currently translated at 97.8% (3226 of 3298 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/es/
Signed-off-by: Jamaro Ja Ma Ro <jamaropop@gmail.com>
 2019-03-20 16:25:29 +01:00
Alvaro Enrique Ruano
84927f98ab
Translated using Weblate (Spanish) 
Currently translated at 97.8% (3226 of 3298 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/es/
Signed-off-by: Alvaro Enrique Ruano <alvaro.ruano90@outlook.com>
 2019-03-20 16:25:29 +01:00
Jon Echeve
d7ad007236
Translated using Weblate (Spanish) 
Currently translated at 97.8% (3226 of 3298 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/es/
Signed-off-by: Jon Echeve <dragonportis1@gmail.com>
 2019-03-20 16:25:27 +01:00
Isaac Bennetch
704f96fc31 Fix merge conflicts 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-03-20 11:24:31 -04:00
Isaac Bennetch
5445d51a64 Improve grammar for a message from the validator. 
Thanks mostly to Si Jie sijie123@gmail.com for raising pull request

This modifies the po files as well to prevent the string from being
marked as fuzzy.

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-03-20 11:20:08 -04:00
Isaac Bennetch
e90f7adc02 Improve documentation grammar for two factor authentication section. 
Thanks mostly to Agha Saad Fraz agha.saad04@gmail.com for raising pull
request 15048.

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-03-20 11:08:03 -04:00
William Desportes
cdff5426d6
Merge branch 'QA_4_8' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-19 22:39:38 +01:00
William Desportes
c65c088419
Add ChangeLog entry for #14811 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-19 22:36:42 +01:00
William Desportes
3e41eca650
Fix #14811 - SHOW FULL TABLES FROM when a table is locked 
Fixes: #14811
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-19 22:34:22 +01:00
Maurício Meneghini Fauth
525a436162 Fix some PHPStan errors 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-19 16:48:54 -03:00
Maurício Meneghini Fauth
21e2ca4c4c Fix some PHPStan and phpcs errors 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-19 15:17:41 -03:00
Maurício Meneghini Fauth
e575d4a739 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-19 14:38:16 -03:00
Maurício Meneghini Fauth
75eb905727 Fix wrong property name on TableStructureController 
Introduced by 963ace6ada

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-19 14:31:10 -03:00