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

116429 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isaac Bennetch
a79688da11 Merge branch 'QA_5_0' 2019-09-20 16:30:33 -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
Tailing Yuan
66fcd51495
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 99.6% (3318 of 3331 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/zh_Hans/
Signed-off-by: Tailing Yuan <yuantailing@gmail.com>
 2019-09-18 20:27:54 +02:00
Huang Zhiyi
f54d99208d
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 99.6% (3318 of 3331 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/zh_Hans/
Signed-off-by: Huang Zhiyi <hzy980512@126.com>
 2019-09-18 20:27:53 +02:00
Walter Cheuk
561a9ed8e9
Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.6% (3319 of 3331 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/zh_Hant/
Signed-off-by: Walter Cheuk <wwycheuk@gmail.com>
 2019-09-18 20:27:51 +02:00
WWWesten
754deac1ba
Translated using Weblate (Kazakh) 
Currently translated at 99.5% (3313 of 3331 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/kk/
Signed-off-by: WWWesten <wwwesten@gmail.com>
 2019-09-18 20:27:46 +02:00
WWWesten
e955fb64f1
Translated using Weblate (Russian) 
Currently translated at 100.0% (3331 of 3331 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/ru/
Signed-off-by: WWWesten <wwwesten@gmail.com>
 2019-09-18 20:27:44 +02:00
tinect
c64874a84b
Translated using Weblate (German) 
Currently translated at 100.0% (3331 of 3331 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/de/
Signed-off-by: tinect <s.koenig@tinect.de>
 2019-09-18 20:27:38 +02:00
ssantos
befe660049
Translated using Weblate (German) 
Currently translated at 100.0% (3331 of 3331 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/de/
Signed-off-by: ssantos <ssantos@web.de>
 2019-09-18 20:27:37 +02: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
Maurício Meneghini Fauth
051ce2b509 Extract HTML from table privileges page 
Server\Privileges::getHtmlForSpecificTablePrivileges

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-09-17 22:28:52 -03:00
Maurício Meneghini Fauth
9dda538c80 Extract HTML from database privileges page 
Server\Privileges::getHtmlForSpecificDbPrivileges

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-09-12 11:38:16 -03: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
Allan Nordhøy
94b43e3fac
Translated using Weblate (Norwegian Bokmål) 
Currently translated at 59.4% (1977 of 3331 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/nb_NO/
Signed-off-by: Allan Nordhøy <epost@anotheragency.no>
 2019-09-12 01:23:44 +02:00
Mohit Kuri
d3fe6c2525 Improving move.js of Designer (#15345) 
Signed-off-by: Mohit Kuri <mohit.kuri@research.iiit.ac.in>
 2019-09-11 19:33:32 -03:00
Maurício Meneghini Fauth
fe6a7f754c Fix some inconsistencies in themes 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-09-08 23:20:19 -03:00
Maurício Meneghini Fauth
c534e85a05 Extract HTML from display user overview page 
Server\Privileges::getHtmlForUserOverview

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-09-08 20:52:39 -03:00
Maurício Meneghini Fauth
0ad9427edc Extract HTML from user accounts table body 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-09-08 18:13:58 -03:00
Luis45ccs
2bd439e499
Translated using Weblate (Spanish) 
Currently translated at 97.7% (3255 of 3331 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/es/
Signed-off-by: Luis45ccs <luis45ccs@hotmail.com>
 2019-09-08 22:23:58 +02:00
ssantos
0a9d0625f9
Translated using Weblate (Portuguese) 
Currently translated at 100.0% (3331 of 3331 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/pt/
Signed-off-by: ssantos <ssantos@web.de>
 2019-09-08 22:23:52 +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
d43e34868b
Merge branch 'QA_5_0' into master 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-08 16:44:15 +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
Maurício Meneghini Fauth
10003ee263 Extract HTML from Privileges::getUsersOverview 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-09-07 18:18:09 -03:00
Maurício Meneghini Fauth
a958569564 Remove Server\Privileges::formatPrivilege method 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-09-07 11:55:59 -03:00
Maurício Meneghini Fauth
5d2266ae41 Fix missing global declaration 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-09-05 20:35:22 -03:00