gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,447 Commits 12 Branches 481 Tags 2.4 GiB
395bbd6089
Commit Graph

104447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Navarro
395bbd6089 Translated using Weblate (Catalan) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-01-08 10:34:37 +01:00
Marc Delisle
4f42679f0d Clarify variables 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-07 09:04:50 -05:00
Weblate
2ebb2c9e70 Merge remote-tracking branch 'origin/master' 2016-01-07 11:33:44 +01:00
初音ミク（Siketyan）
d37a477a04 Translated using Weblate (Japanese) 
Currently translated at 66.7% (2146 of 3217 strings)

[CI skip]
 2016-01-07 11:33:43 +01:00
Michal Čihař
f22ea96616 Merge branch 'QA_4_5' 2016-01-07 11:33:27 +01:00
Michal Čihař
bc849a41e5 Merge commit 'e1a718bba247cb126fb0233878a38e51f3b63492' 2016-01-07 11:33:21 +01:00
Michal Čihař
6de48ce8c1 Fix creating/editing VIEW with DEFINER containing special chars 
Fixes #11826

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-07 11:32:51 +01:00
Marc Delisle
71bf8768a0 Merge branch 'QA_4_5' 2016-01-06 12:14:51 -05:00
Weblate
e1a718bba2 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-06 18:14:35 +01:00
Isuru Abeywardana
532044e126 Translated using Weblate (Sinhala) 
Currently translated at 60.5% (1943 of 3210 strings)

[CI skip]
 2016-01-06 18:14:34 +01:00
Marc Delisle
eae51ef7c7 Fixes #11780 FROM clause not generated after loading search bookmark 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-06 12:14:13 -05:00
Marc Delisle
46f0e4cee5 No real comparisons 
https://github.com/dseguy/clearPHP/blob/master/rules/no-double-comparisons.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-06 08:28:22 -05:00
Michal Čihař
7d0ed672f3 Do not allow failures on hhvm and PHP 7.0 
The failures on these should be made really imports.

The PHP 7.0 build was just fixed by me and the hhvm seem to work without
problems in past weeks.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-06 12:17:36 +01:00
Michal Čihař
afd208df04 Enable phploc in the docs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-06 12:02:31 +01:00
Michal Čihař
79afd62136 Simplify test to avoid need fo multiline regexp 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-06 11:59:03 +01:00
Weblate
927c3e9cc9 Merge remote-tracking branch 'origin/master' 2016-01-06 11:41:15 +01:00
Isuru Abeywardana
1242b603d7 Translated using Weblate (Sinhala) 
Currently translated at 59.9% (1929 of 3217 strings)

[CI skip]
 2016-01-06 11:41:14 +01:00
Michal Čihař
047aeca312 Add missing escaping to regexp 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-06 11:41:03 +01:00
Marc Delisle
9df4afb256 This one needed a lettered operator 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-05 17:23:41 -05:00
Marc Delisle
68f8adfd84 No letters for logical operators 
https://github.com/dseguy/clearPHP/blob/master/rules/no-letter-logical.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-05 17:17:43 -05:00
Marc Delisle
847d3ffffb Remove extra whitespace 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-05 17:01:25 -05:00
Michal Čihař
cb72492aab Catch another exception coming from selenium 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 19:57:10 +01:00
Michal Čihař
3cb05dcadf Include Git information 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 17:46:20 +01:00
Michal Čihař
6a33ffbf88 Add phpdox configuration 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 17:46:09 +01:00
Michal Čihař
20c74d2124 Consistent parameter type docs (number -> integer) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 17:13:53 +01:00
Michal Čihař
eb37c77e97 PMA_sendHeaderLocation does not return anything 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 17:01:54 +01:00
Michal Čihař
628b19283d Fix spacing of docstrings 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:40:44 +01:00
Michal Čihař
7444c5340e Add missing docstring 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:37:26 +01:00
Michal Čihař
6e958185ec Fix docstring ordering 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:36:15 +01:00
Michal Čihař
ce1df2746b Coding style improvements 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:35:23 +01:00
Michal Čihař
049e62285c Fix spacing after . 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:33:13 +01:00
Michal Čihař
af258e8073 Fix spacing of comments 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:31:30 +01:00
Michal Čihař
ebda156932 The shared method has to be protected, not private 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:15:17 +01:00
Michal Čihař
a7bafe5a6c Share code for exporting routines and events to XML 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:08:32 +01:00
Michal Čihař
5801e7a019 Share _getPaperSizeArray code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 15:57:34 +01:00
Michal Čihař
65aecc8e9e Test theme rendering 
Tested for both built in themes.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 15:47:58 +01:00
Michal Čihař
d6546473c0 Add basic test for js messages 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 15:37:24 +01:00
Michal Čihař
ca59f5046c Use new contructor for Group() objects 
This safes us next calls to setName and setText.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 15:26:52 +01:00
Michal Čihař
4975ef2bc2 Use new constructor for Item() objects 
This allows to directly set name and text.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 15:04:02 +01:00
Michal Čihař
cd213039e8 Allow to specify name and text directly in OptionsPropertyItem contructor 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 15:04:02 +01:00
Marc Delisle
750af61ad5 Function was used before it was defined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-05 08:42:31 -05:00
Michal Čihař
1168ed61b4 Share code for routines export 
The exporting of functions and procedures is almost same.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 13:06:28 +01:00
Michal Čihař
c660edd057 Simplify code by removing parallel if statements 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 12:53:18 +01:00
Michal Čihař
063392e664 Merge branch 'QA_4_5' 2016-01-05 12:41:57 +01:00
Michal Čihař
fdcf305834 Fix operator placements and indentation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 12:41:48 +01:00
Michal Čihař
a74efb0c30 Simplify getting first element of an array 
Calling current() after reset() is duplicate as reset() already returns
current index value.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 12:37:50 +01:00
Michal Čihař
2bdd046b06 Remove not needed reset() 
The variable is used only with foreach(), which does reset internally
(or uses different pointer with PHP 7).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 12:33:39 +01:00
Michal Čihař
03f2e37ef4 Simplify code to get largest table 
We really do not have to sort the array, we just need the maximal value.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 12:29:03 +01:00
Michal Čihař
c9b0935e7d Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 12:18:05 +01:00
Michal Čihař
3c90f45020 Simplify shape record loading 
We can use foreach with reference to simplify the code.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 12:18:05 +01:00