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

112840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Maurício Meneghini Fauth
051a77b86b Allow failures for Selenium tests temporarily 
Issue: #14138

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-27 21:39:45 -03:00
Maurício Meneghini Fauth
58c755785c Replace static methods with instance methods 
Replaces PhpMyAdmin\ReplicationGui static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-27 21:35:30 -03:00
Maurício Meneghini Fauth
91688207d7 Merge branch 'QA_4_8' 2018-03-27 18:46:42 -03:00
Maurício Meneghini Fauth
ca7fd2b2c7 Fix case where 'query' is always considered defined 
Related to #14079

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-27 18:44:28 -03:00
Maurício Meneghini Fauth
0d335856dd Merge branch 'QA_4_8' 2018-03-27 16:04:21 -03:00
Lakshay arora
2aecbf41e1 Fixes error in foreign key sql generation + drop foreign key contraint (#14031) 
* Fixes error in foreign key sql genration, issue #14030
Changed:
	templates/table/relation/foreign_key_row.twig
The destination_column_names were getting passed as a 1d array, the names when extracted gave a string. Passing it as a 2d array (see templates/table/relation/foreign_key_row.twig lines 123,133) fixes the issue.

Sign-Off-By: Lakshay arora (b16060@students.iitmandi.ac.in)

* Fixes error in foreign key sql generation + drop foreign key contraint, issue #14030
Changed:
	templates/table/relation/foreign_key_row.twig

Fix #13941
Fix #14009
Close #14037
Close #14010

Signed-off-by: Lakshay arora <b16060@students.iitmandi.ac.in>
(cherry picked from commit 00b59624e3)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-27 16:02:33 -03:00
Maurício Meneghini Fauth
6d322c0c8f Update test theme to 4.9 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-27 03:18:45 -03:00
Maurício Meneghini Fauth
cec9d8b72d Update themes to 4.9 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-27 03:07:15 -03:00
Isaac Bennetch
95d487f9fe Prepare version numbers for 4.9.0-dev; update master to 4.9.0-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-27 00:54:54 -04:00
Lakshay arora
00b59624e3 Fixes error in foreign key sql generation + drop foreign key contraint (#14031) 
* Fixes error in foreign key sql genration, issue #14030
Changed:
	templates/table/relation/foreign_key_row.twig
The destination_column_names were getting passed as a 1d array, the names when extracted gave a string. Passing it as a 2d array (see templates/table/relation/foreign_key_row.twig lines 123,133) fixes the issue.

Sign-Off-By: Lakshay arora (b16060@students.iitmandi.ac.in)

* Fixes error in foreign key sql generation + drop foreign key contraint, issue #14030
Changed:
	templates/table/relation/foreign_key_row.twig

Fix #13941
Fix #14009
Close #14037
Close #14010

Signed-off-by: Lakshay arora <b16060@students.iitmandi.ac.in>
 2018-03-27 01:48:50 -03:00
Isaac Bennetch
046bc0f009 Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-27 00:40:41 -04:00
Isaac Bennetch
b2ad84ea40 Adding composer lock for 4.8.0-rc1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-27 00:31:51 -04:00
Isaac Bennetch
682a94947f Prepare for 4.8.0-rc1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-03-27 00:06:44 -04:00
Maurício Meneghini Fauth
8b04a2b2a7 Remove redundant else 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-26 13:27:51 -03:00
Piyush Vijay
ad86eab974 Cannot read property sql_query of undefined: #14104 issue fix (#14105) 
Fix #14101
Fix #14104

* Cannot read property sql_query of undefined: #14104 issue fix
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

* Cannot read property sql_query of undefined: #14104 issue fix
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>
 2018-03-26 13:25:33 -03:00
Maurício Meneghini Fauth
d98658187a Replace PhpMyAdmin\Relation static calls 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-25 19:32:13 -03:00
Maurício Meneghini Fauth
e4c897f400 Move changelog entries #14060 and #14096 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-03-23 03:03:13 -03:00
Weblate
cd03e646b8 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2018-03-23 06:58:33 +01:00
Marino
861486754e Translated using Weblate (Croatian) 
Currently translated at 27.7% (890 of 3208 strings)

[CI skip]
 2018-03-23 06:58:26 +01:00
Maurício Meneghini Fauth
6fc885c964
Merge pull request #14108 from ibennetch/ie_compatibility 
Fixes JavaScript error when editing rows with Internet Explorer
 2018-03-23 02:58:05 -03:00
Domen
c7366f0b18 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2018-03-21 19:41:07 +01:00