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

104163 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrey Aleksanyants
e2a1134b1e Translated using Weblate (Armenian) 
Currently translated at 67.4% (2168 of 3215 strings)

[CI skip]
 2015-12-19 08:50:44 +01:00
Deven Bansod
5fdd750909 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-12-18 21:28:46 +05:30
Deven Bansod
8319c12c86 Fix error in test 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-18 21:27:34 +05:30
Domen
3d2c5f54e8 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3215 of 3215 strings)

[CI skip]
 2015-12-18 16:44:41 +01:00
Deven Bansod
a3a9a4578c Fix erroneous condition for array's all keys empty check 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-18 21:06:37 +05:30
Stefano Martinelli
1ed3443c55 Translated using Weblate (Italian) 
Currently translated at 100.0% (3215 of 3215 strings)

[CI skip]
 2015-12-18 16:29:57 +01:00
Deven Bansod
52c637b383 Merge branch 'QA_4_5' 
Conflicts:
	libraries/mysql_charsets.lib.php
	po/de.po
	po/el.po
	po/et.po
	po/nl.po
	po/tr.po
	test/classes/TableTest.php
	test/libraries/PMA_mysql_charsets_test.php
 2015-12-18 20:18:10 +05:30
Deven Bansod
99e30eff73 Merge pull request #11762 from devenbansod/fix_11757 
Fix #11757 : Export and preview show different SQL for character set - Use 'CHARSET='  uniformly with respect to table 'show create' and table 'export'
 2015-12-18 20:09:10 +05:30
Deven Bansod
a4f02ca28f Fix #11757 : Export and preview show different SQL for character set 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-18 19:03:24 +05:30
Madhura Jayaratne
13eac96191 Merge branch 'test' 2015-12-18 22:00:27 +11:00
Madhura Jayaratne
1c4e0bdaea Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-18 21:47:13 +11:00
Madhura Jayaratne
2b7cfb595d Move the rest of the tests related to objects under a common parent test 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-18 21:32:34 +11:00
Madhura Jayaratne
b67f746bef Update test classes related to schema exporting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-18 21:16:40 +11:00
Madhura Jayaratne
46a6967c70 Update another plugin test 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-18 17:41:05 +11:00
Madhura Jayaratne
1e7979554b Update tests for import plugins 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-18 17:40:30 +11:00
Madhura Jayaratne
739ff52833 Update export plugin tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-18 17:36:24 +11:00
Madhura Jayaratne
9e38e02593 Update auth plugin tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-18 17:36:05 +11:00
Weblate
d6d46c49b4 Merge remote-tracking branch 'origin/master' 2015-12-18 07:21:59 +01:00
Xosé Calvo
2e87ab2137 Translated using Weblate (Galician) 
Currently translated at 82.3% (2648 of 3215 strings)

[CI skip]
 2015-12-18 07:21:57 +01:00
Madhura Jayaratne
cfceed7929 Merge pull request #11759 from madhuracj/test 
Reinitialize configuration values to their defaults for each test case
 2015-12-18 17:21:51 +11:00
dingo thirteen
168398cb25 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3215 of 3215 strings)

[CI skip]
 2015-12-17 21:22:38 +01:00
Michal Čihař
f5246d1dbe Translated using Weblate (Dutch) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-12-17 21:22:15 +01:00
Madhura Jayaratne
cd3d66c60e Revert "Temporarily remove locale and lint to make travis run fast" 
This reverts commit 102f89c511.

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-18 06:19:31 +11:00
Παναγιώτης Παπάζογλου
52263431ee Translated using Weblate (Greek) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-12-17 16:58:37 +01:00
Giovanni Sora
e72ad0f632 Translated using Weblate (Interlingua) 
Currently translated at 72.6% (2335 of 3215 strings)

[CI skip]
 2015-12-17 16:29:30 +01:00
Marc Delisle
51d7cf62fd Translated using Weblate (French) 
Currently translated at 100.0% (3215 of 3215 strings)

[CI skip]
 2015-12-17 16:29:16 +01:00
Anna Henningsen
4ca8f3971d Translated using Weblate (German) 
Currently translated at 100.0% (3215 of 3215 strings)

[CI skip]
 2015-12-17 13:57:59 +01:00
Anna Henningsen
59fdb334c8 Translated using Weblate (German) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-12-17 13:57:43 +01:00
Madhura Jayaratne
0419169103 Move navigation related tests under PMATestCase 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-17 22:55:47 +11:00
Burak Yavuz
f39e5147b4 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-12-17 12:14:46 +01:00
Kristjan Räts
c86db814c3 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-12-17 12:07:20 +01:00
Michal Čihař
3730d88215 Simplify detection of current script 
Fixes #11754

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-17 11:57:14 +01:00
Michal Čihař
d9f9f9a3d2 Remove extra quote from the template 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-17 11:55:48 +01:00
Michal Čihař
56c1ca0803 Add missing use 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-17 11:51:19 +01:00
Michal Čihař
17c512a865 Merge branch 'QA_4_5' 2015-12-17 11:34:44 +01:00
Michal Čihař
9d18e90afb Missing quoting of table in ALTER CONVERT query 
Fixes #11758

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-17 11:33:55 +01:00
Madhura Jayaratne
f4e87fa070 Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-17 21:31:28 +11:00
Madhura Jayaratne
eb2c50e446 Move more test classes to be subclasses to PMATestCase 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-17 20:22:41 +11:00
Madhura Jayaratne
102f89c511 Temporarily remove locale and lint to make travis run fast 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-17 20:16:47 +11:00
Madhura Jayaratne
4622f16b1f Use common test class as parent for more test cases 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-17 20:06:21 +11:00
Madhura Jayaratne
c9ca68a03e Use PMATestCase as base class 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-17 19:36:30 +11:00
Madhura Jayaratne
e88dcc15bb Introduce base test case. Reset configuration values to defaults for each test case 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-17 19:22:10 +11:00
Weblate
af666fbd11 Merge remote-tracking branch 'origin/master' 2015-12-17 00:08:54 +01:00
Giovanni Sora
75dccb4733 Translated using Weblate (Interlingua) 
Currently translated at 72.6% (2335 of 3215 strings)

[CI skip]
 2015-12-17 00:08:53 +01:00
Madhura Jayaratne
2dad1839a5 Merge pull request #11753 from madhuracj/plugin 
Refactor Server Plugins Page
 2015-12-17 10:08:47 +11:00
Madhura Jayaratne
65d2413c0f Properly mock dbi 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-17 09:56:36 +11:00
Madhura Jayaratne
e3041f3b7a Use full namespace 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-17 08:30:53 +11:00
Marc Delisle
52f1cabcec Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-16 09:39:42 -05:00
Michal Čihař
9187445a9f Display results for all queries returning data 
This is limited to 50 queries, and removes detection based on query
string. It rather passes all (up to 50) queries to sql.php, which can
properly handle any query returing results.

Fixes #11741

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 15:07:23 +01:00
Michal Čihař
01d96f8bf4 Fix parameter to detect DROP/CREATE 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 15:05:02 +01:00