gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,399 Commits 12 Branches 481 Tags 2.4 GiB
8e42e929e8
Commit Graph

103399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
8e42e929e8 Merge branch 'QA_4_5' 2015-10-23 09:15:55 -04:00
Marc Delisle
b1da19051e Merge commit '9435dfd' 2015-10-23 09:15:48 -04:00
Marc Delisle
fd9be0dbec 4.5.1 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-23 09:15:22 -04:00
Michal Čihař
c7cbac1b7a Compatibility to release older versions 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-10-23 13:09:37 +02:00
Weblate
a27adba213 Merge remote-tracking branch 'origin/master' 2015-10-23 12:52:25 +02:00
doocoo
8abce9a4a3 Translated using Weblate (Chinese (China)) 
Currently translated at 85.5% (2760 of 3228 strings)

[CI skip]
 2015-10-23 12:52:22 +02:00
Marc Delisle
e6f99a5113 Merge branch 'QA_4_5' 2015-10-23 06:51:52 -04:00
Weblate
9435dfd16f Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-23 12:51:32 +02:00
doocoo
32d66dc707 Translated using Weblate (Chinese (China)) 
Currently translated at 86.2% (2771 of 3211 strings)

[CI skip]
 2015-10-23 12:51:31 +02:00
Marc Delisle
8a1e3f13d4 Merge branch 'MAINT_4_5_1' into QA_4_5 2015-10-23 06:50:57 -04:00
Marc Delisle
cd09765675 Port content spoofing fix 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-23 06:50:04 -04:00
Marc Delisle
687821b67b Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-10-22 12:07:50 -04:00
Marc Delisle
faaec8e9f4 Refactor high-level parser calling into a function 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-22 12:07:45 -04:00
Michal Čihař
e8de43b727 Update credits for documentaiton translation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-10-22 17:24:02 +02:00
Marc Delisle
52de5b182e Merge branch 'QA_4_5' 2015-10-21 16:41:11 -04:00
Marc Delisle
b9101cbd74 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-21 16:40:44 -04:00
Marc Delisle
16729d1b90 Merge pull request #11593 from udan11/QA_4_5 
Fix error message in sql-parser.
 2015-10-21 16:39:48 -04:00
Dan Ungureanu
67b3543bda Fix error message in sql-parser. 
Updated sql-parser to udan11/sql-parser@3d73f3877a (v3.0.4).

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-10-21 23:25:09 +03:00
Marc Delisle
f869dbccc6 Merge branch 'QA_4_5' 2015-10-21 10:49:47 -04:00
Marc Delisle
fe7a2c095b Fixes #11592 Missing headers in zipped export 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-21 10:49:18 -04:00
Marc Delisle
7bea48283c Merge branch 'QA_4_5' 2015-10-20 11:02:01 -04:00
Marc Delisle
83f7c0f142 Merge commit '29d5aa4' 2015-10-20 11:01:55 -04:00
Marc Delisle
fb7543a938 Update issues tracker reference 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-20 11:01:26 -04:00
Marc Delisle
c4f36684d3 Merge pull request #11591 from ibennetch/6137 
Documentation about which features can be removed to reduce the insta…
 2015-10-20 10:57:42 -04:00
Kristjan Räts
29d5aa49d0 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-20 16:13:43 +02:00
Kristjan Räts
b8e0886341 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3228 of 3228 strings)

[CI skip]
 2015-10-20 16:13:38 +02:00
Isaac Bennetch
f9d0b65a50 Documentation about which features can be removed to reduce the install footprint 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2015-10-20 09:50:13 -04:00
Hugues Peccatte
ffc4422db7 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-19 20:33:21 +02:00
Marc Delisle
1861e9b775 Merge branch 'QA_4_5' 2015-10-19 09:12:50 -04:00
Marc Delisle
92678b0c3a Merge commit '2c27986' 2015-10-19 09:12:42 -04:00
Weblate
e10f55efcd Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-19 15:12:23 +02:00
Domen
8dc8f96e17 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-19 15:12:22 +02:00
Eshin Kunishima
2e2b641f51 Translated using Weblate (Japanese) 
Currently translated at 66.5% (2137 of 3211 strings)

[CI skip]
 2015-10-19 15:12:21 +02:00
Giovanni Sora
6e89672924 Translated using Weblate (Interlingua) 
Currently translated at 70.5% (2264 of 3211 strings)

[CI skip]
 2015-10-19 15:12:21 +02:00
Hauke Henningsen
a4bb9ebdb9 Translated using Weblate (German) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-19 15:12:21 +02:00
Marc Delisle
0007136dd9 Fixes #11589 Incorrect parameter in mysqli_fetch_fields() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-19 09:11:57 -04:00
Marc Delisle
d0c2d6d5b9 Merge pull request #11588 from Tithugues/f11550_master 
Fix #11550 Regression in Find and replace
 2015-10-19 06:58:45 -04:00
Weblate
819bbe0d03 Merge remote-tracking branch 'origin/master' 2015-10-18 22:51:54 +02:00
Eshin Kunishima
e846c82f54 Translated using Weblate (Japanese) 
Currently translated at 66.0% (2131 of 3228 strings)

[CI skip]
 2015-10-18 22:51:53 +02:00
Giovanni Sora
14f2aeba71 Translated using Weblate (Interlingua) 
Currently translated at 70.6% (2280 of 3228 strings)

[CI skip]
 2015-10-18 22:51:52 +02:00
Hugues Peccatte
e1dd0a9f97 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-18 22:51:01 +02:00
Hugues Peccatte
9698d301f8 Fix #11550 Regression in Find and replace 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-18 22:14:20 +02:00
Marc Delisle
c9a22dc432 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-10-18 08:29:09 -04:00
Marc Delisle
110602c3a4 Remove closing tag 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-18 08:29:00 -04:00
Weblate
29eb9a72c7 Merge remote-tracking branch 'origin/master' 2015-10-18 13:32:47 +02:00
Domen
63af90a370 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3228 of 3228 strings)

[CI skip]
 2015-10-18 13:32:47 +02:00
Marc Delisle
1a75c88b76 Add missing checks 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-18 07:30:16 -04:00
Hauke Henningsen
8ea8f7a9b2 Translated using Weblate (German) 
Currently translated at 100.0% (3228 of 3228 strings)

[CI skip]
 2015-10-17 16:16:36 +02:00
Weblate
33d930a11b Merge remote-tracking branch 'origin/master' 2015-10-17 13:18:11 +02:00
Andrey Aleksanyants
dc57954aea Translated using Weblate (Armenian) 
Currently translated at 67.5% (2179 of 3228 strings)

[CI skip]
 2015-10-17 13:18:08 +02:00