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

112861 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Allan Nordhøy
aade3546b2 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 55.2% (1818 of 3288 strings)

[CI skip]
 2018-03-31 17:15:22 +02:00
Maurício Meneghini Fauth
5f0a7908cb Replace static methods with instance methods 
Replaces PhpMyAdmin\Tracking static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-31 03:35:56 -03:00
Maurício Meneghini Fauth
b6767f4bf8 Replace static methods with instance methods 
Replaces PhpMyAdmin\Server\Privileges static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-31 03:09:45 -03:00
Maurício Meneghini Fauth
4c2511b8c4 Merge branch 'QA_4_8' 2018-03-30 18:48:56 -03:00
Piyush Vijay
d093c66f1f Designer: "Add options" dialog doesn't reset when canceling: #14110 issue fixed (#14117) 
* Designer: "Add options" dialog doesn't reset when canceling: Fix #14110
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

* Designer: Add option dialogue error handling needs to be modified Fix #14126
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>
(cherry picked from commit 6700b2d56f)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-30 18:48:02 -03:00
Piyush Vijay
6700b2d56f Designer: "Add options" dialog doesn't reset when canceling: #14110 issue fixed (#14117) 
* Designer: "Add options" dialog doesn't reset when canceling: Fix #14110
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

* Designer: Add option dialogue error handling needs to be modified Fix #14126
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>
 2018-03-30 18:45:19 -03:00
Maurício Meneghini Fauth
b2d488b102 Merge branch 'QA_4_8' 2018-03-30 17:52:36 -03:00
Maurício Meneghini Fauth
b2eaf6abb6 Fix wrong function call 
Replace PMA_isValid with Core::isValid

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-30 17:49:02 -03:00
Maurício Meneghini Fauth
31d6bc8d91
Merge pull request #14122 from vyeshwanth/PMA_14043 
Enhancement: Button to add a central column from existing tables Fix #14043
 2018-03-30 17:45:21 -03:00
Maurício Meneghini Fauth
8f3a68bff9 Merge branch 'QA_4_8' 2018-03-30 17:25:48 -03:00
vyeshwanth
973931eeba Designer: Add options dialog is pre-filled with spaces #14111 issue fix 
Signed-off-by: Yeshwanth Vuppu <vyeshwanth123@gmail.com>
(cherry picked from commit 6e76bf3504)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-30 17:22:00 -03:00
Maurício Meneghini Fauth
9a8ed9c7e5
Merge pull request #14114 from vyeshwanth/PMA_14111 
Designer: Add options dialog is pre-filled with spaces #14111 issue fix
Fix #14111
 2018-03-30 17:20:11 -03:00
vyeshwanth
595bef3c99 Designer: Improperly escaped code in "Add option" dialog #14109 issue fix 
Signed-off-by: Yeshwanth Vuppu <vyeshwanth123@gmail.com>
(cherry picked from commit e53afc3ef9)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-30 17:17:40 -03:00
Weblate
eb925063e7 Merge remote-tracking branch 'origin/master' 2018-03-30 22:15:15 +02:00
Stefano Martinelli
8b70ee3077 Translated using Weblate (Italian) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]
 2018-03-30 22:15:13 +02:00
Maurício Meneghini Fauth
80f2043b33
Merge pull request #14113 from vyeshwanth/PMA_14109 
Designer: Improperly escaped code in "Add option" dialog #14109 issue fix
Fix #14109
 2018-03-30 17:15:03 -03:00
Weblate
a445c9f898 Merge remote-tracking branch 'origin/QA_4_8' into QA_4_8 2018-03-30 22:08:30 +02:00
Stefano Martinelli
f4b8aba557 Translated using Weblate (Italian) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]
 2018-03-30 22:08:30 +02:00
Maurício Meneghini Fauth
69def191d3 Fix cases where $name is an array in createFile 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-30 17:03:39 -03:00
vyeshwanth
e53afc3ef9
Designer: Improperly escaped code in "Add option" dialog #14109 issue fix 
Signed-off-by: Yeshwanth Vuppu <vyeshwanth123@gmail.com>
 2018-03-30 21:12:23 +05:30
vyeshwanth
6e76bf3504
Designer: Add options dialog is pre-filled with spaces #14111 issue fix 
Signed-off-by: Yeshwanth Vuppu <vyeshwanth123@gmail.com>
 2018-03-30 21:00:32 +05:30
vyeshwanth
096b2ac6d7
Enhancement: Button to add a central column from existing tables #14043 
Signed-off-by: Yeshwanth Vuppu <vyeshwanth123@gmail.com>
 2018-03-30 20:43:22 +05:30
Weblate
cec81aec2f Merge remote-tracking branch 'origin/master' 2018-03-30 08:32:34 +02:00
Yaron Shahrabani
fc0bc5293f Translated using Weblate (Hebrew) 
Currently translated at 22.3% (734 of 3288 strings)

[CI skip]
 2018-03-30 08:32:32 +02:00
Maurício Meneghini Fauth
3fe1c46af6 Merge branch 'QA_4_8' 2018-03-30 03:32:09 -03:00
Maurício Meneghini Fauth
c21d2f8af1 Merge branch 'nulll-pointer/export_seperate_error' into QA_4_8 2018-03-30 03:29:24 -03:00
Lakshay arora
8e48a0c4f2 Fix for "Export tables as seperate files", #14080 
Applied code sniffer.

Fix #14080
Close #14115

Signed-off-by: Lakshay arora <carefreelakshay97@gmail.com>
 2018-03-30 03:26:47 -03:00
Weblate
9911898dea Merge remote-tracking branch 'origin/QA_4_8' into QA_4_8 2018-03-29 21:11:16 +02:00
Yaron Shahrabani
6c04ffba2c Translated using Weblate (Hebrew) 
Currently translated at 22.3% (734 of 3288 strings)

[CI skip]
 2018-03-29 21:11:15 +02:00
Lakshay arora
3bd97cef53 Fixes error 404 on creating views, issue #14082 
Signed-off-by: Lakshay arora <arora.lakshya123@gmail.com>

(cherry picked from commit 29c45385ec)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-29 16:10:51 -03:00
Yaron Shahrabani
0cf0085d1e Translated using Weblate (Hebrew) 
Currently translated at 22.3% (734 of 3288 strings)

[CI skip]
 2018-03-29 21:03:36 +02:00
Yaron Shahrabani
8c551f12c5 Translated using Weblate (Hebrew) 
Currently translated at 22.3% (734 of 3288 strings)

[CI skip]
 2018-03-29 21:03:30 +02:00
Weblate
317d22064b Merge remote-tracking branch 'origin/master' 2018-03-29 21:02:49 +02:00
Yaron Shahrabani
89e981184c Translated using Weblate (Hebrew) 
Currently translated at 22.2% (732 of 3288 strings)

[CI skip]
 2018-03-29 21:02:49 +02:00
Maurício Meneghini Fauth
be03257567
Merge pull request #14092 from nulll-pointer/view_create_error 
Fix #14082
 2018-03-29 16:02:44 -03:00
Yaron Shahrabani
5884c09f9e Translated using Weblate (Hebrew) 
Currently translated at 22.1% (728 of 3288 strings)

[CI skip]
 2018-03-29 21:00:08 +02:00
Yaron Shahrabani
a3c88a1afc Translated using Weblate (Hebrew) 
Currently translated at 22.1% (728 of 3288 strings)

[CI skip]
 2018-03-29 20:59:58 +02:00
Maurício Meneghini Fauth
6789e86a62 Merge branch 'QA_4_8' 2018-03-29 15:35:26 -03:00
Maurício Meneghini Fauth
7222e02df5 Merge branch 'nulll-pointer-zoom_search_error' into QA_4_8 
Fix #13439
 2018-03-29 15:32:25 -03:00
Lakshay arora
85c975f27f Fix for issue #13439 
Problem 1:
The number of td elements in the zoom search form table were insufficient, due to which, the field_type(element #types_$) was getting replaced with field_value(element td:eq(3))(see ./js/tbl_zoom_jqplot.js lines 164, 188, 211, 232). Added a td element in the table for each row.
Problem 2:
The events attached to 'tableid_$' were inserting the values in wrong tr elements(see ./js/tbl_zoom_jqplot.js lines 185-188, 208-211, 229-232), leading to wrong values being passed to the zoom search.

Signed-off-by: Lakshay arora <b16060@students.iitmandi.ac.in>
 2018-03-29 15:30:39 -03:00
Olivier Humbert
fa0b12fe0e Translated using Weblate (French) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]
 2018-03-29 14:36:10 +02:00
Lakshay arora
29c45385ec Fixes error 404 on creating views, issue #14082 
Signed-off-by: Lakshay arora <arora.lakshya123@gmail.com>
 2018-03-29 11:53:48 +05:30
Weblate
695fe3a994 Merge remote-tracking branch 'origin/master' 2018-03-28 17:48:22 +02:00
Olivier Humbert
d564aded25 Translated using Weblate (French) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]
 2018-03-28 17:48:21 +02:00
Maurício Meneghini Fauth
9a50d58eeb Revert "Allow failures for Selenium tests temporarily" 
This reverts commit 051a77b86b.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-28 12:47:54 -03:00
Michal Čihař
fc9e2ff9dc Merge branch 'QA_4_8' 2018-03-28 09:29:31 +02:00
Michal Čihař
28f2996652 Update BrowserStack key 
Fixes #14138

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-03-28 09:28:58 +02:00
Maurício Meneghini Fauth
b078e99c95 Merge branch 'QA_4_8' 2018-03-28 01:04:49 -03:00
Maurício Meneghini Fauth
20407323dd Merge branch 'QA_4_7' into QA_4_8 2018-03-28 01:03:31 -03:00
Maurício Meneghini Fauth
294a22c1d4 Update copyright years 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-28 01:01:24 -03:00