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

106253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
f593b9feb2 Fix path 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 12:03:23 +02:00
Michal Čihař
7d2ee72fcb Install phpMyAdmin coding standard before run 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 11:59:50 +02:00
Michal Čihař
d907030789 Teach Scrutinizer to use our own standard 
Based on docs, see
https://scrutinizer-ci.com/docs/tools/php/code-sniffer/

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 11:53:16 +02:00
Weblate
c5beea64fd Merge remote-tracking branch 'origin/master' 2016-06-16 11:40:29 +02:00
Jocelyn Flament
fe477911e4 Translated using Weblate (French) 
Currently translated at 99.6% (3198 of 3208 strings)

[CI skip]
 2016-06-16 11:40:27 +02:00
Michal Čihař
45ef3aed75 Remove needless inclusion of export.php from tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 11:38:58 +02:00
Michal Čihař
fe18b9477f Remove possibility to use global name as message string 
This is really confusing and can cause surprising effects when parameter
(eg. table name) matches some global.

Also I think this is really not used anywhere.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 11:35:58 +02:00
Michal Čihař
8af7b7e48a Merge branch 'QA_4_6' 2016-06-15 13:03:09 +02:00
Michal Čihař
73d067a540 Fix test for new redirect code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-15 13:02:59 +02:00
Michal Čihař
9b7a6967a8 Merge branch 'QA_4_6' 2016-06-15 11:46:29 +02:00
Michal Čihař
8a142aba73 Adjust tests to new behavior 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-15 11:45:16 +02:00
Michal Čihař
a6af9fb407 Merge branch 'QA_4_6' 2016-06-15 11:43:18 +02:00
Michal Čihař
9e0a321551 Canonicalize redirect URL 
We provide absolute path now to avoid problems with URLs like
/phpmyadmin/index.php/.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-15 11:42:45 +02:00
Michal Čihař
e5337e51b0 Merge branch 'QA_4_6' 2016-06-15 11:38:38 +02:00
Michal Čihař
47f918f3fe Use standard redirect function 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-15 11:38:00 +02:00
Michal Čihař
422c8da303 Merge branch 'QA_4_6' 2016-06-15 11:30:17 +02:00
Michal Čihař
ef6c66dca1 Properly escape database name in central column queries 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-15 11:29:31 +02:00
Isaac Bennetch
07147d174c Setup script icons broken 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-14 23:42:45 -04:00
Isaac Bennetch
94192d66c7 Correct typo 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-14 13:29:30 -04:00
Michal Čihař
6f464be7a0 Merge pull request #12319 from ibennetch/checkstyle 
Fix some CodeSniffer warnings and errors
 2016-06-14 09:41:32 +02:00
Michal Čihař
136b85fc97 Produce valid JSON on export 
The JSON export now generates valid JSON data, but this means that the
resulting JSON format has changed.

Fixes #12307

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-14 09:16:58 +02:00
Michal Čihař
25ede08182 Merge branch 'QA_4_6' 2016-06-14 08:30:03 +02:00
Michal Čihař
79a34ff94c Calculate table size as integer 
It should be big enough on 64-bit systems, so avoid rounding issues
which double calculations can bring.

Fixes #12303

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-14 08:28:26 +02:00
Michal Čihař
8a0e39228f Merge branch 'QA_4_6' 2016-06-13 12:55:08 +02:00
Michal Čihař
eaba32e55d Merge remote-tracking branch 'origin/QA_4_6' 2016-06-13 12:54:40 +02:00
Michal Čihař
b5faeb3c27 Fixed editing of server variable 
We now store verbatim variable name in HTML to avoid need to do some
magical transformations when parsing it.

Fixes #12317

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-13 12:53:34 +02:00
Michal Čihař
0caecf5fc8 Correct error handling when editing variable fails 
Issue #12317

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-13 12:46:29 +02:00
Isaac Bennetch
317ad3208c Fix comment typos 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-12 23:15:48 -04:00
Isaac Bennetch
e6db8e18ee Fix some CodeSniffer warnings and errors 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-12 23:12:23 -04:00
Bruno Henrique
2d7d2d2e8b Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.3% (2996 of 3209 strings)

[CI skip]
 2016-06-13 00:45:21 +02:00
Bruno Henrique
94cd73efce Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.1% (2987 of 3208 strings)

[CI skip]
 2016-06-13 00:45:17 +02:00
Xavier Navarro
c8823e24e7 Translated using Weblate (Catalan) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2016-06-13 00:44:14 +02:00
Jocelyn Flament
baaa6c63be Translated using Weblate (French) 
Currently translated at 99.8% (3203 of 3209 strings)

[CI skip]
 2016-06-12 18:44:35 +02:00
Jocelyn Flament
35e66c14f8 Translated using Weblate (French) 
Currently translated at 99.5% (3192 of 3208 strings)

[CI skip]
 2016-06-12 18:44:31 +02:00
Xavier Navarro
29cdb4ccde Translated using Weblate (Catalan) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2016-06-11 00:08:36 +02:00
Michal Čihař
c00cc4a15a Remove documentation for Docker PMA_ABSOLUTE_URI 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-10 13:50:53 +02:00
Michal Čihař
b23dcfb456 Remove no longer used bigints javascript 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-09 14:33:48 +02:00
Michal Čihař
cff938e15b Merge branch 'QA_4_6' 2016-06-09 09:49:41 +02:00
Michal Čihař
3c6675b3f9 Fix division by zero in case of misconfigured MySQL server 
Fixes #12308

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-09 09:49:13 +02:00
Michal Čihař
c70aed7a1d Merge branch 'QA_4_6' 2016-06-09 09:40:21 +02:00
Michal Čihař
763683b4fe Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-09 09:40:16 +02:00
Michal Čihař
62d417db9b Merge branch 'QA_4_6' 2016-06-09 09:20:26 +02:00
Michal Čihař
3f8ec9b1db Merge remote-tracking branch 'origin/QA_4_6' 2016-06-09 09:20:23 +02:00
Gergő Felföldi
d0770959ce Translated using Weblate (Hungarian) 
Currently translated at 95.4% (3063 of 3208 strings)

[CI skip]
 2016-06-09 09:20:12 +02:00
Michal Čihař
b261ecae25 Add test for possible rounding issues 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-09 09:19:55 +02:00
Michal Čihař
43fdcb67ee Include phpMyAdmin version in JSON dump 
This provides useful information, the 0.1 string was not really helpful.

Issue #12304

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-09 09:19:55 +02:00
Gergő Felföldi
99f17c107e Translated using Weblate (Hungarian) 
Currently translated at 95.8% (3075 of 3209 strings)

[CI skip]
 2016-06-09 09:19:47 +02:00
Michal Čihař
e6ff157dda The session_destroy is already called on logout 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-08 15:30:55 +02:00
Weblate
189c122413 Merge remote-tracking branch 'origin/master' 2016-06-08 14:00:43 +02:00
Satnam S Virdi
34c0bf1afd Translated using Weblate (Punjabi) 
Currently translated at 3.1% (101 of 3208 strings)

[CI skip]
 2016-06-08 14:00:42 +02:00