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

110226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
b0393ce823 Merge branch 'QA_4_7' 2017-07-10 15:27:44 +02:00
Michal Čihař
59d0a9fe86 Add sanity checking for max_count 
We use it later for division, so make sure it's good for it.

Fixes #13470

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-10 15:26:47 +02:00
Michal Čihař
dc420e2872 Merge branch 'QA_4_7' 2017-07-10 15:00:36 +02:00
Michal Čihař
f8b5fd1452 Merge remote-tracking branch 'origin/QA_4_7' 2017-07-10 14:59:51 +02:00
Michal Čihař
bd2a0ec307 Wrap file_exists calls with @ 
It can produce warnings in case open_basedir is enabled.

Fixes #13467

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-10 14:59:43 +02:00
Weblate
91d3d0953e Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-07-10 14:35:57 +02:00
test
18c7e718ed Translated using Weblate (Croatian) 
Currently translated at 27.7% (888 of 3203 strings)

[CI skip]
 2017-07-10 14:35:54 +02:00
Michal Čihař
5f21c8dbc6 Merge branch 'QA_4_7' 2017-07-10 14:35:37 +02:00
Michal Čihař
85747b9ae9 Use usort() instead of natsort() 
The natsoft has side effect of producit associated array, what is later
represented as object if encoded to JSON and breaking code expect array
instead.

Fixes #13465

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-10 14:34:12 +02:00
Michal Čihař
7f7af4c646 Merge pull request #13458 from udan11/view_create_tpl 
Refactored view_create to use Twig templates.
 2017-07-10 12:12:56 +03:00
Michal Čihař
7e28cb3d62 Merge pull request #13462 from devenbansod/fix_db_selenium_tests 
Fix Database-related selenium tests
 2017-07-10 11:32:37 +03:00
Michal Čihař
1c2ca25aed Merge pull request #13464 from WeeRox/master 
Refactor ZipExtension and ZipFile to use ZipArchive
 2017-07-10 11:30:05 +03:00
Aron Bergman
dd73e321e3 Refractor ZipExtension to use ZipArchive 
ZipExtension is now using ZipArchive instead of zip_* functions.
Replaced getError with ZipArchive::getStatusString.
The documentation for the file has been refractored.
ZipExtension now includes ZipFile functionality, and thus ZipFile is removed.

See issue #13365

Signed-off-by: Aron Bergman <bathingrad@gmail.com>
 2017-07-10 09:39:37 +02:00
Deven Bansod
b2aaaf7e1a Use different method to make sure click on add users link goes through 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-07-10 12:35:37 +05:30
Deven Bansod
414ac39db9 Fix CreateDropDb, CreateRemoveUser and DB-related selenium tests 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-07-10 10:06:18 +05:30
Dan Ungureanu
32524e09be Removed useless escaping. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2017-07-09 22:11:30 +01:00
Weblate
9d2faf01a3 Merge remote-tracking branch 'origin/master' 2017-07-09 20:47:14 +02:00
test
f3be778624 Translated using Weblate (Croatian) 
Currently translated at 27.4% (883 of 3211 strings)

[CI skip]
 2017-07-09 20:47:09 +02:00
Maurício Meneghini Fauth
491de7ee06 Merge pull request #13463 from mauriciofauth/classes 
Move config classes to PhpMyAdmin namespace
 2017-07-09 15:47:00 -03:00
Maurício Meneghini Fauth
5e7f6a1bab Move config classes to PhpMyAdmin namespace 
- Move ConfigFile to PhpMyAdmin namespace
- Move FormDisplay to PhpMyAdmin namespace
- Move Form to PhpMyAdmin namespace
- Move PageSettings to PhpMyAdmin namespace
- Move ServerConfigChecks to PhpMyAdmin namespace
- Move Validator to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-07-09 15:16:37 -03:00
Dan Ungureanu
1dbc1667ed Refactored view_create to use Twig templates. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2017-07-09 12:23:08 +01:00
Dan Ungureanu
aed46acb81 Added Format button on edit view form. 
Fixes #13448.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2017-07-09 12:11:56 +01:00
Michal Čihař
87e1cd0877 Merge branch 'QA_4_7' 2017-07-09 11:18:59 +02:00
Michal Čihař
36ea981bdd Fix format string 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-09 11:18:55 +02:00
Michal Čihař
32a8fd2448 Merge branch 'QA_4_7' 2017-07-09 11:16:11 +02:00
Michal Čihař
ee1ce07970 Fixed version check when not connected to a database 
Fixes #13437

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-09 11:15:47 +02:00
Michal Čihař
10b04f175a Fix website URL 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-09 11:14:05 +02:00
Michal Čihař
f563880af4 Merge branch 'QA_4_7' 2017-07-09 10:51:26 +02:00
Michal Čihař
d4268d20ac Merge remote-tracking branch 'origin/QA_4_7' 2017-07-09 10:50:37 +02:00
Michal Čihař
a4ec378179 Move spacing around buttons to Util::getMessage 
We really do not want to add spacing around all buttons, just the ones
in the SQL message.

Fixes #13445

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-09 10:50:22 +02:00
Maurício Meneghini Fauth
b2ad33ca47 Merge pull request #13454 from mauriciofauth/classes 
Move classes to PhpMyAdmin namespace
 2017-07-08 11:20:50 -03:00
Maurício Meneghini Fauth
ca910e8de8 Move classes to PhpMyAdmin namespace 
- Move Table to PhpMyAdmin namespace
- Move Template to PhpMyAdmin namespace
- Move ThemeManager to PhpMyAdmin namespace
- Move Theme to PhpMyAdmin namespace
- Move Tracker to PhpMyAdmin namespace
- Move Transformations to PhpMyAdmin namespace
- Move TypesMySQL to PhpMyAdmin namespace
- Move Types to PhpMyAdmin namespace
- Move Util to PhpMyAdmin namespace
- Move VersionInformation to PhpMyAdmin namespace
- Move Url to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-07-08 10:54:21 -03:00
Weblate
6e71574e9c Merge remote-tracking branch 'origin/master' 2017-07-08 12:51:16 +02:00
yagoub fadel
5f02c8f8d3 Translated using Weblate (Arabic) 
Currently translated at 49.3% (1584 of 3211 strings)

[CI skip]
 2017-07-08 12:51:09 +02:00
Madhura Jayaratne
a6e0a69cd0 Merge branch 'QA_4_7' 2017-07-08 20:50:43 +10:00
Weblate
67b0180ba9 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-07-08 12:48:15 +02:00
zhangmiao
57fc8e8cf7 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 85.8% (2751 of 3203 strings)

[CI skip]
 2017-07-08 12:48:12 +02:00
yagoub fadel
b9314f1d80 Translated using Weblate (Arabic) 
Currently translated at 49.3% (1581 of 3203 strings)

[CI skip]
 2017-07-08 12:48:11 +02:00
Madhura Jayaratne
d8f11a84a4 Fix #13447 Large multi-line query removes Export operation and blanks query box options 
This is not a guaranteed method of detecting image upload into a BLOB field

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-07-08 20:47:45 +10:00
Weblate
23882a4516 Merge remote-tracking branch 'origin/master' 2017-07-07 16:54:24 +02:00
Rokar Ali
a51c5db6bf Translated using Weblate (Kurdish) 
Currently translated at 0.5% (19 of 3211 strings)

[CI skip]
 2017-07-07 16:54:22 +02:00
zhangmiao
3375fa631d Translated using Weblate (Chinese (Simplified)) 
Currently translated at 85.4% (2745 of 3211 strings)

[CI skip]
 2017-07-07 16:54:20 +02:00
yagoub fadel
15dcdf90dd Translated using Weblate (Arabic) 
Currently translated at 48.3% (1552 of 3211 strings)

[CI skip]
 2017-07-07 16:54:16 +02:00
Maurício Meneghini Fauth
87a211faa2 Merge pull request #13451 from mauriciofauth/classes 
Move classes to PhpMyAdmin namespace
 2017-07-07 11:54:07 -03:00
Maurício Meneghini Fauth
8f943ae1c0 Move classes to PhpMyAdmin namespace 
- Move Sanitize to PhpMyAdmin namespace
- Move SavedSearches to PhpMyAdmin namespace
- Move Scripts to PhpMyAdmin namespace
- Move ServerStatusData to PhpMyAdmin namespace
- Move Sql to PhpMyAdmin namespace
- Move StorageEngine to PhpMyAdmin namespace
- Move SubPartition to PhpMyAdmin namespace
- Move SysInfoLinux to PhpMyAdmin namespace
- Move SysInfoSunOS to PhpMyAdmin namespace
- Move SysInfoWINNT to PhpMyAdmin namespace
- Move SysInfo to PhpMyAdmin namespace
- Move SystemDatabase to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-07-07 01:46:08 -03:00
Paul Polidoro
0445c3101d Translated using Weblate (Kurdish) 
Currently translated at 0.1% (2 of 3211 strings)

[CI skip]
 2017-07-06 21:33:21 +02:00
Michal Čihař
167d009b04 Translated using Weblate (Kurdish) 
Currently translated at 0.1% (1 of 3211 strings)

[CI skip]
 2017-07-05 20:06:28 +02:00
Michal Čihař
f24c76915c Merge remote-tracking branch 'origin/QA_4_7' 2017-07-05 20:02:39 +02:00
Michal Čihař
a0bb045ec6 Add Kurdish translation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-05 19:59:04 +02:00
Michal Čihař
6b05ca44d6 Translated using Weblate (Arabic) 
Currently translated at 48.3% (1551 of 3211 strings)

[CI skip]
 2017-07-05 08:22:10 +02:00