gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
115,953 Commits 12 Branches 481 Tags 2.4 GiB
984fffa759
Commit Graph

115953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maurício Meneghini Fauth
984fffa759 Add more test data to CollationTest::testGetCollationDescription 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-06-29 15:09:54 -03:00
Maurício Meneghini Fauth
792563b7f3 Merge branch 'QA_4_9' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-06-29 14:58:28 -03:00
Maurício Meneghini Fauth
48676c2270 Add GB18030 Chinese collations description 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-06-29 14:54:48 -03:00
Maurício Meneghini Fauth
6b6d5ecd2c Move Charsets::getCollationDescr to Collation and make it private 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-06-28 23:23:48 -03:00
Maurício Meneghini Fauth
064e5eef0a Use Collation value object when possible 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-06-28 23:01:30 -03:00
Maurício Meneghini Fauth
e99f3ace5c Move DbiDummy extension to the test directory 
DbiDummy extension is only used for testing purposes

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-06-28 18:00:36 -03:00
Maurício Meneghini Fauth
711ef54eca Add Charsets::findCollationByName method 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-06-28 02:17:57 -03:00
William Desportes
f58a86aa4d
Merge branch 'QA_4_9' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-06-27 23:51:32 +02:00
William Desportes
3f45d364a1
Add ChangeLog entry for #14918 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-06-27 23:46:12 +02:00
William Desportes
70e6e0b660
Fix #14918 - Use hex for the session token 
Fixes: #14918
Pull-request: #15356

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-06-27 23:46:01 +02:00
ssantos
d28489094f
Translated using Weblate (German) 
Currently translated at 100.0% (3323 of 3323 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/de/
Signed-off-by: ssantos <ssantos@web.de>
 2019-06-26 23:00:13 +02:00
ssantos
a2be98203d
Translated using Weblate (German) 
Currently translated at 100.0% (3301 of 3301 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-06-26 23:00:13 +02:00
William Desportes
a12012b7ae
Merge #15355 - Fix most of deprecated Jquery calls 
Pull-request: #15355
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-06-25 09:08:06 +02:00
Maurício Meneghini Fauth
4fe624fa93 Remove Charsets::getCollationDropdownBox method 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-06-25 03:32:01 -03:00
Maurício Meneghini Fauth
0291c48114 Remove Charsets::getCharsetDropdownBox method 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-06-25 01:45:32 -03:00
Maurício Meneghini Fauth
b409c83224 Extract HTML from Rte\Routines::getParameterRow 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-06-24 18:36:59 -03:00
William Desportes
cc73250b43
Fix #14918 - Use hex for the session token 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-06-24 22:05:56 +02:00
William Desportes
6ecf6ec93e
Fixed most of deprecated Jquery calls 
\.(blur|focus|focusin|focusout|resize|scroll|click|dblclick|mousedown|mouseup|mousemove|mouseover|mouseout|mouseenter|mouseleave|change|select|submit|keydown|keypress|keyup|contextmenu)\(\)

Ref:  #13173

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-06-24 21:54:23 +02:00
William Desportes
bc585d97f7
Merge branch 'QA_4_9' 
I missed the sign-off for 180b45f225 and e0889beb52
So the sign-off below is also for them.

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-06-24 21:42:42 +02:00
William Desportes
26373240cd
[FAQ] Merge #15349 - country_code is defined as NOT NULL, yet INSERT lacks a value! 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-06-24 21:37:15 +02:00
johnkershaw
ecad5995ab
country_code is defined as NOT NULL 
Without a country_code for 'Marc' the second step will fail (cannot relate country_code in REL_persons to country_code in REL_countries if the REL_persons record has no value for country_code).

Since this is the whole point of this example it's going to trip people up who're trying to set up relations in phpMyAdmin (like me!)

Co-authored-by: William Desportes <williamdes@wdes.fr>
Signed-off-by: John Kershaw <john@kershaw.org>
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-06-24 21:34:36 +02:00
William Desportes
e0889beb52
Improve code and readability of _getFieldVisibilityParams 2019-06-24 21:23:50 +02:00
William Desportes
180b45f225
Fix #15230 - Column misalignment 
Fixes: #15230
Introduced by: 637fe6de06
 2019-06-24 21:18:04 +02:00
Domen
46f0ad927c
Translated using Weblate (Slovenian) 
Currently translated at 99.9% (3300 of 3301 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/sl/
Signed-off-by: Domen <mitenem@outlook.com>
 2019-06-24 16:00:31 +02:00
Domen
8fb5763b1d
Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3323 of 3323 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/sl/
Signed-off-by: Domen <mitenem@outlook.com>
 2019-06-24 16:00:31 +02:00
WWWesten
99ebb854ce
Translated using Weblate (Kazakh) 
Currently translated at 100.0% (3301 of 3301 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-06-24 16:00:29 +02:00
WWWesten
74e2571187
Translated using Weblate (Kazakh) 
Currently translated at 100.0% (3323 of 3323 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/kk/
Signed-off-by: WWWesten <wwwesten@gmail.com>
 2019-06-24 16:00:29 +02:00
Olivier Humbert
32a1d961ba
Translated using Weblate (French) 
Currently translated at 100.0% (3301 of 3301 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/fr/
Signed-off-by: Olivier Humbert <trebmuh@tuxfamily.org>
 2019-06-24 16:00:27 +02:00
Olivier Humbert
55ca7be22a
Translated using Weblate (French) 
Currently translated at 100.0% (3323 of 3323 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/fr/
Signed-off-by: Olivier Humbert <trebmuh@tuxfamily.org>
 2019-06-24 16:00:27 +02:00
ssantos
307bd13114
Translated using Weblate (Portuguese) 
Currently translated at 100.0% (3301 of 3301 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-06-24 16:00:24 +02:00
ssantos
ec1f267a82
Translated using Weblate (Portuguese) 
Currently translated at 100.0% (3323 of 3323 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/pt/
Signed-off-by: ssantos <ssantos@web.de>
 2019-06-24 16:00:24 +02:00
Joshua PowellNishiyama
0b5fdb0ffe
Translated using Weblate (Japanese) 
Currently translated at 100.0% (3301 of 3301 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/ja/
Signed-off-by: Joshua PowellNishiyama <nzjpnboy@outlook.com>
 2019-06-24 16:00:21 +02:00
Joshua PowellNishiyama
aa80f90c94
Translated using Weblate (Japanese) 
Currently translated at 100.0% (3323 of 3323 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/ja/
Signed-off-by: Joshua PowellNishiyama <nzjpnboy@outlook.com>
 2019-06-24 16:00:21 +02:00
WWWesten
d266cd9f3c
Translated using Weblate (Russian) 
Currently translated at 100.0% (3301 of 3301 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-06-24 16:00:17 +02:00
WWWesten
eb949e5b67
Translated using Weblate (Russian) 
Currently translated at 100.0% (3323 of 3323 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/ru/
Signed-off-by: WWWesten <wwwesten@gmail.com>
 2019-06-24 16:00:17 +02:00
Burak Yavuz
c1e845784b
Translated using Weblate (Turkish) 
Currently translated at 100.0% (3301 of 3301 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/tr/
Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com>
 2019-06-24 16:00:11 +02:00
Burak Yavuz
9b71301d48
Translated using Weblate (Turkish) 
Currently translated at 100.0% (3323 of 3323 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/tr/
Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com>
 2019-06-24 16:00:11 +02:00
Maurício Meneghini Fauth
0376662200 Fix composer installation on OSX build 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-06-23 22:59:02 -03:00
Maurício Meneghini Fauth
e361a5ccfe Fix PHP version in osx travis build 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-06-23 08:15:58 -03:00
Maurício Meneghini Fauth
54fa7ecaa3
Merge pull request #15348 from mauriciofauth/charset-collation-types 
Add Charset and Collation value objects
 2019-06-23 07:50:54 -03:00
Maurício Meneghini Fauth
c0dc309b8c Disallow failures for OSX builds by enabling brew update 
https://travis-ci.community/t/xcode-8-3-homebrew-outdated-error/3798

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-06-23 05:41:15 -03:00
Maurício Meneghini Fauth
02766cf370 Add Charset and Collation value types 
And refactor Charset class

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-06-23 05:19:53 -03:00
William Desportes
b9217146ab
Fix multi server setup number of results selector 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-06-22 20:51:30 +02:00
William Desportes
942897426b
Merge branch 'QA_4_9' 
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-06-22 20:02:05 +02:00
William Desportes
97d25f4e51
Fix #15334 - export of GIS visualisation not working 
[ci skip]
Missed use case in bbac072fb5
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-06-22 19:59:22 +02:00
William Desportes
860809ea08
Fix Windows CI exit failure (GPG agent) 
See: https://travis-ci.community/t/timeout-after-build-finished-and-succeeded/1336
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-06-22 18:53:07 +02:00
William Desportes
3c74f22e89
Minor code improvements 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-06-22 18:27:36 +02:00
William Desportes
d9f2428032
Remove unused imports and fix an error reported by Scrutinizer 2019-06-22 17:55:58 +02:00
William Desportes
a2268169ae
Use strict compare for count function 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-06-22 17:44:49 +02:00
William Desportes
64c1b26bac
Use strict compare for booleans 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-06-22 17:41:54 +02:00