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

104095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Παναγιώτης Παπάζογλου
7dcce89b4d Translated using Weblate (Greek) 
Currently translated at 100.0% (3215 of 3215 strings)

[CI skip]
 2015-12-16 10:46:34 +01:00
Weblate
e90411b1ea Merge remote-tracking branch 'origin/master' 2015-12-16 09:44:46 +01:00
Stefano Martinelli
562f0eb759 Translated using Weblate (Italian) 
Currently translated at 99.9% (3213 of 3215 strings)

[CI skip]
 2015-12-16 09:44:44 +01:00
Michal Čihař
2076b0203b Fixed displaying of SQL query on table operations 
- do not show message about executed SQL when none was executed
- always show the SQL

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 09:44:27 +01:00
Michal Čihař
a2a321eaf7 No need to set type of message when we pass Message instance 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 09:44:27 +01:00
Michal Čihař
c217eaffc2 Use default messages, no need to duplicate them 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 09:44:27 +01:00
Michal Čihař
8fc0dc7032 Include SQL even in case of error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 09:44:27 +01:00
Michal Čihař
91c6a2ad08 Fix possible undefined variable in case of error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 09:44:27 +01:00
Burak Yavuz
e6ca04f83a Translated using Weblate (Turkish) 
Currently translated at 100.0% (3215 of 3215 strings)

[CI skip]
 2015-12-16 09:39:24 +01:00
Kristjan Räts
864df2b6ee Translated using Weblate (Estonian) 
Currently translated at 100.0% (3215 of 3215 strings)

[CI skip]
 2015-12-16 09:21:57 +01:00
Michal Čihař
9f4717f2ab Merge branch 'QA_4_5' 2015-12-16 08:14:08 +01:00
Michal Čihař
64cbe33845 Merge remote-tracking branch 'weblate-master/master' 2015-12-16 08:13:59 +01:00
Michal Čihař
160d6e2e20 Merge remote-tracking branch 'weblate-4.5/QA_4_5' into QA_4_5 2015-12-16 08:13:08 +01:00
Krystian Biesaga
bc4af86f8e Translated using Weblate (Polish) 
Currently translated at 81.6% (2630 of 3222 strings)

[CI skip]
 2015-12-16 08:08:48 +01:00
Krystian Biesaga
369d42f0e8 Translated using Weblate (Polish) 
Currently translated at 82.7% (2657 of 3211 strings)

[CI skip]
 2015-12-16 08:08:43 +01:00
Michal Čihař
e4f72c3021 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 08:07:29 +01:00
Michal Čihař
63f048f8cb Merge branch 'QA_4_5' 2015-12-16 08:05:34 +01:00
Michal Čihař
dc8df980a2 Merge commit 'a36a80f3df7013f4bd3789a0e3679974a829863d' 2015-12-16 08:05:28 +01:00
Michal Čihař
e0ad034681 Remove \b from the messages 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 08:05:05 +01:00
Michal Čihař
a36a80f3df Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 08:01:02 +01:00
Marc Delisle
69bd50f7d5 Merge branch 'QA_4_5' 2015-12-15 06:26:49 -05:00
Marc Delisle
80a0b426cf ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-15 06:26:24 -05:00
Marc Delisle
129791d082 Merge pull request #11748 from devenbansod/fix_11720 
Fix #11720
 2015-12-15 06:25:13 -05:00
Michal Čihař
605ce3388b Remove duplicate checking of goto 
It's already done in common.inc.php, no need to check again here (and
the check was wrong anyway).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-15 10:24:03 +01:00
Michal Čihař
0a20708533 Update sql data array in place 
There is no need to create a copy here.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-15 10:11:00 +01:00
Michal Čihař
6b9d93a270 Do not try to catch USE when runing through sql.php 
In this case it's properly handled there, we should not do any database
changes at this point.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-15 09:40:52 +01:00
Michal Čihař
4e44ba968b Reduce spacing between displayed SQL queries 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-15 09:38:54 +01:00
Michal Čihař
9c289d9794 Do not display results operation for errored query 
Issue #11741

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-15 09:23:06 +01:00
Michal Čihař
d45477563b Adjust style for the error messages for SQL 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-15 09:21:34 +01:00
Michal Čihař
8192679052 Properly handle IgnoreMultiSubmitErrors in sql.lib.php 
Issue #11741

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-15 09:17:13 +01:00
Deven Bansod
f6b9340e1b Check for duplication only when username field is edited 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-15 12:18:08 +05:30
Michal Čihař
bb86835332 Compact display of query results status 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-14 16:37:19 +01:00
Michal Čihař
4d74053e3f Remove not used controluser support from PMA_importRunQuery 
This code was never executed.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-14 16:29:51 +01:00
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