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

110740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isaac Bennetch
1e36be831e Merge pull request #13342 from Achilles-96/Multi-Table-Query-UI 
Replace "Query By Example" with new "Multi Table Query" interface
 2017-08-23 12:23:59 -04:00
Deven Bansod
32c19d9710 Add sleep to allow the tables to resize and prevent possible errors 
The elements are not properly aligned and hence the click does not go through

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-08-23 16:12:33 +05:30
Michal Čihař
f7fcecb84c Add missing spacing around . 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-23 15:44:39 +02:00
Michal Čihař
8621b70c88 Various coding style fixes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-23 15:43:54 +02:00
Michal Čihař
47e5f6894e Merge branch 'QA_4_7' 2017-08-23 14:44:57 +02:00
Michal Čihař
f7404bce02 Do not use AJAX POST for forms that would normally use GET 
Fixes #13606

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-23 14:44:26 +02:00
Maurício Meneghini Fauth
360685525d Merge pull request #13608 from mauriciofauth/relation 
Refactor relation functions to static methods
 2017-08-23 09:09:03 -03:00
Michal Čihař
4c0da210ee Merge branch 'QA_4_7' 2017-08-23 13:39:07 +02:00
Michal Čihař
049c82e6d4 Merge remote-tracking branch 'origin/QA_4_7' 2017-08-23 13:39:04 +02:00
Michal Čihař
5a1851488a Remove outdated docs link 
It probably no longer applies and the server is not working for most of the time.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-23 13:38:27 +02:00
Mochammad Nur Afandi
4ef01e4df0 Translated using Weblate (Indonesian) 
Currently translated at 70.0% (2246 of 3205 strings)

[CI skip]
 2017-08-23 12:46:04 +02:00
Maurício Meneghini Fauth
e2c83b954b Refactor relation functions to static methods 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-08-22 20:51:27 -03:00
Michal Čihař
8256945ec2 Merge pull request #13605 from devenbansod/selenium_minor_refactor 
Minor refactoring in Selenium tests
 2017-08-22 20:57:27 +02:00
Deven Bansod
b72b5ab5f1 Add navigateDatabase method to prevent navigation errors 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-08-22 16:42:37 +05:30
Deven Bansod
11bc4c6252 Replace usleep with sleep calls 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-08-22 16:42:37 +05:30
Deven Bansod
8c32018335 Refactor methods in selenium tests 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-08-22 16:42:37 +05:30
Deven Bansod
36d8d98988 Fix error introduced in f36ed72 (#13602) 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-08-22 15:32:52 +05:30
Michal Čihař
57897752fb Exclude tmp from all checks 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-22 14:11:08 +02:00
Michal Čihař
9b25004890 Use actual value for cache... 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-22 13:11:45 +02:00
Weblate
f7c87dbcf3 Merge remote-tracking branch 'origin/master' 2017-08-22 12:49:59 +02:00
Mochammad Nur Afandi
9e34750476 Translated using Weblate (Indonesian) 
Currently translated at 69.8% (2256 of 3231 strings)

[CI skip]
 2017-08-22 12:49:56 +02:00
Michal Čihař
1b5556070a Excude Twig cache from coverage reports 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-22 12:49:21 +02:00
Michal Čihař
05da7c162c Translated using Weblate (Punjabi) 
Currently translated at 3.8% (124 of 3231 strings)

[CI skip]
 2017-08-22 11:47:11 +02:00
Michal Čihař
47360a4eba Translated using Weblate (Lithuanian) 
Currently translated at 41.0% (1325 of 3231 strings)

[CI skip]
 2017-08-22 11:47:08 +02:00
Mochammad Nur Afandi
e099ef6da9 Translated using Weblate (Indonesian) 
Currently translated at 69.5% (2246 of 3231 strings)

[CI skip]
 2017-08-22 11:47:06 +02:00
Michal Čihař
135dfd8e44 Translated using Weblate (Punjabi) 
Currently translated at 3.8% (124 of 3205 strings)

[CI skip]
 2017-08-22 11:46:53 +02:00
Michal Čihař
84cdde9e9a Translated using Weblate (Lithuanian) 
Currently translated at 41.5% (1331 of 3205 strings)

[CI skip]
 2017-08-22 11:46:51 +02:00
Arachmadi Putra
15459f3370 Translated using Weblate (Indonesian) 
Currently translated at 70.0% (2245 of 3205 strings)

[CI skip]
 2017-08-22 11:46:48 +02:00
Weblate
f2a4e30324 Merge remote-tracking branch 'origin/master' 2017-08-22 09:31:19 +02:00
Arachmadi Putra
e063c5e80b Translated using Weblate (Indonesian) 
Currently translated at 69.4% (2244 of 3231 strings)

[CI skip]
 2017-08-22 09:31:15 +02:00
Michal Čihař
1f02f85b29 Avoid usage of soon deprecated $php_errormsg 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-22 09:30:22 +02:00
Michal Čihař
4bb61e3c53 Run Selenium tests on PHP 7.2 
This should be slightly faster than on 7.0

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-22 09:30:22 +02:00
Maurício Meneghini Fauth
f36ed7237c Merge pull request #13602 from mauriciofauth/tracking 
Refactor tracking functions to static methods
 2017-08-21 14:02:26 -03:00
Maurício Meneghini Fauth
bb0555bb25 Refactor tracking functions to static methods 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-08-21 13:04:36 -03:00
Michal Čihař
f5c2c5419f Merge branch 'QA_4_7' 2017-08-21 12:59:56 +02:00
Michal Čihař
108ea3dd3d Adjust tracker tests to new export code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-21 12:59:38 +02:00
Michal Čihař
0e892f30ab Merge branch 'QA_4_7' 2017-08-21 12:56:31 +02:00
Michal Čihař
d05fb82b98 Increase SQL parser dependency 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-21 12:56:28 +02:00
Michal Čihař
79f0166c16 Merge branch 'QA_4_7' 2017-08-21 12:49:50 +02:00
Michal Čihař
c40a1d1a5d Adjust tests to changed API usage in SQL export 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-21 12:49:43 +02:00
Michal Čihař
02f8195581 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-08-21 11:48:07 +02:00
Michal Čihař
87ec560346 Merge branch 'QA_4_7' 2017-08-21 11:47:34 +02:00
Michal Čihař
3c79eb6cdb Better handle situation where debug_backtrace is disabled 
Fixes #13599

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-21 11:23:55 +02:00
Michal Čihař
76f51a1ffb Use tryQuery instead of query to handle errors 
We really do not want to end up in mysql_die here as we could have sent
some output already.

Fixes #13600

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-21 11:20:42 +02:00
Michal Čihař
dac19fbe7e Merge pull request #13594 from devenbansod/fix_selenium_2 
Fix random selenium failure tests
 2017-08-21 11:01:05 +02:00
Michal Čihař
391d6c87a1 Merge pull request #13597 from nehalko3087/master 
Fix #13593 : removed whitespace in textarea for column default value
 2017-08-21 10:59:36 +02:00
Michal Čihař
4fa47f40b6 Merge branch 'QA_4_7' 2017-08-21 10:57:41 +02:00
Michal Čihař
0f965f0f0e Merge remote-tracking branch 'origin/QA_4_7' 2017-08-21 10:57:29 +02:00
Michal Čihař
86f2ed6a76 Changelog entry for #13512 and #13590 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-21 10:56:19 +02:00
Michal Čihař
ed81a25eb8 Apply #13590 to the original theme as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-21 10:55:30 +02:00