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

106435 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
a6eaffe11c Use https URL for tcpdf 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 10:46:55 +02:00
Michal Čihař
e3cf00b122 Merge branch 'QA_4_6' 2016-07-12 10:43:04 +02:00
Michal Čihař
c0450b2915 Remove allowed failures test from maintenance branch 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 10:42:41 +02:00
Michal Čihař
0ce8cd7919 Merge branch 'QA_4_6' 2016-07-12 10:28:28 +02:00
Michal Čihař
11e772c46d Merge remote-tracking branch 'origin/QA_4_6' 2016-07-12 10:28:25 +02:00
Michal Čihař
b8b1bdd77e Include X-Robots-Tag header in responses 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-12 10:28:03 +02:00
José Camilo Fernandes Coelho
19dee09c3f Translated using Weblate (Portuguese) 
Currently translated at 53.6% (1722 of 3208 strings)

[CI skip]
 2016-07-12 10:26:16 +02:00
José Camilo Fernandes Coelho
f28925adb0 Translated using Weblate (Portuguese) 
Currently translated at 53.9% (1731 of 3209 strings)

[CI skip]
 2016-07-12 10:25:53 +02:00
Saulo Castro
64b1f13200 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.3% (2997 of 3209 strings)

[CI skip]
 2016-07-11 18:45:29 +02:00
Saulo Castro
8c1c013abf Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.1% (2988 of 3208 strings)

[CI skip]
 2016-07-11 18:45:23 +02:00
Phongphan A Bunlom
394f77dc70 Translated using Weblate (Thai) 
Currently translated at 30.7% (986 of 3209 strings)

[CI skip]
 2016-07-09 18:45:52 +02:00
Phongphan A Bunlom
7f6378605f Translated using Weblate (Thai) 
Currently translated at 30.4% (977 of 3208 strings)

[CI skip]
 2016-07-09 18:45:47 +02:00
Franco
68f10806ce Translated using Weblate (Spanish) 
Currently translated at 99.6% (3198 of 3209 strings)

[CI skip]
 2016-07-05 18:45:55 +02:00
Franco
6676433916 Translated using Weblate (Spanish) 
Currently translated at 99.2% (3185 of 3208 strings)

[CI skip]
 2016-07-05 18:45:50 +02:00
Adrien Bertrand
c69b585b82 Translated using Weblate (French) 
Currently translated at 99.7% (3199 of 3208 strings)

[CI skip]
 2016-07-05 18:44:39 +02:00
Arben Çokaj
a879cd8b77 Translated using Weblate (Albanian) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2016-07-03 03:44:09 +02:00
Arben Çokaj
b0f65c7420 Translated using Weblate (Albanian) 
Currently translated at 99.6% (3196 of 3208 strings)

[CI skip]
 2016-07-03 03:44:04 +02:00
Bartosz Pazoła
c7fc778fad Translated using Weblate (Polish) 
Currently translated at 82.6% (2652 of 3209 strings)

[CI skip]
 2016-07-02 12:45:16 +02:00
Bartosz Pazoła
92de4ded9b Translated using Weblate (Polish) 
Currently translated at 82.3% (2641 of 3208 strings)

[CI skip]
 2016-07-02 12:45:12 +02:00
Kyeong Su Shin
997a7bb793 Translated using Weblate (Korean) 
Currently translated at 78.1% (2508 of 3209 strings)

[CI skip]
 2016-07-01 00:44:56 +02:00
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