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

106279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
c6a6bbfb2f Fix test expectations to match current code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 14:30:29 +02:00
Michal Čihař
bba718fa7a Fix type comment 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 14:28:51 +02:00
Michal Čihař
18c0786eae Improve addMessage calls 
- add call which accepts HTML markup
- use separator where applicable
- extend testcase to see HTML markup handling

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 14:25:33 +02:00
Michal Čihař
1277bc4666 Remove unused parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 14:06:18 +02:00
Michal Čihař
d052c4721e Merge branch 'QA_4_6' 2016-06-16 14:05:56 +02:00
Michal Čihař
1b0fde1b59 Remove duplicated code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 14:05:20 +02:00
Michal Čihař
7aa93f824d Fix documented parameter types 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:53:31 +02:00
Michal Čihař
2f220218de Merge branch 'QA_4_6' 2016-06-16 13:51:30 +02:00
Michal Čihař
69cfcc6abd Ensure width and height are integers 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:51:22 +02:00
Michal Čihař
9d6157fda7 Ensure we use escaped version of type 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:47:15 +02:00
Michal Čihař
9348d0cb16 Separate adding HTML markup to message from others 
We really want this to be explicit for easier review and hiding this in
second parameter of addParam doesn't make it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:41:35 +02:00
Michal Čihař
46e8121e41 Do not pass unexpected value as printview 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:27:19 +02:00
Michal Čihař
16c2b955e8 Fix parameter type documentation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:23:51 +02:00
Michal Čihař
e130141816 Merge branch 'QA_4_6' 2016-06-16 13:17:42 +02:00
Michal Čihař
a1f69b4c80 Fix syntax error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:17:36 +02:00
Michal Čihař
8170e7fcbc Merge branch 'QA_4_6' 2016-06-16 13:16:30 +02:00
Michal Čihař
8574aa4496 Remove documentatoin for no longer supported use cases 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:15:52 +02:00
Michal Čihař
5b05665ff0 Ensure kill ID is integer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:07:13 +02:00
Michal Čihař
e0a37a7ba0 Merge branch 'QA_4_6' 2016-06-16 13:03:43 +02:00
Michal Čihař
75d70119ed Merge remote-tracking branch 'origin/QA_4_6' 2016-06-16 13:03:39 +02:00
Michal Čihař
53cc34b374 Fix handing of GIS data 
* Force geometry count to be integer
* Ensure proper escaping of GIS data

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 13:02:48 +02:00
Jocelyn Flament
35b2624296 Translated using Weblate (French) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2016-06-16 13:02:27 +02:00
Michal Čihař
f883a111eb Add CII Best Practices badge 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 12:41:39 +02:00
Michal Čihař
12591f2227 Ask people to contribute code with tests 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 12:39:35 +02:00
Michal Čihař
2c87ba9846 Remove phpcs config as it makes the build fail (even when we do not use the data) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 12:23:28 +02:00
Michal Čihař
41ff771462 Add correct ignore list to phpcs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-16 12:19:10 +02:00
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