gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,240 Commits 12 Branches 481 Tags 2.4 GiB
3ed07c644e
Commit Graph

105240 Commits

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

[CI skip]
 2016-02-18 08:28:55 +01:00
Marc-Antoine Thevenet
f73a98d2ae Translated using Weblate (French) 
Currently translated at 99.9% (3208 of 3211 strings)

[CI skip]
 2016-02-18 08:28:55 +01:00
Kristjan Räts
cf54f11a96 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-02-18 08:28:54 +01:00
dingo thirteen
c93381446a Translated using Weblate (Dutch) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-02-18 08:28:54 +01:00
Michal Čihař
89c3c789d8 Translated using Weblate (Czech) 
Currently translated at 94.4% (3036 of 3214 strings)

[CI skip]
 2016-02-18 08:28:54 +01:00
Michal Čihař
b3a2b74aa4 Merge branch 'QA_4_6' 2016-02-17 12:13:22 +01:00
Michal Čihař
35dae12574 Define cell_align_left for tests 
It's defined early in common.inc.php so it's always available.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 12:12:49 +01:00
Michal Čihař
4de7b648d2 Merge branch 'QA_4_6' 2016-02-17 12:04:03 +01:00
Michal Čihař
c60f97331a Avoiud displaying query without message 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 12:03:55 +01:00
Michal Čihař
131af0b58c Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:57:25 +01:00
Michal Čihař
96246a9582 Merge branch 'QA_4_6' 2016-02-17 11:57:02 +01:00
Michal Čihař
32e2b1f4fe Merge commit 'f97c3081fe9673b8945d75df2a37af81e0667e4f' 2016-02-17 11:56:59 +01:00
Michal Čihař
1f26e89579 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:56:15 +01:00
Michal Čihař
f97c3081fe Add missing include 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:55:54 +01:00
Michal Čihař
3eb84188f4 Merge branch 'QA_4_6' 2016-02-17 11:54:53 +01:00
Michal Čihař
a14e0af554 Simplify and improve message about listing bookmarks 
The string concatenation makes it really poor for translating, usually
leading to sentences which do not make sense.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:53:17 +01:00
Michal Čihař
52fa4e1042 Merge branch 'QA_4_6' 2016-02-17 11:49:56 +01:00
Michal Čihař
99ba940ed0 Correct gender for bookmarks 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:49:49 +01:00
Michal Čihař
45ba46d742 Merge branch 'QA_4_6' 2016-02-17 11:40:53 +01:00
Michal Čihař
ed44120194 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:40:16 +01:00
Michal Čihař
7407d4931c Merge branch 'QA_4_6' 2016-02-17 11:39:39 +01:00
Michal Čihař
0a2facdfe9 Properly use plural for message with number of queries 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:39:16 +01:00
Michal Čihař
cd0e1000a8 Merge branch 'QA_4_6' 2016-02-17 11:37:35 +01:00
Michal Čihař
6d33a475eb Fixed rendering of messages without SQL query 
It should get rounded boxes at bottom, but didn't get it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:37:02 +01:00
Michal Čihař
a411cd0ca4 The cell_align_left is defined in common.inc.php so it should available in all cases 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:35:36 +01:00
Michal Čihař
f1379e2b26 Merge branch 'QA_4_6' 2016-02-17 11:33:02 +01:00
Michal Čihař
8bf212f6c3 Avoid displaying import query twice 
Fixes #11907

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:32:22 +01:00
Michal Čihař
dd09116716 Correct fix for table import processing 
We need to consistently propagate the $sql_data array.

Issue #11850

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:12:08 +01:00
Michal Čihař
5563f3e137 Revert "Remove sql data parameter" 
This reverts commit 84c12c2fdd.
 2016-02-17 10:59:40 +01:00
Michal Čihař
855145988c Revert "Always use local static storage of executed queries" 
This reverts commit ee8f9b0dba.
 2016-02-17 10:59:37 +01:00
Michal Čihař
2670a1499f Merge branch 'QA_4_6' 2016-02-17 10:52:55 +01:00
Michal Čihař
18f9231d74 Fixed CSV import 
Fixes #11850

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 10:52:34 +01:00
Michal Čihař
6895a1fc6e Revert "fix_11907" 
This reverts commit bfe30d1261.

It removes the message in many cases where it should be shown.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 10:49:01 +01:00
Michal Čihař
ee8f9b0dba Always use local static storage of executed queries 
Issue #11850

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 10:46:23 +01:00
Michal Čihař
84c12c2fdd Remove sql data parameter 
This just makes the SQL import different from others leading to subtle
breakages.

Issue #11850

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 10:42:14 +01:00
Michal Čihař
c81bed2825 Document syslog logging 
Issue #6146

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 10:30:07 +01:00
Michal Čihař
6fe468f7db Improve syslog integration 
- correctly open log
- log only failures

Issue #6146

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 10:28:04 +01:00
Michal Čihař
95819f1557 Merge branch 'QA_4_6' 2016-02-17 10:05:12 +01:00
Michal Čihař
06b9a8b6e1 Changelog entry for issue #11907 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 10:04:56 +01:00
Michal Čihař
9810eab993 Merge remote-tracking branch 'origin/pull/11958' into QA_4_6 2016-02-17 10:01:26 +01:00
Deven Bansod
4962eecfe0 Store analysed privileges in the cache 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-02-17 14:00:36 +05:30
Isaac Bennetch
3076d552e1 Another way to reduce disk space 
See Issue #6137

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-16 23:19:22 -05:00
Deven Bansod
7007091c84 Merge branch 'QA_4_6' 2016-02-17 14:01:30 +05:30
Madhura Jayaratne
9a4615b793 Merge branch 'QA_4_6' 2016-02-17 11:24:07 +11:00
Madhura Jayaratne
ac4143a8c9 Fix #11972 Missing documentation for $cfg['Servers'][$i]['favorite'] and $cfg['NumFavoriteTables'] 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-17 11:22:21 +11:00
Madhura Jayaratne
9249a8f586 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-02-17 08:44:41 +11:00
Madhura Jayaratne
8331fd7831 Remote TODO that does not make sense 
Defining parameters for all import plugins centrally defeats the purpose of the plugin architecture

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-17 08:43:13 +11:00
Atul Pratap Singh
a9a31603cd Merge branch 'QA_4_6' 2016-02-17 00:02:27 +05:30
Atul Pratap Singh
7344528757 Merge commit '50f1603' 2016-02-17 00:02:14 +05:30
Atul Pratap Singh
a7d67642a1 Merge branch 'QA_4_5' into QA_4_6 2016-02-17 00:01:08 +05:30