gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,799 Commits 12 Branches 481 Tags 2.4 GiB
39790da7ac
Commit Graph

113799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maurício Meneghini Fauth
39790da7ac Merge branch 'QA_4_8' 2018-08-28 05:09:19 -03:00
Maurício Meneghini Fauth
42e7fb3a85 Add ChangeLog entry for #14295 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-28 05:06:15 -03:00
William Desportes
a2cdf7f217 Fix for #14295 
Fixes: #14295
Signed-off-by: William Desportes <williamdes@wdes.fr>
(cherry picked from commit a87bf74eed)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-28 05:06:15 -03:00
Burak Yavuz
c8dce83e44
Translated using Weblate (Turkish) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/tr/
Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com>
 2018-08-28 09:44:25 +02:00
Maurício Meneghini Fauth
5455897555 Fix unescaped string in table structure view 
https://github.com/phpmyadmin/phpmyadmin/issues/14374#issuecomment-410017440

Introduced by commit 5d0fd81e67

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-28 02:41:27 -03:00
Maurício Meneghini Fauth
2575b9720d
Merge pull request #14563 from Gemorroj/add-column-fix 
Add column fix
 2018-08-27 23:38:56 -03:00
Giovanni Sora
563989b4c3
Translated using Weblate (Interlingua) 
Currently translated at 75.3% (2481 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ia/
Signed-off-by: Giovanni Sora <g.sora@tiscali.it>
 2018-08-27 22:39:05 +02:00
Hosted Weblate
679cf60305
Merge branch 'origin/master' into Weblate 2018-08-27 16:27:14 +02:00
Giovanni Sora
a931995a31
Translated using Weblate (Interlingua) 
Currently translated at 75.1% (2479 of 3297 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/ia/
Signed-off-by: Giovanni Sora <g.sora@tiscali.it>
 2018-08-27 16:27:12 +02:00
BO41
e1264e06bf
Translated using Weblate (German) 
Currently translated at 100.0% (3297 of 3297 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/de/
Signed-off-by: BO41 <lukasw41@gmail.com>
 2018-08-27 16:27:11 +02:00
Isaac Bennetch
6f64f07e4c
Translated using Weblate (French) 
Currently translated at 100.0% (3297 of 3297 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/fr/
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-27 16:27:09 +02:00
Marc Delisle
b45894dc0e
Translated using Weblate (French) 
Currently translated at 100.0% (3297 of 3297 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/fr/
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2018-08-27 16:27:08 +02:00
Isaac Bennetch
d37fd33010
Merge pull request #14593 from lem9/master 
Improve grammar
 2018-08-27 10:26:55 -04:00
Marc Delisle
90eb53b3e7
Improve grammar 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2018-08-27 08:53:46 -04:00
Isaac Bennetch
04231ad041
Translated using Weblate (French) 
Currently translated at 100.0% (3294 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/fr/
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-27 14:52:49 +02:00
Marc Delisle
ac1eb203ab
Translated using Weblate (French) 
Currently translated at 100.0% (3294 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/fr/
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2018-08-27 14:52:43 +02:00
William Desportes
9079efa09e
Translated using Weblate (French) 
Currently translated at 100.0% (3297 of 3297 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/fr/
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-08-27 14:46:40 +02:00
Olivier Humbert
227b4febe7
Translated using Weblate (French) 
Currently translated at 100.0% (3297 of 3297 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/fr/
Signed-off-by: Olivier Humbert <trebmuh@tuxfamily.org>
 2018-08-27 14:44:26 +02:00
Burak Yavuz
7510f72864
Translated using Weblate (Turkish) 
Currently translated at 100.0% (3297 of 3297 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/tr/
Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com>
 2018-08-27 10:08:25 +02:00
Olivier Humbert
74a8939bbb
Translated using Weblate (French) 
Currently translated at 100.0% (3294 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/fr/
Signed-off-by: Olivier Humbert <trebmuh@tuxfamily.org>
 2018-08-26 21:30:20 +02:00
BO41
f7c782b227
Translated using Weblate (German) 
Currently translated at 100.0% (3294 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/de/
Signed-off-by: BO41 <lukasw41@gmail.com>
 2018-08-26 20:10:00 +02:00
Michal Čihař
e996f4a436 Merge branch 'QA_4_8' 2018-08-26 19:07:22 +02:00
Michal Čihař
29c7e114f0 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-08-26 19:06:34 +02:00
Michal Čihař
64e0d48241 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-08-26 18:20:23 +02:00
Maurício Meneghini Fauth
ef225a2251
Merge pull request #14587 from mauriciofauth/issue-templates 
Update GitHub templates
 2018-08-26 03:54:20 -03:00
Maurício Meneghini Fauth
bae1c8d955 Update GitHub templates 
- Add support for multiple issue templates
- Update pull request template

Based on https://help.github.com/articles/creating-issue-templates-for-your-repository/

[CI skip]

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-26 03:45:25 -03:00
worm6666
ce98b9d49d
Translated using Weblate (Slovak) 
Currently translated at 78.3% (2576 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/sk/
Signed-off-by: worm6666 <worm6666@gmail.com>
 2018-08-25 09:42:11 +02:00
worldwideskier
3443ed4ee0
Translated using Weblate (Japanese) 
Currently translated at 70.5% (2319 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ja/
Signed-off-by: worldwideskier <worldwideskier@yahoo.co.jp>
 2018-08-25 04:39:05 +02:00
Maurício Meneghini Fauth
0913246f63
Merge pull request #14559 from CommanderRoot/patch-1 
Fix displaying of indexes
 2018-08-24 22:44:36 -03:00
Domen
942892b33c
Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3297 of 3297 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/sl/
Signed-off-by: Domen <mitenem@outlook.com>
 2018-08-24 20:07:24 +02:00
Maurício Meneghini Fauth
16d0de490c Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-22 23:11:03 -03:00
Hosted Weblate
e63fbb0600
Merge branch 'origin/QA_4_8' into Weblate 2018-08-23 04:09:05 +02:00
Maurício Meneghini Fauth
8930f59658
Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/pt_BR/
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-23 04:09:05 +02:00
Maurício Meneghini Fauth
311a12f9d4 Add ChangeLog entry for #14452 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-22 23:08:03 -03:00
Jérôme Cognard
5beca256a7 #14452 Remove hash param in edit query URL 
Signed-off-by: Jérôme Cognard <jerome.cognard@gmail.com>
(cherry picked from commit 5d0fae07a6)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-22 23:05:37 -03:00
Hosted Weblate
399232edc4
Merge branch 'origin/master' into Weblate 2018-08-23 03:44:49 +02:00
Maurício Meneghini Fauth
3e5d7f1113
Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.7% (3290 of 3297 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/pt_BR/
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-23 03:44:48 +02:00
Maurício Meneghini Fauth
f3a7213651
Merge pull request #14454 from cognard/patch-2 
Fixes #14452 Remove hash param in edit query URL
 2018-08-22 22:44:38 -03:00
Isaac Bennetch
74eb04ac4a Fix merge conflicts from release 4.8.3 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-22 09:51:55 -04:00
Isaac Bennetch
fb7e4f18e1 Prepare for 4.8.4-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-22 09:48:23 -04:00
Isaac Bennetch
9e7fceca66 Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-22 09:44:10 -04:00
Isaac Bennetch
b838363dc3 Adding composer lock for 4.8.3 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-22 09:36:18 -04:00
Isaac Bennetch
41283ff079 Add PMASA to ChangeLog 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-22 09:33:14 -04:00
Isaac Bennetch
8bac4a931b Prepare for version 4.8.3 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-22 08:49:55 -04:00
Isaac Bennetch
61a00bdeb8 Merge branch 'QA_4_8' 2018-08-22 08:44:34 -04:00
Isaac Bennetch
dc45b8aa04 Merge branch 'madhuracj-bug14548' into QA_4_8 2018-08-22 08:43:30 -04:00
Isaac Bennetch
8154e23139 Fix merge conflicts in ChangeLog 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-22 08:43:04 -04:00
Kristjan Räts
4a87862c40
Translated using Weblate (Estonian) 
Currently translated at 100.0% (3297 of 3297 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/et/
Signed-off-by: Kristjan Räts <kristjanrats@gmail.com>
 2018-08-22 06:21:40 +02:00
Hosted Weblate
1ef3ef8a48
Merge branch 'origin/master' into Weblate 2018-08-22 06:21:09 +02:00
Kristjan Räts
9661725037
Translated using Weblate (Estonian) 
Currently translated at 99.9% (3295 of 3297 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/et/
Signed-off-by: Kristjan Räts <kristjanrats@gmail.com>
 2018-08-22 06:21:08 +02:00