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

103945 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marc Delisle
76e05ecff6 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-02 10:46:25 -05:00
Marc Delisle
2f2b505a2e Fixes ##11711 Clarify the meaning of "Stand-in structure for view" in SQL export 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-02 10:44:14 -05:00
Marc Delisle
f4358bb74b No nested ternary operators 
https://github.com/dseguy/clearPHP/blob/master/rules/no-nested-ternary.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-02 09:19:33 -05:00
Michal Čihař
4b4603cc6a Use already evaluated variable instead of accessing array once more 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-02 09:23:32 +01:00
Michal Čihař
2248ec64b6 Remove unused variables 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-02 09:21:29 +01:00
Michal Čihař
823b9c99ba Fix coverage reporting to codacy 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-02 09:18:19 +01:00
Madhura Jayaratne
bfcd37b84f Fix #11710 Unable to add/remove on update CURRENT_TIMESTAMP option while editing a timestamp field 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-02 17:16:50 +11:00
Madhura Jayaratne
36ddd9c670 Merge branch 'QA_4_5' 
Conflicts:
	libraries/Table.php
 2015-12-02 10:45:06 +11:00
Madhura Jayaratne
d33af6a721 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-12-02 10:36:12 +11:00
Madhura Jayaratne
fcc89aa203 Fix - exclude db name in SQL when relations are made between table in the same db 
To prevent replication from breaking when replicating to a db with different name

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-02 10:35:49 +11:00
Madhura Jayaratne
50325e58e8 We cannot guarantee that this input will be included. 
It is included only once and is controlled by a static variable.

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-02 07:50:48 +11:00
Madhura Jayaratne
1124d70b71 Fix import test 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-02 07:26:58 +11:00
Madhura Jayaratne
484f26a434 Was invoking wrong method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-02 07:08:54 +11:00
Madhura Jayaratne
e60853adee This method no longer exists 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-02 07:04:22 +11:00
Madhura Jayaratne
34b03a3494 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-12-02 06:52:36 +11:00
Madhura Jayaratne
26e96680f4 Fix some test failures 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-02 06:51:54 +11:00
Marc Delisle
45284ed3ad Fix assertion 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-01 11:05:47 -05:00
Michal Čihař
353b59fe37 Add missing parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 16:58:46 +01:00
Michal Čihař
c3ed799ee5 Fix testcase 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 16:57:18 +01:00
Marc Delisle
77abaa32f1 Fix unit tests 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-01 10:49:00 -05:00
Marc Delisle
23d78658d7 Fix unit tests 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-01 10:14:35 -05:00
Marc Delisle
b9934a6e07 Add missing queries in DBI dummy driver 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-01 09:46:16 -05:00
Michal Čihař
9744ac5e53 Populate privs cache prior to test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 14:44:06 +01:00
Michal Čihař
2572a35dba Fix controller name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 14:39:32 +01:00
Michal Čihař
bad6f87f7b Add support for Codacy coverage 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 14:33:27 +01:00
Michal Čihař
6c2474ad35 Avoid duplicate test class name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 14:25:14 +01:00
Michal Čihař
ecabc91424 Fix export plugin testing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 14:25:05 +01:00
Michal Čihař
8ebfeb25a0 Fix includes in testsuite 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 14:22:28 +01:00
Michal Čihař
aac4e31eee Fix test discovery for class tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 14:19:59 +01:00
Michal Čihař
46a70dba88 Remove unused method (parent class defines it) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 13:54:04 +01:00
Michal Čihař
c98fe34e57 Fix documentation of some methods 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 13:42:26 +01:00
Michal Čihař
c7c2ff4ab6 issue #11708 Remove no password warning 
The empty password has to be enabled by AllowNoPassword, so user should
know what he is doing. Showing this warning every time doesn't bring any
additional security.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-01 08:51:11 +01:00
Madhura Jayaratne
547c977bc1 issue #11701 Allow changing parameter order of routines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-01 12:20:16 +11:00
Madhura Jayaratne
6259eb0b3c Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-12-01 10:45:54 +11:00
Madhura Jayaratne
171c11b061 Merge branch 'QA_4_5' 2015-12-01 10:44:20 +11:00
Weblate
e1081d1431 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-12-01 00:43:14 +01:00
Kristjan Räts
dc05a0e2a9 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-12-01 00:43:12 +01:00
Madhura Jayaratne
cb867b8d94 issue #11701 Show create procedure SQL 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-01 10:42:51 +11:00
Marc Delisle
eb167b3c75 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-30 13:24:40 -05:00
Marc Delisle
1d5b6c4f0f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-11-30 08:34:37 -05:00
Marc Delisle
288c03cd43 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-30 08:34:24 -05:00