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

104005 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
964787243e Update doc comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-09 09:30:19 +11:00
Madhura Jayaratne
aabcf643cb Fix bug - Buffer pool and InnoDB status details are not shown for InnoDB 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-09 08:53:48 +11:00
Madhura Jayaratne
fd8f493b7b Fix extraneous quotes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-09 08:51:55 +11:00
Madhura Jayaratne
8880039561 Merge pull request #11729 from madhuracj/engines 
Refactor Engines Page
 2015-12-09 08:41:23 +11:00
Madhura Jayaratne
a24e96275e Fix more tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-09 08:17:38 +11:00
Madhura Jayaratne
44e6e60c2f Fix syntax error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-09 07:46:27 +11:00
Madhura Jayaratne
19f86d9df6 Fix more tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-09 07:29:27 +11:00
Marc Delisle
3088308641 Remove side effects in declaration files. 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-08 15:13:27 -05:00
Marc Delisle
a26c4a10f4 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-08 15:10:11 -05:00
Madhura Jayaratne
22d2e1e437 Add back dbi mocking 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-09 07:09:30 +11:00
Marc Delisle
cc6e4f560b Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-08 15:08:40 -05:00
Weblate
b099a8dd01 Merge remote-tracking branch 'origin/master' 2015-12-08 18:15:50 +01:00
Jozef Pistej
67aa9199a0 Translated using Weblate (Slovak) 
Currently translated at 82.7% (2665 of 3222 strings)

[CI skip]
 2015-12-08 18:15:50 +01:00
Anton Alekseevich
f1cbd1adda Translated using Weblate (Russian) 
Currently translated at 96.6% (3114 of 3222 strings)

[CI skip]
 2015-12-08 18:15:49 +01:00
Marc Delisle
c7ec8d7240 Move code to a function 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-08 12:15:33 -05:00
Michal Čihař
76b572d4bb Incorporate phpMyAdmin Docker container documentation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-08 08:39:48 +01:00
Madhura Jayaratne
f22cfdf076 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-08 11:06:36 +11:00
Madhura Jayaratne
05a2e0305e Pass the engine to the method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-08 11:06:18 +11:00
Madhura Jayaratne
45f11c4bb5 Template engine details page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-08 10:32:42 +11:00
Madhura Jayaratne
5a885ab643 Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-08 10:32:13 +11:00
Madhura Jayaratne
9a40624d17 Template engines list 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-08 09:02:38 +11:00
Madhura Jayaratne
aa2f9c444a Add a controller for server engines page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-08 08:50:18 +11:00
Michal Čihař
3da8853467 Merge branch 'QA_4_5' 2015-12-07 16:39:31 +01:00
Michal Čihař
b96aa8ff94 Avoid duplicite fetching of table information 
We already have that, so there is no need to issue the query
again.

Fixes #11714

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 16:39:11 +01:00
Michal Čihař
db5c3b970a Merge branch 'QA_4_5' 2015-12-07 16:10:07 +01:00
Michal Čihař
1c5304f95b Fix RTN tests for new escaping 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 16:08:36 +01:00
Michal Čihař
8681ef6b74 Fix tracker tests for new escaping 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 16:06:19 +01:00
Michal Čihař
2ac36ddb8f Merge branch 'QA_4_5' 2015-12-07 16:01:55 +01:00
Michal Čihař
fe135a5206 Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 16:00:46 +01:00
Michal Čihař
22b065f670 Add missing require 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 16:00:18 +01:00
Marc Delisle
3b01cbf03f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-12-07 09:42:10 -05:00
Marc Delisle
06d22e636e Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-07 09:41:46 -05:00
Michal Čihař
b94318c4cd Merge branch 'QA_4_5' 2015-12-07 15:37:08 +01:00
Michal Čihař
62503612bd Merge commit '39c97184e85b2c3a1076ff11e26df72d0a0fd1b8' 2015-12-07 15:35:33 +01:00
Michal Čihař
8742209c63 Fix single quote export for servers in ANSI_QUOTES mode 
It is possible to escape ' inside '' as both '' and \'. However using ''
is MySQL extension and does not work in ANSI mode. We need to generate
compatible exports in this case, so sticking with \' is safer.

Fixes #11721

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 15:33:37 +01:00
Marc Delisle
d9bec7f085 HTML line break shown after a MySQL connection error message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-07 09:02:07 -05:00
Weblate
2878da1eb8 Merge remote-tracking branch 'origin/master' 2015-12-07 07:03:43 +01:00
Yong Kim
c18f23e063 Translated using Weblate (Korean) 
Currently translated at 77.0% (2481 of 3222 strings)

[CI skip]
 2015-12-07 07:03:41 +01:00
Madhura Jayaratne
74c651e4d8 Merge branch 'QA_4_5' 2015-12-07 17:03:07 +11:00
Weblate
39c97184e8 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-12-07 06:59:54 +01:00
Yong Kim
5f0c55da4a Translated using Weblate (Korean) 
Currently translated at 77.9% (2503 of 3211 strings)

[CI skip]
 2015-12-07 06:59:53 +01:00
Madhura Jayaratne
0375802fc0 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 
Conflicts:
	ChangeLog
 2015-12-07 16:59:22 +11:00
Madhura Jayaratne
dade3fa2e4 Fix #11706 Database export template not saving compression option 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-07 16:56:18 +11:00
Marc Delisle
40644b5c33 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-06 08:10:34 -05:00
Marc Delisle
0ca15a9c50 Merge commit 'ca32b9f' 2015-12-06 08:09:28 -05:00
Marc Delisle
23a70525ae This was related to the previous SQL parser. If someone still needs it 
to decode an old bug report, he/she can still get this script from
an older branch.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-06 08:07:52 -05:00
Marc Delisle
66c15daba0 Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-06 08:01:07 -05:00
Marc Delisle
3dcb36b4ca Apparently, variable interpolation also suffers from an unneeded memory copy 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-06 07:40:20 -05:00
Marc Delisle
e16bc39f85 Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-05 07:27:29 -05:00
Deven Bansod
a1c48add28 Fix build error. Need concatenation here 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-05 19:29:18 +05:30