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

116173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maurício Meneghini Fauth
dc13e00241 Add conflict on pragmarx/google2fa >=6.1 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
(cherry picked from commit dd5d6d834d)
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-10-05 11:23:51 -03:00
William Desportes
bbf94a7f40
Merge branch 'QA_4_9' into QA_5_0 
Pull-request: #15457
Closes: #15457
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-22 20:13:09 +02:00
William Desportes
614468f905
Add ChangeLog entry for #14245 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-22 20:07:47 +02:00
William Desportes
88821f8248
Fix #14245 - mysql 8.0.3 and above fails on advisor 
Fixes: #14245
Pull-request: #15461
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-22 20:07:22 +02:00
William Desportes
adbaf63551
Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-22 18:57:48 +02:00
William Desportes
9a77826c2f
Add ChangeLog entry for #14804 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-22 18:32:23 +02:00
William Desportes
9a6a66b9f4
Fix #14804 - Undefined index: ssl_* variables 
Fixes: #14804

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-22 18:30:58 +02:00
William Desportes
b5b1488bd6
Add ChangeLog entry for #15304 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-22 18:06:02 +02:00
William Desportes
eb525891ce
Fix #15304 - ssl_use php error 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-22 18:03:41 +02:00
Maurício Meneghini Fauth
3e330fd403 Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-09-21 17:30:44 -03:00
Maurício Meneghini Fauth
0a8fc4446b Fix some invalid array accesses with PHP 7.4 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-09-21 17:22:52 -03:00
Maurício Meneghini Fauth
08696bc55e Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-09-21 12:51:04 -03:00
Isaac Bennetch
806a880be6 Prepare for 4.9.2-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-09-21 00:07:20 -04:00
Isaac Bennetch
249c34d1ef Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-09-20 23:57:27 -04:00
Isaac Bennetch
a00f23711e Adding composer lock for 4.9.1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-09-20 23:54:54 -04:00
Isaac Bennetch
a9329ec767 Prepare for version 4.9.1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-09-20 18:22:47 -04:00
Isaac Bennetch
7d21d4223b Add ChangeLog entries for: 
* 427fbed55d
* 6e1bbc54c2

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-09-20 18:02:38 -04:00
Isaac Bennetch
9c14df7ec7 Merge remote-tracking branch 'security/security/278' into QA_4_9 2019-09-20 18:02:06 -04:00
Isaac Bennetch
0de99c89e1 Merge remote-tracking branch 'security/security/279' into QA_4_9 2019-09-20 17:42:30 -04:00
Isaac Bennetch
725f407305 Merge branch 'QA_4_9' into QA_5_0 2019-09-20 16:28:24 -04:00
Isaac Bennetch
25a7c7abdb Fix merge confliects 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-09-20 16:24:04 -04:00
Isaac Bennetch
7a6827ff11 Merge commit '7a809b7adc' into QA_5_0 2019-09-20 16:19:13 -04:00
William Desportes
988e644c08
Fix texts where not truncated anymore 
Introduced-by-pull-request: #15414

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-19 23:41:13 +02:00
William Desportes
1859f8afc0
Upgrade tcpdf to 6.3.x 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-19 22:24:32 +02:00
Maurício Meneghini Fauth
427fbed55d Require POST method to delete servers in Setup 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-09-18 22:40:32 -03:00
Huang Zhiyi
7a809b7adc
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3304 of 3304 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/zh_Hans/
Signed-off-by: Huang Zhiyi <hzy980512@126.com>
 2019-09-18 11:24:15 +02:00
Walter Cheuk
e942226a11
Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.9% (3302 of 3304 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/zh_Hant/
Signed-off-by: Walter Cheuk <wwycheuk@gmail.com>
 2019-09-18 11:24:10 +02:00
WWWesten
77eef1a6d6
Translated using Weblate (Kazakh) 
Currently translated at 99.9% (3303 of 3304 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/kk/
Signed-off-by: WWWesten <wwwesten@gmail.com>
 2019-09-18 11:24:07 +02:00
WWWesten
bda71bd3a9
Translated using Weblate (Russian) 
Currently translated at 100.0% (3304 of 3304 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/ru/
Signed-off-by: WWWesten <wwwesten@gmail.com>
 2019-09-18 11:24:04 +02:00
ssantos
9f560dfdc8
Translated using Weblate (German) 
Currently translated at 100.0% (3304 of 3304 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/de/
Signed-off-by: ssantos <ssantos@web.de>
 2019-09-18 11:23:59 +02:00
Allan Nordhøy
2f1af48eb0
Translated using Weblate (Norwegian Bokmål) 
Currently translated at 60.4% (1996 of 3304 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/nb_NO/
Signed-off-by: Allan Nordhøy <epost@anotheragency.no>
 2019-09-12 01:23:44 +02:00
ssantos
fb56b3b337
Translated using Weblate (Portuguese) 
Currently translated at 100.0% (3304 of 3304 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/pt/
Signed-off-by: ssantos <ssantos@web.de>
 2019-09-08 22:23:51 +02:00
William Desportes
d070127c2d
Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-08 16:13:06 +02:00
William Desportes
7110206cb9
Fix redirected links in docs 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-08 16:09:58 +02:00
William Desportes
8343320841
Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-08 16:02:41 +02:00
William Desportes
4de8243469
Move php 5.5 step to custom steps to use trusty instead of xenial 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-08 15:30:04 +02:00
William Desportes
3ce36efe4f
Use xenial and remove mysql-server-5.6 from packages on TravisCI 
Ref: bcdf6dcde9

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-08 15:15:42 +02:00
William Desportes
42ec546c56
Use NodeJS 10 on travis CI release step and fix OSX step 
- remove sudo
- Cherry-pick of 0376662200
- Cherry-pick of e361a5ccfe

Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-08 15:01:47 +02:00
William Desportes
1095d793f0
Update brew on travis CI OSX step 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-08 14:45:26 +02:00
William Desportes
983a49dc00
Revert "Add ChangeLog entry for #15127" 
This reverts commit 61ea8b799a.

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-08 14:45:26 +02:00
William Desportes
1056e65b2b
Revert "Fix #15127 - fixed the white square in floating menubar" 
This reverts commit 61691091e5.

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-08 14:02:10 +02:00
William Desportes
27f56863fe
Add ChangeLog entries for #15349, #15440, 58f56111, 79c1b628, baada957, 631de237a 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-08 13:53:32 +02:00
William Desportes
631de237a3
Fix designer exit full screen mode icon and text back to enter mode 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-08 13:49:25 +02:00
William Desportes
baada9571f
Fix designer page URLs when saving 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-08 13:49:16 +02:00
William Desportes
79c1b62831
Fix designer page number -1 is an int 
Because of 58f56111df

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-08 12:17:55 +02:00
William Desportes
58f56111df
Fix reloading a designer page 
- Added cast to be sure pageNumber is an int -1 or postitive

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-08 11:40:13 +02:00
William Desportes
f49c253b9a
Fix #15440 - Page number is not being updated in the URL after saving a designer's page 
Fixes: #15440
Pull-request: #15464
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-08 11:18:30 +02:00
William Desportes
57a00351a2
Fix #15439 - Designer page status not updated when added a new table from another database 
Fixes: #15439
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-08 11:08:52 +02:00
Ankush Patil
3b9eb2b1f1 Fixed #15440 page number not showing in url bug 
Signed-off-by: Ankush Patil <aspraz2658@gmail.com>
 2019-09-08 10:50:35 +05:30
ssantos
854dec7562
Translated using Weblate (Portuguese) 
Currently translated at 100.0% (3304 of 3304 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/pt/
Signed-off-by: ssantos <ssantos@web.de>
 2019-09-06 00:23:39 +02:00