gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,292 Commits 12 Branches 481 Tags 2.4 GiB
5306fcc9c6
Commit Graph

92292 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugues Peccatte
5306fcc9c6 Minor coding style fixes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-08 21:51:24 +02:00
Madhura Jayaratne
8f1fcd5e6e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-05-08 18:06:57 +02:00
Madhura Jayaratne
75c7ad3827 Define the factory method last so the chart classes are defined by then 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-08 18:06:31 +02:00
Michal Čihař
ebefbfa126 Fix return type 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 18:04:07 +02:00
Michal Čihař
25bfa05e1b This is actually a string 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 18:04:07 +02:00
Michal Čihař
7f564b6f9a Correctly specify types in docblock 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 18:04:07 +02:00
Michal Čihař
6e6c513eed Fix typo in type name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 18:04:07 +02:00
Madhura Jayaratne
909e2785b5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-05-08 18:02:12 +02:00
Madhura Jayaratne
3bce6f1e70 Define before using 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-08 18:00:53 +02:00
Michal Čihař
bb90750766 Fix syntax error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 17:40:34 +02:00
Michal Čihař
eb29ddeba8 Remove never used parameter of cacheSet 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 17:37:40 +02:00
Michal Čihař
283ee59316 Remove never used parameter of cacheExists 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 17:37:40 +02:00
Michal Čihař
79bcd54610 Remove never used parameter of cacheGet 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 17:37:40 +02:00
Michal Čihař
8a731a80cb Do not hardcode mysqli in the interface library 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 17:37:40 +02:00
Michal Čihař
77ee02adc5 Explicitely mention this is a public 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 17:37:40 +02:00
Marc Delisle
f33f396c0e Remove unused parameters 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-08 17:29:22 +02:00
Marc Delisle
e624ce93bf Remove break after exit 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-08 17:26:13 +02:00
Marc Delisle
85a0ff6619 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-08 17:25:16 +02:00
Michal Čihař
dc0905a0c4 Check whether we got valid result before trying to use it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 17:03:40 +02:00
Marc Delisle
e57088ef79 Remove unused parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-08 16:16:52 +02:00
Michal Čihař
20b829df6a Revert "Try enabling php_cs_fixer in scrutinizer" 
This reverts commit bf3fccaf46.

It seems to do nothing.
 2014-05-08 16:06:44 +02:00
Michal Čihař
c869983f11 Remove unused support for fetchResult getting MySQL result 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 15:28:49 +02:00
Michal Čihař
98c7ac94db Remove unused support for fetchSingleRow getting MySQL result 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 15:27:07 +02:00
Michal Čihař
862541d000 Remove unused support for fetchValue getting MySQL result 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 15:24:27 +02:00
Michal Čihař
e47566f9fd Fix code docblocks 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 15:22:21 +02:00
Michal Čihař
7996bd1c21 Move hex encoding back to getContent method 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 15:17:55 +02:00
Michal Čihař
bf3fccaf46 Try enabling php_cs_fixer in scrutinizer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 15:16:28 +02:00
Michal Čihař
f1256f7dcc Simplify map tiles urls in CSP policy 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 15:00:41 +02:00
Michal Čihař
692140b98e Simplify code for generating CSP with Captcha 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 14:58:03 +02:00
Michal Čihař
bc8f797746 Remove CSP support for ancient Safari versions 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 14:55:43 +02:00
Michal Čihař
0b2e35da19 Execute headers code when we have runkit 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 14:53:14 +02:00
Michal Čihař
708d058b63 Fix text expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 14:46:47 +02:00
Marc Delisle
dd7e0e73ae Add twitter message sending to the release script 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-08 14:25:19 +02:00
Michal Čihař
bdd5f81f51 Break not needed after return 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 14:14:30 +02:00
Michal Čihař
4b0c2a185a Document possibly dead code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 14:14:15 +02:00
Michal Čihař
452a203d35 Break not needed after return 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 14:10:44 +02:00
Michal Čihař
ca433dafe1 Remove parameters we do not use 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 14:10:02 +02:00
Michal Čihař
aba07a933b Remove not needed declaration 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 14:06:18 +02:00
Michal Čihař
d9d359fea9 Remove not needed parsing of query 
It was needed when we highlighted the SQL query in PHP, but it's not the
case anymore.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 13:59:03 +02:00
Michal Čihař
ad8c3d8c6f Remove unused parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 13:57:19 +02:00
Michal Čihař
e3d93b7f8a Simplify code for generating separators array 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 13:54:25 +02:00
Michal Čihař
87cc1c0067 Simplify code for getting node class 
Having empty class attribute does not harm anything and this makes the
code simpler.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 13:50:58 +02:00
Michal Čihař
54a17f5230 Simplify code for rendering node 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 13:49:21 +02:00
Michal Čihař
8c178843e4 The integer value is not used as $recursive 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 13:48:01 +02:00
Michal Čihař
bf2c4ab1c8 Remove not needed assignment 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 13:45:11 +02:00
Weblate
06d94299c6 Merge remote-tracking branch 'origin/master' 2014-05-08 13:20:52 +02:00
Michal Čihař
6e7bfba6a1 Translated using Weblate (German) 
Currently translated at 93.9% (2601 of 2768)
 2014-05-08 13:20:49 +02:00
Marc Delisle
ff86eec0df 4.2.0 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-08 13:20:37 +02:00
Marc Delisle
ed5aec2a56 Merge commit '61d014a' 2014-05-08 13:20:11 +02:00
Marc Delisle
61d014ad2f 4.2.0 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-08 13:19:22 +02:00