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

114070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Desportes
d8a319ad17
Merge pull request #14706 from Gaurav-Punjabi/issue#14965 
Removed the default server collation from the footer of databases table in the database page.

Closes: #14965
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-11-03 16:06:33 +01:00
Hosted Weblate
e2a31d82a2
Merge branch 'origin/master' into Weblate 2018-11-03 03:01:06 +01:00
ssantos
5c6ff90259
Translated using Weblate (German) 
Currently translated at 99.7% (3299 of 3307 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/de/
Signed-off-by: ssantos <ssantos@web.de>
 2018-11-03 03:01:05 +01:00
dingo thirteen
e7aa00b743
Translated using Weblate (Dutch) 
Currently translated at 100.0% (3307 of 3307 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/nl/
Signed-off-by: dingo thirteen <dingo13@gmail.com>
 2018-11-03 03:01:02 +01:00
Maurício Meneghini Fauth
28a8452d23 Fix uncaught TypeError in database QBE 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-11-02 23:00:05 -03:00
Hosted Weblate
cf5262f3ec
Merge branch 'origin/master' into Weblate 2018-11-02 02:00:47 +01:00
Burak Yavuz
13d8665035
Translated using Weblate (Turkish) 
Currently translated at 100.0% (3307 of 3307 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-11-02 02:00:45 +01:00
Domen
9929698b77
Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3307 of 3307 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/sl/
Signed-off-by: Domen <mitenem@outlook.com>
 2018-11-02 02:00:37 +01:00
Stefan Murariu
bc091bd074
Translated using Weblate (Romanian) 
Currently translated at 95.8% (3171 of 3307 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/ro/
Signed-off-by: Stefan Murariu <stefan.murariu@yahoo.com>
 2018-11-02 02:00:35 +01:00
Giovanni Sora
dcc8bf901e
Translated using Weblate (Interlingua) 
Currently translated at 75.2% (2489 of 3307 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-11-02 02:00:32 +01:00
Olivier Humbert
1b688882fb
Translated using Weblate (French) 
Currently translated at 100.0% (3307 of 3307 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-11-02 02:00:30 +01:00
Maurício Meneghini Fauth
9224aa4782
Merge pull request #14701 from stephanfx/style/remove-inline-style 
style: remove inline styles from function.js
 2018-11-01 22:00:21 -03:00
Gaurav Punjabi
04c6c33b56 Fixed testGetColumnOrder in ServerDatabasesControllerTest 
The testCase for getColumnOrder was failing since the default collation was not updated in it

Signed-off-by: Gaurav Punjabi <gaurav.punjabi6@icloud.com>
 2018-11-02 02:14:21 +05:30
Gaurav Punjabi
6f64ff1545 Removing the default collation footer 
Removing the default server collation in the footer of the databases table.As the the default collation can be seen in the dropdown at the top of the page

Signed-off-by: Gaurav Punjabi <gaurav.punjabi6@icloud.com>
 2018-11-02 02:14:21 +05:30
Gaurav Punjabi
6b00d07810 Update ServerDatabasesController.php 
Just removing the default collation of the server on the database page since the server has no collation.
In reference to solve Issue  phpMyAdmin#14965
Signed-off-by: Gaurav-Punjabi <gaurav.punjabi6@icloud.com>
Signed-off-by: Gaurav Punjabi <gaurav.punjabi6@icloud.com>
 2018-11-02 02:14:21 +05:30
Stephan Grobler
06e92df747 style: remove inline styles from function.js 
Signed-off-by: Stephan Grobler <stephan.grobler@gmail.com>
 2018-11-01 06:52:34 +02:00
Hosted Weblate
f842d20802
Merge branch 'origin/master' into Weblate 2018-11-01 03:20:22 +01:00
Maurício Meneghini Fauth
dbedbf7378
Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3307 of 3307 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-11-01 03:20:22 +01:00
Maurício Meneghini Fauth
4aef40e6e6 Replace 'ftp' with 'FTP' in docs 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-31 23:19:34 -03:00
Maurício Meneghini Fauth
8f3f7b4cfb Update po files 
[CI skip]

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-31 22:16:19 -03:00
Maurício Meneghini Fauth
235dac6667 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-31 22:13:17 -03:00
Maurício Meneghini Fauth
cf22b37e79 Update po files 
[CI skip]

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-31 21:58:10 -03:00
Maurício Meneghini Fauth
848473e47e
Merge pull request #14666 from mauriciofauth/db-query-subtabs 
Add secondary tabs for database query
 2018-10-31 21:54:35 -03:00
Maurício Meneghini Fauth
9fc76f9215 Add secondary tabs for database query 
Fixes #13621 QBE selenium tests broken since merge of #13342

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-31 21:52:54 -03:00
Maurício Meneghini Fauth
d4cf2f66a5 Add ChangeLog entry for #12158 
[CI skip]

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-31 19:27:05 -03:00
Hosted Weblate
62f57e41de
Merge branch 'origin/master' into Weblate 2018-10-31 23:21:49 +01:00
Giovanni Sora
25effb4d42
Translated using Weblate (Interlingua) 
Currently translated at 75.2% (2484 of 3302 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-10-31 23:21:47 +01:00
lkopo
764de6b600 Issue #12158: auto expand the single database (#14650) 
* Navigation menu automatically expands database if there is only one record
* Added a new configuration for auto-expanding navigation tree for single database

Signed-off-by: Eduard Karpiel <eduard@karpiel.sk>
 2018-10-31 19:21:39 -03:00
Maurício Meneghini Fauth
589ffd2bba Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-31 17:38:29 -03:00
Maurício Meneghini Fauth
2e5ca04c67 Add ChangeLog entry for #14223 
[CI skip]

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-31 17:36:34 -03:00
Hosted Weblate
2198e04cd8
Merge branch 'origin/QA_4_8' into Weblate 2018-10-31 21:33:10 +01:00
Burak Yavuz
d6d08be051
Translated using Weblate (Turkish) 
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/tr/
Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com>
 2018-10-31 21:33:09 +01:00
Marino
a3eed46cdd
Translated using Weblate (Croatian) 
Currently translated at 27.0% (890 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/hr/
Signed-off-by: Marino <mrabach@gmail.com>
 2018-10-31 21:33:06 +01:00
Maurício Meneghini Fauth
e1021b109b
Merge pull request #14660 from williamdes/issue-14223-designer 
Fixes #14223 - designer error
 2018-10-31 17:32:54 -03:00
Maurício Meneghini Fauth
99a0b0e04b
Merge pull request #14669 from michael10011/fix/issue-14419 
Fix #14419 - changed order in type dropdown
 2018-10-31 16:45:36 -03:00
Maurício Meneghini Fauth
888d7970a1 Require phpmyadmin/sql-parser ^4.2.5 
Related to #14404

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-31 16:23:09 -03:00
Maurício Meneghini Fauth
b9219b5df3 Add ChangegLog entry for #14594 
[CI skip]

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-31 15:21:27 -03:00
Hosted Weblate
bc16e43927
Merge branch 'origin/master' into Weblate 2018-10-31 19:12:32 +01:00
Maurício Meneghini Fauth
1436840b3d
Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3302 of 3302 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-10-31 19:12:31 +01:00
Mohammad Reza Mansouri
5adfa34af1 Database "Search" selects all tables by default. (#14679) 
Signed-off-by: Mohammad Reza Mansouri <beekalam@gmail.com>
 2018-10-31 15:12:23 -03:00
Hosted Weblate
b910060d4b
Merge branch 'origin/master' into Weblate 2018-10-31 18:53:56 +01:00
Burak Yavuz
a0d6968c0c
Translated using Weblate (Turkish) 
Currently translated at 100.0% (3302 of 3302 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-10-31 18:53:55 +01:00
Domen
a96a437a85
Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3302 of 3302 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/sl/
Signed-off-by: Domen <mitenem@outlook.com>
 2018-10-31 18:53:54 +01:00
Maurício Meneghini Fauth
fb74f67a4c
Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.9% (3301 of 3302 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-10-31 18:53:52 +01:00
Pedro Ribeiro
1d7eba4575
Translated using Weblate (Portuguese) 
Currently translated at 57.1% (1888 of 3302 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/pt/
Signed-off-by: Pedro Ribeiro <p.m42.ribeiro@gmail.com>
 2018-10-31 18:53:51 +01:00
Olivier Humbert
55651ebf6b
Translated using Weblate (French) 
Currently translated at 100.0% (3302 of 3302 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-10-31 18:53:49 +01:00
Marino
0668ea3d61
Translated using Weblate (Croatian) 
Currently translated at 26.8% (888 of 3302 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/hr/
Signed-off-by: Marino <mrabach@gmail.com>
 2018-10-31 18:53:47 +01:00
Maurício Meneghini Fauth
b3c49d9ef4 Improve wording in ImportCsv class 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-31 14:52:11 -03:00
Maurício Meneghini Fauth
e9a71f5bd7 Update po files 
[CI skip]

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-30 21:22:52 -03:00
Maurício Meneghini Fauth
16dca54ce4 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-30 21:22:01 -03:00