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

104062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
18cfc24743 Display results of execute statement 
Issue #11741

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-14 16:22:34 +01:00
Michal Čihař
445e211645 Make parser understand DEALLOCATE 
Issue #11741

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-14 16:08:23 +01:00
Michal Čihař
23cfa82654 Merge pull request #11746 from Achilles-96/Issue-11730 
Fixes #11730
 2015-12-14 15:55:06 +01:00
Michal Čihař
81aeb30ae9 Document using multiple database hosts with Docker 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-14 14:02:38 +01:00
Michal Čihař
4d7a05ad54 Document PMA_USER and PMA_PASSWORD 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-14 13:44:47 +01:00
Achilles-96
f48b5af23c Fixes #11730 
Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2015-12-14 10:35:29 +05:30
Marc Delisle
0a9bdc1619 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-13 19:41:55 -05:00
Marc Delisle
bf074566b5 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-13 19:39:29 -05:00
Marc Delisle
5a77115ac5 Merge pull request #11738 from Achilles-96/QA_4_5 
Fixes #11679
 2015-12-13 19:37:52 -05:00
Achilles-96
4b8983028a Fixes #11679 
Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2015-12-14 00:31:09 +05:30
Marc Delisle
3f97698382 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-13 08:25:39 -05:00
Madhura Jayaratne
754299769a Fix ChangeLog entry 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-13 09:56:13 +11:00
Marc Delisle
86769cafaa Use more modern statement 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-12 07:40:58 -05:00
Anna Henningsen
9cda59a242 Translated using Weblate (German) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2015-12-12 05:14:52 +01:00
Hugues Peccatte
8baf7c4a8a Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:21:54 +01:00
Hugues Peccatte
f04a678bad Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:16:13 +01:00
Hugues Peccatte
eda2816c70 Replace font tags by span. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:04:12 +01:00
Hugues Peccatte
46478f32c2 Fix typo in tag. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:03:56 +01:00
Hugues Peccatte
c721815dc2 Convert array declaration in JS. 
Remove useless code.
Remove useless declarations.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 22:50:24 +01:00
Hugues Peccatte
ff4517ca60 Remove useless variables and simplify code. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 22:36:54 +01:00
Hugues Peccatte
da525ae928 Remove useless variable. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 22:32:53 +01:00
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