gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,984 Commits 12 Branches 481 Tags 2.4 GiB
39c32d2fd2
Commit Graph

114984 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Maurício Meneghini Fauth
1f7e7cee92 Fix some PHPStan errors 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-19 01:13:27 -03:00
Maurício Meneghini Fauth
4001839460 Upgrade PHPStan to v0.11.4 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-18 20:29:02 -03:00
ssantos
c6d4502162
Translated using Weblate (Portuguese) 
Currently translated at 79.0% (2605 of 3298 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/pt/
Signed-off-by: ssantos <ssantos@web.de>
 2019-03-19 00:04:47 +01:00
Maurício Meneghini Fauth
2910b583aa
Merge pull request #15030 from mauriciofauth/more-settings 
Move 'More settings' link from 'Appearance settings' to 'General settings'
 2019-03-18 14:24:19 -03:00
ssantos
e585fed312
Translated using Weblate (Portuguese) 
Currently translated at 77.6% (2572 of 3316 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/pt/
Signed-off-by: ssantos <ssantos@web.de>
 2019-03-18 03:29:01 +01:00
Alvaro Enrique Ruano
29a48ed173
Translated using Weblate (Spanish) 
Currently translated at 97.8% (3224 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-17 16:04:17 +01:00
Alvaro Enrique Ruano
33e2f813e2
Translated using Weblate (Spanish) 
Currently translated at 96.3% (3194 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-17 16:04:17 +01:00
ssantos
1ca6c3b113
Translated using Weblate (Portuguese) 
Currently translated at 72.4% (2389 of 3298 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/pt/
Signed-off-by: ssantos <ssantos@web.de>
 2019-03-17 16:04:15 +01:00
ssantos
7033abc139
Translated using Weblate (Portuguese) 
Currently translated at 71.1% (2359 of 3316 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/pt/
Signed-off-by: ssantos <ssantos@web.de>
 2019-03-17 16:04:15 +01:00
Maurício Meneghini Fauth
4b61201899 Refactor index.php 
Extracts actions to controller

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-16 18:07:31 -03:00
William Desportes
f3c94b7c92
Merge branch 'QA_4_8' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-16 21:21:17 +01:00
William Desportes
0dbd08c610
Add ChangeLog entry for b5659f09 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-16 21:19:46 +01:00
William Desportes
e33f806dd3
Add ChangeLog entry for #14359 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-16 21:19:09 +01:00
William Desportes
b5659f09af
Fix error reporting on multi server setup 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-16 21:14:47 +01:00
William Desportes
27f7b7a75f
Fix, prevent multiple error reporting modals 
See: fa303ee292
Seee: #14359
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-16 21:05:28 +01:00
William Desportes
e889aea9e1
Add ChangeLog entry for 346eb905 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-16 20:15:11 +01:00
William Desportes
346eb9057d
Show error message if config-set fails and not "loading..." forever 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-16 20:14:05 +01:00
William Desportes
88cb4c38bd
Add ChangeLog entry for #14826 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-16 17:53:37 +01:00
William Desportes
0223c0607e
Fix #14826 - PMA_messages is not defined 
This issue occurs when the session folder does not have access permissions and a file calls it as a script (see: index.php). This creates a javascript issue because PMA_messages are not defined.

Fixes: #14826

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-16 17:50:33 +01:00
William Desportes
6108b955d8
Merge branch 'QA_4_8' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-16 15:27:31 +01:00
William Desportes
03ce2d9fce
Add ChangeLog entry for #14053 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-16 15:26:06 +01:00
Mohammad Reza Mansouri
23753e071e Fix missed padding on query results (#14730) 
Solves missed paddings on query results.

Fixes #14053 

Signed-off-by: Mohammad Reza Mansouri <beekalam@gmail.com>
 2019-03-16 15:07:36 +01:00
William Desportes
5e6fdf2299
Removed inline styles from js/server_status_monitor 
#12262
Closes: #14980
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-16 15:03:07 +01:00
William Desportes
504fe5d83a
Fix style issues 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-16 14:49:14 +01:00
Maurício Meneghini Fauth
8c428dd63d Move 'More settings' link from 'Appearance settings' to 'General settings' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-15 21:49:29 -03:00
Maurício Meneghini Fauth
cedfe813b9 Create PhpMyAdmin\Controllers\HomeController 
Extracts HTML from index.php to home/index template

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-15 21:20:44 -03:00
Maurício Meneghini Fauth
ef7c18b6df Remove PHP closing tag from libraries/language_stats.inc.php 
Use short syntax for the array

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-15 15:41:03 -03:00
Maurício Meneghini Fauth
ddb29d57b4 Merge branch 'QA_4_8' 2019-03-15 14:40:23 -03:00
Maurício Meneghini Fauth
2210debbf9 Fix type error in setup script when adding new server 
Fixes #14312

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-03-15 14:38:58 -03:00
William Desportes
faeea62b01
Merge branch 'QA_4_8' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-15 00:35:16 +01:00
William Desportes
7d6d1c7865
Fix #14991 - TypeError in GIS editor 
Fixes: Cannot read property 'w' of null
See: https://github.com/openlayers/ol2/issues/669
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-15 00:23:01 +01:00
William Desportes
21ac7146d2
Add ChangeLog entry for #14991 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-14 23:01:38 +01:00
William Desportes
32cb95a6c9
Fix multi server setup for GIS editor 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-14 23:00:39 +01:00
William Desportes
cbf0bf4d6a
Fix #14991 - TypeError in GIS editor 
Fixes: #14991
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-14 22:55:57 +01:00
Apoorv Khare
8e18959233 Fix #14991 TypeError in GIS editor 
Apoorv Khare <apoorvkhare007@gmail.com>

Signed-off-by: Apoorv Khare <apoorvkhare007@gmail.com>
 2019-03-15 03:04:56 +05:30
AghaSaad04
e24467d2d8 Minor grammatical, punctuation bugs (#15021) 
- Minor grammatical, punctuation bugs
- Update vendors.rst, removed some grammatical and punctuation errors from "vendors.rst" file for better understanding

Signed-off-by: William Desportes <williamdes@wdes.fr>
Signed-off-by: Agha Saad Fraz <afraz.bese16seecs@seecs.edu.pk>
 2019-03-14 21:13:52 +01:00