Commit Graph

114385 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
999b4d14f0 Fix some coding standard errors
- Fixes array identation
- Removes empty statements

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-05 21:25:08 -02:00
Maurício Meneghini Fauth
3a7e1503ac Fix some coding standard errors
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-04 19:42:10 -02:00
popcorner
814c39cfda
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (3307 of 3307 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/zh_Hans/
Signed-off-by: popcorner <memoword@163.com>
2019-01-03 16:07:15 +01:00
Joshua PowellNishiyama
13ef500914
Translated using Weblate (Japanese)
Currently translated at 71.3% (2358 of 3307 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-01-01 06:10:19 +01:00
Promasu
e954c1a599
Translated using Weblate (German)
Currently translated at 100.0% (3307 of 3307 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/de/
Signed-off-by: Promasu <microgamer.developer@gmail.com>
2019-01-01 06:10:04 +01:00
Walter Cheuk
242bc39432
Translated using Weblate (Chinese (Traditional))
Currently translated at 98.6% (3261 of 3307 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-01-01 06:10:01 +01:00
Marino
d472698d6e
Translated using Weblate (Croatian)
Currently translated at 27.2% (898 of 3307 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/hr/
Signed-off-by: Marino <mrabach@gmail.com>
2018-12-31 08:44:27 +01:00
William Desportes
cce047ac4a
Merge pull request #14819 from ffeliks/issue-14812
Fix #14812: Table chart not opening
2018-12-26 19:48:30 +01:00
Feliks Toomsoo
d6dde0180d Fix the table chart by not escaping null values
Signed-off-by: Feliks Toomsoo <feliks.toomsoo@gmail.com>
2018-12-26 20:10:02 +02:00
Isaac Bennetch
0a0bc2cba6
Merge pull request #14785 from ibennetch/14782
Add version handling for the dev packages in Composer when creating the release
2018-12-22 21:32:00 -05:00
Maurício Meneghini Fauth
43f080ff86
Merge pull request #14806 from mauriciofauth/root-path
Define an absolute path to use for require statements
2018-12-22 18:51:24 -02:00
William Desportes
c8170514f3
Merge pull request #14810 from dhyey35/master
Fix #14756: Browser display transformation selection
2018-12-22 19:31:34 +01:00
Dhyey Thakore
b5ab563087 Fix #14756: Browser display transformation selection
Signed-off-by: Dhyey Thakore <dhyey35@gmail.com>
2018-12-22 23:17:22 +05:30
Maurício Meneghini Fauth
38e5b12c1c Define an absolute path to use for require statements
Fixes #6167

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-22 14:37:31 -02:00
Maurício Meneghini Fauth
0e372eac7e Fix Table\StructureTest Selenium test
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-21 22:23:23 -02:00
Maurício Meneghini Fauth
fd656a9511 Merge branch 'QA_4_8'
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-21 21:01:49 -02:00
Maurício Meneghini Fauth
ebab451e56 Fix TableBrowseTest Selenium test
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-21 20:30:44 -02:00
Maurício Meneghini Fauth
ceee227e10 Fix ConfigTest phpcs errors
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-21 18:15:36 -02:00
William Desportes
fe587e05b4
Merge branch 'QA_4_8'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-12-21 17:10:11 +01:00
William Desportes
c433dd3c23
Add ChangeLog entry for #14635
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-12-21 16:23:42 +01:00
William Desportes
3da7230faf
Merge remote-tracking branch 'williamdes/issues-14635-14762-git-dir-removed' into QA_4_8
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-12-21 16:16:16 +01:00
William Desportes
b6f38940f4
Merge pull request #14799 from williamdes/issue-13788-export-view
Fix #13788 - Exporting a view structure, no database selected error

Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-12-21 16:15:06 +01:00
William Desportes
a8148f1fa7
Add tests for #14635
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-12-21 15:35:59 +01:00
William Desportes
99cee9e389
Fix #14635 - Git revision error
See: #14762
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-12-21 15:02:13 +01:00
William Desportes
3ca6646137
Fix found by phpstan
See: cc2665121d
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-12-21 11:49:00 +01:00
William Desportes
a6b6792cfb
Added tests for Config::checkGitRevision and Config::isGitRevision
#14253
Cherry-Picked-From: 9687dfbfd2
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-12-21 11:48:59 +01:00
William Desportes
1ead268e42
Add support for commondir file in .git dir
- See : https://git-scm.com/docs/gitrepository-layout/2.5.1
- See : https://git-scm.com/docs/gitrepository-layout
#14391
Cherry-picked-from: 13e34b400a
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-12-21 11:48:49 +01:00
William Desportes
d327674d72
Fix tests for #13788 - Exporting a view structure
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-12-21 09:46:28 +01:00
Maurício Meneghini Fauth
a04a596829
Merge pull request #14792 from mauriciofauth/bootstrap-buttons
Use Bootstrap buttons component
2018-12-21 02:01:10 -02:00
Maurício Meneghini Fauth
2edd97a62b Merge branch 'QA_4_8'
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-21 01:55:50 -02:00
Maurício Meneghini Fauth
d7bea5c1fa Add ChangeLog entry for #14217
[ci skip]

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-21 01:32:21 -02:00
Hosted Weblate
17589938b4
Merge branch 'origin/QA_4_8' into Weblate. 2018-12-21 04:28:30 +01:00
F4LL
964ca9b9da
Translated using Weblate (Japanese)
Currently translated at 70.4% (2320 of 3296 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ja/
Signed-off-by: F4LL <yuutavx0319@gmail.com>
2018-12-21 04:28:28 +01:00
Maurício Meneghini Fauth
289ef55f54
Merge pull request #14788 from mauriciofauth/mysql8-grant
Fix issue when adding user on MySQL 8.0.11
2018-12-21 01:28:22 -02:00
Maurício Meneghini Fauth
ef5d7dd66b Use Bootstrap buttons component
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-21 01:01:12 -02:00
Maurício Meneghini Fauth
5bce6d9fa6 Add Bootstrap javascript file
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-20 22:34:12 -02:00
Maurício Meneghini Fauth
f367a1b98d
Merge pull request #14793 from mauriciofauth/html-closing-tags
Remove unnecessary HTML closing tags
2018-12-20 22:30:39 -02:00
Isaac Bennetch
5f27add073 Add version handling for the dev packages in Composer when creating the release.
This parses the required dependency versions from composer.json and installs them manually as required packages.

Fixes #14782

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-12-20 18:36:04 -05:00
William Desportes
a5b50b35bf
Add ChangeLog entry for #13788
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-12-20 11:23:46 +01:00
William Desportes
cfc96202fe
Fix #13788 - Exporting a view structure, no database selected error
Fix #13788 - Exporting a view structure based on another view with a sub-query throws no database selected error

Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-12-20 11:20:49 +01:00
Isaac Bennetch
255d16f55f ChangeLog entry for commit 77bbfec0a9
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-12-19 19:41:04 -05:00
Maurício Meneghini Fauth
12f898d871 Fix issue when adding user on MySQL 8.0.11
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-19 22:23:46 -02:00
Maurício Meneghini Fauth
2efb05e8cc Merge branch 'QA_4_8'
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-19 22:22:43 -02:00
Maurício Meneghini Fauth
fd3b39d379 Allow failures for OSX on Travis
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-19 22:20:38 -02:00
Maurício Meneghini Fauth
a76816622f Revert "Add brew link step for PHP on OSX"
This reverts commit 185061c008.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-19 22:19:42 -02:00
Maurício Meneghini Fauth
185061c008 Add brew link step for PHP on OSX
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-19 22:04:54 -02:00
Maurício Meneghini Fauth
15ee24e9eb Revert "Use PHP 7.3 for OSX on build matrix"
This reverts commit 4f6ba939ee.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-19 22:04:05 -02:00
Maurício Meneghini Fauth
e1efc8cef0 Merge branch 'QA_4_8'
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-19 21:45:34 -02:00
Maurício Meneghini Fauth
4f6ba939ee Use PHP 7.3 for OSX on build matrix
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-12-19 21:39:22 -02:00
William Desportes
789287c1b5
Merge branch 'QA_4_8'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2018-12-19 15:45:00 +01:00