Commit Graph

95838 Commits

Author SHA1 Message Date
Madhura Jayaratne
2377ba4dd7 bug #4582 Debug SQL works only for the first page
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-10 11:30:33 +05:30
Madhura Jayaratne
63861210d8 Partial fix for bug #4581 Some links in query_result doesn't work 2014-11-10 07:00:59 +05:30
Madhura Jayaratne
5c739d6c2d Define variables needed for testing
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-10 06:20:18 +05:30
Hugues Peccatte
1110aa3c0e Fix undefined variable.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-09 19:27:20 +01:00
Hugues Peccatte
19cb4a7eb9 Fix PHPDoc for provider.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-09 18:59:51 +01:00
Hugues Peccatte
2768d398b5 Reduce nesting levels.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-09 17:36:14 +01:00
Hugues Peccatte
4922230bb6 Add test for PMA_StorageEngine::getEngine.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-09 17:22:26 +01:00
Marc Delisle
8a3af94d35 Refactor code duplication
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-09 08:04:30 -05:00
Hugues Peccatte
80eb1091ee Refactorise code.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-08 19:33:05 +01:00
Hugues Peccatte
604edcbd44 Remove unused local variables.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-08 18:07:47 +01:00
Hugues Peccatte
076ff24cb3 PHPDoc update.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-08 18:06:56 +01:00
Hugues Peccatte
a93288e508 Reduce nested levels.
Remove unused local variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-08 17:58:57 +01:00
Hugues Peccatte
93c86da700 Minor style modifications.
PHPDoc update.
Reduce nested levels.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-08 17:34:10 +01:00
Hugues Peccatte
6827afb2bd Replace parameters by class attributes.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-08 15:36:21 +01:00
Hugues Peccatte
458afb0391 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-11-08 15:27:33 +01:00
Hugues Peccatte
aa9700de68 Replace parameters by class attributes.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-08 15:25:40 +01:00
Marc Delisle
065397cd84 Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-08 06:48:56 -05:00
Marc Delisle
685b116172 Merge commit '2a58116' 2014-11-08 06:47:22 -05:00
Marc Delisle
1ed62c3fca bug Incorrect text/icon display in Tracking report
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-08 06:46:25 -05:00
Weblate
a01c75d2b7 Merge remote-tracking branch 'origin/master' 2014-11-07 14:09:38 +01:00
Michael Koch
5e639c1c07 Translated using Weblate (German)
Currently translated at 99.8% (2973 of 2976 strings)

[CI skip]
2014-11-07 14:09:36 +01:00
josep constanti
9625ea3a98 Translated using Weblate (Catalan)
Currently translated at 83.8% (2495 of 2976 strings)

[CI skip]
2014-11-07 14:09:34 +01:00
Madhura Jayaratne
9c716a2353 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-11-07 08:11:04 -08:00
Madhura Jayaratne
86fef4154d Avoid notices
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-07 08:09:46 -08:00
Marc Delisle
efbd0a8407 Refactor code duplication
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-07 08:09:24 -05:00
Madhura Jayaratne
74e922b048 List_Database now adhere to DisableIS configuration
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-06 16:57:26 -08:00
Madhura Jayaratne
09fa8dc860 Fix failing tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-06 13:41:36 -08:00
Madhura Jayaratne
53f1364cff Fix bugs in navigation
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-06 13:31:29 -08:00
Marc Delisle
132ab7209e Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-11-06 12:58:06 -05:00
Marc Delisle
290ae63dd8 Refactor code duplication
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-06 12:57:50 -05:00
Mircəlal
2e6d4752be Translated using Weblate (Azerbaijani)
Currently translated at 47.7% (1420 of 2976 strings)

[CI skip]
2014-11-06 18:50:00 +01:00
Mircəlal
2a58116a96 Translated using Weblate (Azerbaijani)
Currently translated at 48.3% (1338 of 2767 strings)

[CI skip]
2014-11-06 18:49:55 +01:00
Madhura Jayaratne
93d23e4494 Provide not IS based implementation
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-06 12:38:02 +05:30
Madhura Jayaratne
e46ff7db49 Sort database list
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-06 12:37:37 +05:30
Madhura Jayaratne
7d800ed62f Adhere to search clause and only db directive
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-06 11:16:55 +05:30
Madhura Jayaratne
26bece5805 Use GRANTs to determine the list of dbs to show.
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-06 10:47:00 +05:30
Madhura Jayaratne
bc3eb6517e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-11-06 08:15:11 +05:30
Madhura Jayaratne
0bca6a096f Determine the databases the user has access to based on GRANTs and query only for them
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-06 08:13:58 +05:30
Marc Delisle
25a591e3d7 Refactor code duplication
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-05 13:54:54 -05:00
Marc Delisle
65d46038af Cannot create view via Query results operation (master only)
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-05 12:59:42 -05:00
Panagiotis Papazoglou
9e5d7550e0 Translated using Weblate (Greek)
Currently translated at 100.0% (2976 of 2976 strings)

[CI skip]
2014-11-05 14:02:36 +01:00
Madhura Jayaratne
5bd1dfe749 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-11-05 16:19:13 +05:30
Weblate
e241fa56f1 Merge remote-tracking branch 'origin/master' 2014-11-05 11:47:29 +01:00
Michal Čihař
228cc9bb5f Translated using Weblate (Uzbek (latin))
Currently translated at 36.5% (1087 of 2976 strings)

[CI skip]
2014-11-05 11:47:27 +01:00
Michal Čihař
bf7cd06a42 Translated using Weblate (Uzbek)
Currently translated at 37.4% (1115 of 2976 strings)

[CI skip]
2014-11-05 11:47:25 +01:00
Michal Čihař
02e3a7f621 Translated using Weblate (Thai)
Currently translated at 35.3% (1052 of 2976 strings)

[CI skip]
2014-11-05 11:47:23 +01:00
Michal Čihař
c6b465003a Translated using Weblate (Tatar)
Currently translated at 18.7% (559 of 2976 strings)

[CI skip]
2014-11-05 11:47:21 +01:00
Michal Čihař
a614ce29ad Translated using Weblate (Simplified Chinese)
Currently translated at 82.9% (2470 of 2976 strings)

[CI skip]
2014-11-05 11:47:18 +01:00
Michal Čihař
8c61491361 Translated using Weblate (Portuguese (Brazil))
Currently translated at 94.0% (2798 of 2976 strings)

[CI skip]
2014-11-05 11:47:17 +01:00
Michal Čihař
9b26bf5eda Translated using Weblate (Mongolian)
Currently translated at 23.4% (698 of 2976 strings)

[CI skip]
2014-11-05 11:47:15 +01:00