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

114017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maurício Meneghini Fauth
e2a03a4528 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-30 21:15:05 -03:00
Maurício Meneghini Fauth
894439b0d6 Add ChangeLog entry for #14630 
[CI skip]

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-30 21:13:08 -03:00
Hosted Weblate
b54878407c
Merge branch 'origin/QA_4_8' into Weblate 2018-10-31 01:10:24 +01:00
Yaron Shahrabani
77f64df057
Translated using Weblate (Hebrew) 
Currently translated at 49.9% (1644 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Yaron Shahrabani <sh.yaron@gmail.com>
 2018-10-31 01:10:23 +01:00
Alessandro Dolci
fd3dde47a6 Fixed condition on the emptiness of enum type criteriaValues array (#14648) 
The if condition has a call to the empty function on the criteriaValues array, but in the considered case that array only contains a '0', so this makes it look empty to the function. I added a control on the first element of the array, to avoid this specific situation.
It's my first contribution, so I hope I did well with the branches. Let me know if there's something missing or to do, I'm happy to help.

Signed-off-by: Alessandro Dolci <alessandro.dolci@pm.me>
(cherry picked from commit 3f5fff3f4d)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-30 21:09:02 -03:00
Alessandro Dolci
3f5fff3f4d Fixed condition on the emptiness of enum type criteriaValues array (#14648) 
The if condition has a call to the empty function on the criteriaValues array, but in the considered case that array only contains a '0', so this makes it look empty to the function. I added a control on the first element of the array, to avoid this specific situation.
It's my first contribution, so I hope I did well with the branches. Let me know if there's something missing or to do, I'm happy to help.

Signed-off-by: Alessandro Dolci <alessandro.dolci@pm.me>
 2018-10-30 21:05:33 -03:00
Hosted Weblate
108e6d0c49
Merge branch 'origin/master' into Weblate 2018-10-31 00:50:10 +01:00
Yaron Shahrabani
1af6940c30
Translated using Weblate (Hebrew) 
Currently translated at 49.7% (1641 of 3298 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/he/
Signed-off-by: Yaron Shahrabani <sh.yaron@gmail.com>
 2018-10-31 00:50:07 +01:00
Maurício Meneghini Fauth
65b3415c1f Update HTTP status codes phrases 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-30 20:48:55 -03:00
Maurício Meneghini Fauth
cd752ad149 Merge pull request #14446 from aswaniprakash/PMA_14404 
Drop view and or replace added to exporting view #14404
 2018-10-29 20:29:34 -03:00
Maurício Meneghini Fauth
4d9e5724a4 Add ChangeLog entry for #14404 
* Fix tests

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-29 20:23:43 -03:00
Aswani Prakash
e5fb032ff7 Drop view and or replace added to exporting view #14404 
Signed-off-by: Aswani Prakash <aswani15prakash@gmail.com>
 2018-10-29 19:41:45 -03:00
Maurício Meneghini Fauth
3209bd34c0 Merge branch 'aswaniprakash-PMA_13057' 2018-10-29 16:19:48 -03:00
Maurício Meneghini Fauth
ae94d31251 Add ChangeLog entry for #13057 
- Fix tests

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-29 16:17:30 -03:00
Aswani Prakash
ba673e3046 Issue #13057 fix: Option to exclude user definition from views on export 
Signed-off-by: Aswani Prakash <aswani15prakash@gmail.com>
 2018-10-29 16:11:46 -03:00
Maurício Meneghini Fauth
4577293a39 Remove Safari and Edge Selenium tests 
Since we have only a few parallel sessions on BrowserStack, this has caused frequent failures.

See: https://travis-ci.org/phpmyadmin/phpmyadmin/jobs/446970266#L849

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-29 13:48:55 -03:00
William Desportes
c671786ec8
Translated using Weblate (French) 
Currently translated at 100.0% (3298 of 3298 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/fr/
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-10-29 16:23:54 +01:00
William Desportes
0b2f6c7ede
Translated using Weblate (French) 
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/fr/
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-10-29 16:23:52 +01:00
Hosted Weblate
cca345804a
Merge branch 'origin/master' into Weblate 2018-10-27 04:33:21 +02:00
Hosted Weblate
b588f0223b
Merge branch 'origin/QA_4_8' into Weblate 2018-10-27 04:33:04 +02:00
Yaron Shahrabani
2ec6f25737
Translated using Weblate (Hebrew) 
Currently translated at 49.6% (1637 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Yaron Shahrabani <sh.yaron@gmail.com>
 2018-10-27 04:33:02 +02:00
Isaac Bennetch
d8014705b2 Merge branch 'QA_4_8' 2018-10-26 22:32:53 -04:00
Isaac Bennetch
999c711adc Documentation: 'Users' tab is now 'User accounts' so fix an incorrect reference 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-10-26 22:32:35 -04:00
Hosted Weblate
74a295bc71
Merge branch 'origin/master' into Weblate 2018-10-27 04:31:51 +02:00
Yaron Shahrabani
ac1e929dae
Translated using Weblate (Hebrew) 
Currently translated at 49.5% (1634 of 3298 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/he/
Signed-off-by: Yaron Shahrabani <sh.yaron@gmail.com>
 2018-10-27 04:31:47 +02:00
Isaac Bennetch
7f5eaa9a53 Merge branch 'QA_4_8' 2018-10-26 22:30:41 -04:00
Isaac Bennetch
61b9eb1191 Merge commit 'cbd23dd8f3' 2018-10-26 22:30:12 -04:00
Isaac Bennetch
ae387a3918 Merge commit '5d4bc20ed1' 2018-10-26 22:30:02 -04:00
Natanel
4e75a93633
Translated using Weblate (Hebrew) 
Currently translated at 49.6% (1636 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Natanel <natanelgemert@gmail.com>
 2018-10-26 12:08:50 +02:00
Yaron Shahrabani
5e785ce855
Translated using Weblate (Hebrew) 
Currently translated at 49.6% (1636 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Yaron Shahrabani <sh.yaron@gmail.com>
 2018-10-26 12:08:44 +02:00
Yaron Shahrabani
972baeba9d
Translated using Weblate (Hebrew) 
Currently translated at 49.5% (1633 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Yaron Shahrabani <sh.yaron@gmail.com>
 2018-10-26 12:00:03 +02:00
Natanel
d90a4be051
Translated using Weblate (Hebrew) 
Currently translated at 49.5% (1633 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Natanel <natanelgemert@gmail.com>
 2018-10-26 11:59:57 +02:00
Yaron Shahrabani
edb9838ba6
Translated using Weblate (Hebrew) 
Currently translated at 49.3% (1628 of 3298 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/he/
Signed-off-by: Yaron Shahrabani <sh.yaron@gmail.com>
 2018-10-26 11:55:48 +02:00
Yaron Shahrabani
65acb56026
Translated using Weblate (Hebrew) 
Currently translated at 49.4% (1630 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Yaron Shahrabani <sh.yaron@gmail.com>
 2018-10-26 11:55:10 +02:00
Natanel
f793d6b1b6
Translated using Weblate (Hebrew) 
Currently translated at 49.4% (1630 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Natanel <natanelgemert@gmail.com>
 2018-10-26 11:54:30 +02:00
Yaron Shahrabani
993d89e1d9
Translated using Weblate (Hebrew) 
Currently translated at 49.4% (1630 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Yaron Shahrabani <sh.yaron@gmail.com>
 2018-10-26 11:54:25 +02:00
Natanel
74bb42888b
Translated using Weblate (Hebrew) 
Currently translated at 49.4% (1629 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Natanel <natanelgemert@gmail.com>
 2018-10-26 11:53:13 +02:00
Yaron Shahrabani
0c946a8d08
Translated using Weblate (Hebrew) 
Currently translated at 49.4% (1629 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Yaron Shahrabani <sh.yaron@gmail.com>
 2018-10-26 11:53:06 +02:00
Yaron Shahrabani
96972ea79c
Translated using Weblate (Hebrew) 
Currently translated at 49.4% (1629 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Yaron Shahrabani <sh.yaron@gmail.com>
 2018-10-26 11:51:50 +02:00
Natanel
f916fbda75
Translated using Weblate (Hebrew) 
Currently translated at 49.4% (1629 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Natanel <natanelgemert@gmail.com>
 2018-10-26 11:51:43 +02:00
Natanel
82dd6d8374
Translated using Weblate (Hebrew) 
Currently translated at 49.4% (1629 of 3294 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Natanel <natanelgemert@gmail.com>
 2018-10-26 11:50:03 +02:00
William Desportes
cbd23dd8f3
Add ChangeLog entry for #14636 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-10-25 23:16:44 +02:00
Vincent Horváth
3cda8e6093
Fix for #14636 - Move operation causes SELECT * FROM undefined 
- fixed params name in operation js file
- set value in global field table to new table name
- fixed refresh page after submit move table
- fixed back quote in message result

Signed-off-by: Vincent Horváth <win9400@gmail.com>
(cherry picked from commit 52024f1d2b)
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-10-25 23:14:21 +02:00
William Desportes
ff349c7e5c
Merge pull request #14656 from wincdev/FIX/issue-14636 
Fixes: #14636 - Move operation causes SELECT * FROM `undefined`
 2018-10-25 23:06:13 +02:00
William Desportes
4cddc66553
Add ChangeLog entry for #14571 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-10-25 22:54:34 +02:00
Vincent Horváth
54f78660e0
Fix for #14571 - "No database selected" - DROP a view 
Signed-off-by: Vincent Horváth <win9400@gmail.com>
(cherry picked from commit 36ae547c63)
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-10-25 22:51:39 +02:00
William Desportes
9f27dc0688
Merge pull request #14659 from wincdev/FIX/issue-14571 
Fixes: #14571 - "No database selected" - DROP a view
 2018-10-25 22:34:12 +02:00
Robert Antoni Buj Gelonch
5d4bc20ed1
Translated using Weblate (Catalan) 
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/ca/
Signed-off-by: Robert Antoni Buj Gelonch <robert.buj@gmail.com>
 2018-10-25 18:24:19 +02:00
Maurício Meneghini Fauth
222bf67795 Fix uncaught TypeError in Header class 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-10-25 01:27:24 -03:00
Hosted Weblate
c9b2aff36b
Merge branch 'origin/master' into Weblate 2018-10-24 19:03:26 +02:00