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

110530 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
ffeb796a3a Merge remote-tracking branch 'origin/master' 2017-08-02 08:20:11 +02:00
Hidev Corp
3e6b327dfe Translated using Weblate (Punjabi) 
Currently translated at 3.0% (97 of 3213 strings)

[CI skip]
 2017-08-02 08:20:09 +02:00
Maurício Meneghini Fauth
682835b5b0 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.9% (3212 of 3213 strings)

[CI skip]
 2017-08-02 08:20:08 +02:00
Michal Čihař
5e9bb1b584 Merge branch 'QA_4_7' 2017-08-02 08:19:45 +02:00
Michal Čihař
ef891b2bba Simplify code for copying to clipboard 
Honestly I don't understand the old code, but it breaks on fields with
applied transformations, while using simply text() works fine.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-02 08:18:37 +02:00
Michal Čihař
626c2b3a29 Remove not needed variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-02 08:14:12 +02:00
Michal Čihař
12f54fd0cf Fixed copy results to clipboard 
Copy only results table, not all tables on the page.

Fixes #13550

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-02 08:12:41 +02:00
Michal Čihař
33dd51eaf7 Move SQL copy handler to sql.js 
Issue #13550

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-02 08:11:32 +02:00
Michal Čihař
23866a5875 Simplify code by removing not needed variable 
Issue #13550

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-02 08:07:36 +02:00
Michal Čihař
9404287ac0 Show MySQL warnings when executing SQL queries 
Fixes #13408

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 16:29:44 +02:00
Michal Čihař
c90bbfcb37 Remove Yes/No buttons from confirmation legend 
It feels strange to show the buttons twice and I think footer
is better location.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 16:25:20 +02:00
Michal Čihař
b05cc76826 Add test for output transformations 
Test full chain to ensure transformations actually work.

See #13522 and #13478.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 15:24:47 +02:00
Michal Čihař
edc98c7754 Fix condition for getting MIME information 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 15:24:47 +02:00
Michal Čihař
61028c408a Fixed filename calculation 
The folder name is now uppercase.

Fixes #13522

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 15:24:46 +02:00
Michal Čihař
d47a41612c Add another test 
See #13522

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 15:24:46 +02:00
Michal Čihař
1848826532 Add another test 
See #13522

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 14:32:00 +02:00
Maurício Meneghini Fauth
0e47bd11e0 Merge pull request #13534 from mauriciofauth/session 
Add Session class
 2017-08-01 09:16:57 -03:00
Michal Čihař
04b324064a Avoid using runkit7 for now 
Issue #13521

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 13:49:51 +02:00
Michal Čihař
65b44acf9d Merge branch 'runkit' 2017-08-01 13:48:45 +02:00
Michal Čihař
3c7362c739 Stricten typechecking of parameters 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 13:46:00 +02:00
Michal Čihař
46e82fef4f Optimize zip creation a bit 
Avoid constructing temporary strings and concatenating them, create each
record at once.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 13:26:33 +02:00
Michal Čihař
c67e83a57c Fixed creating zip file with single entry 
And add tests to cover that.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 13:26:26 +02:00
Michal Čihař
1c166aef3a Fix creating single file zip 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 13:05:06 +02:00
Michal Čihař
b3cd03d4f9 Fix handling of string parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 09:37:56 +02:00
Michal Čihař
90cc1636c0 Add missing mock 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 09:36:50 +02:00
Michal Čihař
d1a4664a20 Use runkit7 while testing PHP 7 on Travis 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 09:16:15 +02:00
Michal Čihař
4a83171c30 Merge branch 'QA_4_7' 2017-08-01 09:09:19 +02:00
Michal Čihař
0348c8b36d Merge remote-tracking branch 'origin/QA_4_7' 2017-08-01 09:08:31 +02:00
Michal Čihař
70e9349936 Changelog entry for #13414 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 09:02:25 +02:00
Michal Čihař
738b35b4ec Avoid runkit installation on PHP 7.2 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 08:54:42 +02:00
Michal Čihař
73181a26c1 Do not manipulate with session settings when running tests 
Those can't be executed on PHP 7.2 after headers have been sent.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 08:54:42 +02:00
Michal Čihař
76e0e6dbc8 Implement Countable interface in OptionsPropertyGroup 
This is really needed in OptionsPropertyRootGroup, but makes sense here
as well.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 08:54:42 +02:00
Michal Čihař
b188c18fb0 Fix mocked return value 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 08:50:26 +02:00
Michal Čihař
fc2ac9f4c6 Hide differences in PHP 7.2 error reporting 
It adds (this will throw an Error in a future version of PHP)
to undefined constant error.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 08:50:26 +02:00
Michal Čihař
456ec18cb1 Add missing mock 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 08:50:26 +02:00
Michal Čihař
53613a402c Add missing mock 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 08:50:26 +02:00
Michal Čihař
f96886a445 Fix check for null 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 08:50:26 +02:00
Michal Čihař
e85fc1cdff Fix mocked value 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 08:50:26 +02:00
Michal Čihař
4b037582d9 Avoid counting null (default) value 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 08:50:26 +02:00
Michal Čihař
aea00fb90f Add PHP 7.2 to test matrix 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-08-01 08:50:26 +02:00
Maurício Meneghini Fauth
bed21bc30c Move session.*.php to Session class 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-07-31 20:43:22 -03:00
Weblate
31797657c4 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-07-31 16:36:30 +02:00
Lalu-Ahirwar
76fcbebcc6 Translated using Weblate (Hindi) 
Currently translated at 37.3% (1198 of 3205 strings)

[CI skip]
 2017-07-31 16:36:28 +02:00
Michal Čihař
c146127b73 Merge branch 'QA_4_7' 2017-07-31 16:36:09 +02:00
Michal Čihař
4f1ff6df85 Merge remote-tracking branch 'origin/QA_4_7' 2017-07-31 16:36:07 +02:00
Michal Čihař
f2433304b6 Missing newline in ALTER exports 
Fixes #13523

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-31 16:35:34 +02:00
Michal Čihař
33a545d4b4 Use case insentive comparison 
See #13531 and #13425

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-31 16:16:26 +02:00
Victor Gomez
601ed5db6e Alphabetic sorting of Export dropdown (#13531) 
Made the Export dropdown menu alphabetically sorted, related to this issue https://github.com/phpmyadmin/phpmyadmin/issues/13425

Signed-off-by: Victor Gomez <victor.gomez.spain@gmail.com>
 2017-07-31 15:28:22 +02:00
Michal Čihař
be2d9b7952 Merge pull request #13526 from devenbansod/fix_import_selenium 
Fix Import-related selenium tests
 2017-07-31 15:26:58 +02:00
Weblate
743adb8839 Merge remote-tracking branch 'origin/master' 2017-07-31 15:22:37 +02:00