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

110717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Anant Jain
28143053df Do not hardcode width of button elements 
Fixes #13512, #13590

Signed-off-by: Anant Jain <anantjain60@gmail.com>
 2017-08-21 10:55:21 +02:00
Maurício Meneghini Fauth
77c7fda07b Merge pull request #13598 from mauriciofauth/operations 
Refactor operations functions to static methods
 2017-08-20 21:52:44 -03:00
Maurício Meneghini Fauth
0d11ecc728 Refactor operations functions to static methods 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-08-20 21:28:36 -03:00
Deven Bansod
94d8d897ce Clear input fields to avoid duplicate texts 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-08-20 13:49:37 +05:30
Deven Bansod
a5d6c06812 Fix another possible failure point in DbEvents - testAddEvent 
See: https://travis-ci.org/phpmyadmin/phpmyadmin/jobs/266409700 for example

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-08-20 13:01:17 +05:30
Neha Parihar Sinha
7c8e33b657 Fix #13593 : removed whitespace in textarea for column default value 
Signed-off-by: Neha Parihar Sinha <nehalko3087@gmail.com>
 2017-08-20 08:16:33 +02:00
Kyeong Su Shin
a459e35e43 Translated using Weblate (Korean) 
Currently translated at 81.9% (2625 of 3205 strings)

[CI skip]
 2017-08-20 03:46:50 +02:00
Weblate
0932f254d1 Merge remote-tracking branch 'origin/master' 2017-08-20 03:31:12 +02:00
Kyeong Su Shin
7d709d92c5 Translated using Weblate (Korean) 
Currently translated at 81.0% (2619 of 3231 strings)

[CI skip]
 2017-08-20 03:31:09 +02:00
Maurício Meneghini Fauth
91f1fdc09b Merge pull request #13596 from mauriciofauth/insert-edit 
Refactor insert_edit functions to static methods
 2017-08-19 22:30:47 -03:00
Maurício Meneghini Fauth
8a2dd938ef Refactor insert_edit functions to static methods 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-08-19 20:55:52 -03:00
Володимир Бриняк
0e00c43379 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3231 of 3231 strings)

[CI skip]
 2017-08-18 20:56:01 +02:00
Володимир Бриняк
e390c1fa33 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-08-18 20:42:34 +02:00
Deven Bansod
26d80bd975 Fix DbEvents test 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-08-18 16:31:27 +05:30
Deven Bansod
7021aac7ce Try using dynamic wait in TableBrowse and TableStructure 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-08-18 16:31:20 +05:30
Deven Bansod
ea6f79bf21 Fix createRemoveUser and TableBrowse::DeleteRecords 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-08-17 17:29:26 +05:30
Weblate
265bdcde5c Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-08-16 17:15:06 +02:00
Jamaro Ja Ma Ro
b5a386f3f1 Translated using Weblate (Spanish) 
Currently translated at 99.9% (3204 of 3205 strings)

[CI skip]
 2017-08-16 17:15:04 +02:00
Michal Čihař
b146b9195c Merge branch 'QA_4_7' 2017-08-16 17:14:34 +02:00
Michal Čihař
402ebadb19 Improved error handling on corrupted tables 
Better handle situation where MySQL is unable to give us description of
a column. This usually happens when the table is corrupted in some way,
but still we should be able to recover from the error and not to fail
with dozen of undefined variables.

Fixes #13553

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-16 17:10:38 +02:00
Michal Čihař
aa98a4b10c Simplify code to show element 
Issue #13568

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-16 16:40:15 +02:00
Michal Čihař
07a36c94a9 Add missing hide class to setup CSS 
Fixes #13568

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-16 16:39:43 +02:00