gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,986 Commits 12 Branches 481 Tags 2.4 GiB
5a885ab643
Commit Graph

103986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
dingo thirteen
7f7d453e29 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2015-12-04 21:50:28 +01:00
Marc Delisle
357b1b4757 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-04 09:05:42 -05:00
Weblate
4f2311e1a6 Merge remote-tracking branch 'origin/master' 2015-12-04 12:15:05 +01:00
Burak Yavuz
b648d7add6 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2015-12-04 12:15:04 +01:00
Weblate
ca32b9f51a Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-12-04 12:14:58 +01:00
Burak Yavuz
5f02ec86f3 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-12-04 12:14:57 +01:00
Giovanni Sora
af95b43554 Translated using Weblate (Interlingua) 
Currently translated at 72.5% (2329 of 3211 strings)

[CI skip]
 2015-12-04 12:14:56 +01:00
Michal Čihař
0d15a96427 Merge branch 'QA_4_5' 2015-12-04 12:14:41 +01:00
Michal Čihař
17930c26df Properly report error on connecting 
The $link can be false at this point and DBI backends handle this
correctly to get global error. This usually happens on connecting.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 12:13:47 +01:00
Marc Delisle
2607023281 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-03 11:00:01 -05:00
Marc Delisle
bc5c8e4d2b Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-12-03 10:44:42 -05:00
Marc Delisle
9ee3931c09 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-03 10:43:10 -05:00
Michal Čihař
01dc5ef2a2 Document installation using Composer 
As we seem to be nowhere near being able to provide packages in the
official Packagist repository, lets document how to install phpMyAdmin
using Composer from our own repository.

Fixes #11508

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-03 16:13:10 +01:00
Giovanni Sora
455bdacb8a Translated using Weblate (Interlingua) 
Currently translated at 72.7% (2343 of 3222 strings)

[CI skip]
 2015-12-03 13:40:39 +01:00
Marc Delisle
59623b7b37 Translated using Weblate (French) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2015-12-03 13:40:15 +01:00
Παναγιώτης Παπάζογλου
5dc344ca91 Translated using Weblate (Greek) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2015-12-03 09:39:43 +01:00
Kristjan Räts
2788b714c2 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2015-12-03 09:05:12 +01:00
Domen
c3138a882c Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2015-12-03 02:51:51 +01:00
Burak Yavuz
502d728c8f Translated using Weblate (Turkish) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2015-12-02 18:39:18 +01:00