gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,415 Commits 12 Branches 481 Tags 2.4 GiB
2f290d0d91
Commit Graph

106415 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kyeong Su Shin
2f290d0d91 Translated using Weblate (Korean) 
Currently translated at 77.8% (2497 of 3208 strings)

[CI skip]
 2016-07-01 00:44:52 +02:00
Michal Čihař
aa8d761305 Add missing quote to scrutinizer yml 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-24 16:34:29 +02:00
Michal Čihař
d85b701c9b Use ShapeFile library naming of shapes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-24 16:16:12 +02:00
Michal Čihař
76189e0e43 Revert "Install dbase extension on tests for shapefile" 
The testsuite doesn't work with it.

This reverts commit 3e37e0c92f.
 2016-06-24 16:11:48 +02:00
Michal Čihař
7d650bd548 Use phpmyadmin/shapefile instead of embedded bfShapeFile 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-24 15:52:40 +02:00
Michal Čihař
3e37e0c92f Install dbase extension on tests for shapefile 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-24 13:54:20 +02:00
Michal Čihař
1c08750785 Merge branch 'QA_4_6' 2016-06-24 12:58:45 +02:00
Michal Čihař
f204208540 Move count() call outside loop 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-24 12:58:35 +02:00
Michal Čihař
ce67a31ad7 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-06-24 12:55:56 +02:00
Michal Čihař
8d6a86b57a Merge branch 'QA_4_6' 2016-06-24 12:55:20 +02:00
Michal Čihař
26b9804185 Merge commit 'cfb38bbcbfd352bb20805b53234609f67bbbe45a' 2016-06-24 12:55:15 +02:00
Michal Čihař
52a01c4bfb Fix type conversion for numeric values 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-24 12:55:04 +02:00
Weblate
72ae1b7209 Merge remote-tracking branch 'origin/master' 2016-06-24 10:29:17 +02:00
Peter Chen
d53db00a61 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2016-06-24 10:29:14 +02:00
Michal Čihař
421e8b0f54 Use sftp batch mode for uploading 
This way it will correctly fail on error.

Issue #12336

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-24 10:28:46 +02:00
Peter Chen
cfb38bbcbf Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2016-06-24 02:59:46 +02:00
Isaac Bennetch
292c0a1ff9 Fix merge conflicts 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-23 02:43:30 -04:00
Isaac Bennetch
58534ce2fc Prepare for 4.6.4-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-23 02:40:42 -04:00
Isaac Bennetch
f2db92434b Fix merge conflicts 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-23 00:28:35 -04:00
Isaac Bennetch
4f57305eab Release 4.6.3 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-23 00:27:15 -04:00
Isaac Bennetch
f7d1c1f463 Changelog entries for security release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-22 23:53:56 -04:00
Michal Čihař
c3f7aa8190 Merge branch 'QA_4_6-security' into master-security 2016-06-22 13:29:13 +02:00
Michal Čihař
615212a14d Do not allow javascript: links in transformation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 13:28:07 +02:00
Michal Čihař
6ba52a72b4 Merge branch 'QA_4_6-security' into master-security 2016-06-22 13:11:13 +02:00
Michal Čihař
9c8f537a23 Merge branch 'master' into master-security 2016-06-22 13:11:08 +02:00
Michal Čihař
519e634a8d Merge branch 'QA_4_6' into QA_4_6-security 2016-06-22 13:10:55 +02:00
Michal Čihař
4d21b5c077 Fixed rendering of chart of columns with HTML inside 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 13:07:32 +02:00
Michal Čihař
11509c5431 Merge branch 'QA_4_6' 2016-06-22 11:58:24 +02:00
Michal Čihař
301e1b0f7d Fix adjusting privileges for tables/databases with quote in name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 11:58:05 +02:00
Michal Čihař
d338a61d32 Merge branch 'QA_4_6' 2016-06-22 11:35:42 +02:00
Michal Čihař
e50e37b51d Properly escape database name when listing privileges 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 11:35:04 +02:00
Michal Čihař
57ae483bad Escape database name when showing dialog 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 11:14:57 +02:00
Michal Čihař
960fd1fd52 Properly escape zoom search column type 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 11:10:14 +02:00
Michal Čihař
36df83a97a Escape saved search name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 11:00:14 +02:00
Michal Čihař
d95a4a2f96 Avoid undefined index in case of incomplete bookmark 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 10:57:11 +02:00
Michal Čihař
0b7416c5f4 Escape user group when displaying 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 10:53:46 +02:00
Michal Čihař
792cd1262f Escape partition comment when displaying 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 10:26:50 +02:00
Michal Čihař
5b8608657f Simplify finding largest table 
We really do not need intermediate array for that.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 18:20:57 +02:00
Michal Čihař
637d4eb4de Merge branch 'QA_4_6-security' into master-security 2016-06-20 17:35:46 +02:00
Michal Čihař
c8abc5fab6 Merge branch 'master' into master-security 2016-06-20 17:35:42 +02:00
Michal Čihař
b03587fb8a Merge branch 'QA_4_6' 2016-06-20 17:25:03 +02:00
Michal Čihař
fac96d342f Share code for columns formatting 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 17:24:22 +02:00
Michal Čihař
bdb1e7af4e Clarify return value 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 17:21:23 +02:00
Michal Čihař
3606276e56 Remove unused method 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 17:19:59 +02:00
Michal Čihař
2a9123fe10 Define visibility for public methods 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 17:18:00 +02:00
Weblate
6c8c8de097 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-06-20 12:22:06 +02:00
Weblate
fb177bfbd6 Merge remote-tracking branch 'origin/master' 2016-06-20 12:22:04 +02:00
uncle_cat
0459089406 Translated using Weblate (Chinese (China)) 
Currently translated at 88.0% (2824 of 3209 strings)

[CI skip]
 2016-06-20 12:22:04 +02:00
uncle_cat
8c17e27962 Translated using Weblate (Chinese (China)) 
Currently translated at 87.7% (2816 of 3208 strings)

[CI skip]
 2016-06-20 12:22:00 +02:00
Michal Čihař
beb243949e Merge branch 'QA_4_6' 2016-06-20 12:21:48 +02:00