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

104041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugues Peccatte
e4dbd3aee4 Delete duplicated line. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 22:30:15 +01:00
Hugues Peccatte
9f97786e9b Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 22:22:21 +01:00
Marc Delisle
5a6d9c010b Undefined property 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-11 09:27:31 -05:00
Madhura Jayaratne
1c7282b859 Merge branch 'QA_4_5' 
Conflicts:
	test/classes/plugin/export/ExportSqlTest.php
 2015-12-11 19:26:26 +11:00
Madhura Jayaratne
968bfd354c Fix broken tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 19:18:53 +11:00
Madhura Jayaratne
6016b64836 Loosen some assertions. We are tying to prevent calls to dbi. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 17:15:00 +11:00
Madhura Jayaratne
76a416283a Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 17:07:46 +11:00
Madhura Jayaratne
ceeec424d7 #11728 CSV import skip row count after 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 17:00:38 +11:00
Madhura Jayaratne
dcdd08a043 No need to break line here 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 16:32:50 +11:00
Madhura Jayaratne
fd0f3d4264 Merge branch 'QA_4_5' 2015-12-11 16:29:12 +11:00
Madhura Jayaratne
d9279025f9 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 
Conflicts:
	ChangeLog
 2015-12-11 16:27:35 +11:00
Madhura Jayaratne
f0aba98e35 Fix #11732 Exporting feature does not work with union table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 16:24:58 +11:00
Marc Delisle
8956fa805a Merge branch 'QA_4_5' 2015-12-10 12:19:20 -05:00
Marc Delisle
5acfe97a10 Merge commit 'eab28e3' 2015-12-10 12:19:13 -05:00
Marc Delisle
d008352582 IE 8 compatibility in console 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-10 12:18:38 -05:00
Weblate
6f1dbd46ad Merge remote-tracking branch 'origin/master' 2015-12-09 21:07:56 +01:00
Roman Imankulov
f37cbfda3c Translated using Weblate (Russian) 
Currently translated at 96.6% (3115 of 3222 strings)

[CI skip]
 2015-12-09 21:07:55 +01:00
신흥재
fa69acf5d1 Translated using Weblate (Korean) 
Currently translated at 77.1% (2487 of 3222 strings)

[CI skip]
 2015-12-09 21:07:55 +01:00
Madhura Jayaratne
000d679d63 Merge branch 'QA_4_5' 2015-12-10 07:07:28 +11:00
Weblate
eab28e3be1 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-12-09 21:02:04 +01:00
Jozef Pistej
ed47d0fbdb Translated using Weblate (Slovak) 
Currently translated at 83.5% (2682 of 3211 strings)

[CI skip]
 2015-12-09 21:02:03 +01:00
Anton Alekseevich
fa18c2964d Translated using Weblate (Russian) 
Currently translated at 97.9% (3144 of 3211 strings)

[CI skip]
 2015-12-09 21:02:03 +01:00
신흥재
2867358b57 Translated using Weblate (Korean) 
Currently translated at 78.1% (2509 of 3211 strings)

[CI skip]
 2015-12-09 21:02:02 +01:00
Madhura Jayaratne
269fcd2a54 issue #11724 Temporary fix for live data edit of big sets is not working 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-10 07:01:42 +11:00
Michal Čihař
5d41e54e1c Remove not used TypesDrizzle.php 
The support for Drizzle has been already removed.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 08:43:13 +01:00
Michal Čihař
1a47ee0641 No need for unset() as we are not in global context 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 08:37:51 +01:00
Michal Čihař
7de390f26a Move theme initialization to ThemeManager 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 08:34:09 +01:00
Michal Čihař
1deac94062 Move PHP extensions check to separate function 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 08:24:41 +01:00
Michal Čihař
c4cdd16342 Move PATH_INFO cleanup to function 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 08:22:03 +01:00
Michal Čihař
0f3dedba53 Add codecov.io integration 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 08:17:24 +01:00
Michal Čihař
3565e4db79 Remove PMA_arrayMergeRecursive 
It can be replaced with array_replace_recursive as of PHP 5.3, we
require PHP 5.5.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 08:06:00 +01:00
Michal Čihař
95d10b8c1f Remove PMA_prettyPrint 
It is no longer needed as JSON_PRETTY_PRINT is there since PHP 5.4 (and
we require 5.5).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 07:54:36 +01:00
Michal Čihař
4d9dc457bd Update comment to match current requirements 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 07:50:54 +01:00
Michal Čihař
7facd526b1 Remove code for PHP < 5.4 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 07:50:02 +01:00
Michal Čihař
06bb1e67f2 Remove PMA_arrayWalkRecursive 
For the single remaining use case native array_walk_recursive is good
enoug.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 07:42:13 +01:00
Michal Čihař
7181f2d22d Remove magic_quotes_gpc handling 
This has been removed in PHP 5.4.0 and we support 5.5.0 or newer only.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-09 07:36:34 +01:00
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