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

106463 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
cbcf740adb Merge branch 'QA_4_6' into QA_4_6-security 2017-01-07 11:00:58 +01:00
Michal Čihař
fee3923f48 Update SQL parser to 3.4.16 
* Coding style fixes.
* Properly handle operators AND, NOT, OR, XOR, DIV, MOD

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-06 12:43:14 +01:00
Michal Čihař
681e908991 Fix check for user groups freatures being enabled 
Fixes #12868

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-06 09:56:15 +01:00
Michal Čihař
8efea217ff Use same query for display and execution when dropping index 
Fixes #12872

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-06 09:45:42 +01:00
Flavius Nopcea
03cc225303 Translated using Weblate (Romanian) 
Currently translated at 53.7% (1732 of 3222 strings)

[CI skip]
 2017-01-06 09:43:38 +01:00
Mateusz Wasik
737cfafb92 Translated using Weblate (Polish) 
Currently translated at 82.8% (2669 of 3222 strings)

[CI skip]
 2017-01-06 09:43:38 +01:00
Weblate
5c7f0cc7ac Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2017-01-04 16:19:23 +01:00
Flavius Nopcea
ae34ebc929 Translated using Weblate (Romanian) 
Currently translated at 53.6% (1729 of 3222 strings)

[CI skip]
 2017-01-04 16:19:22 +01:00
Daniel Palmeira Huanca
48d584794d Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 94.5% (3048 of 3222 strings)

[CI skip]
 2017-01-04 16:19:22 +01:00
Dadan Setia
3a4ed9ac45 Translated using Weblate (Indonesian) 
Currently translated at 69.6% (2245 of 3222 strings)

[CI skip]
 2017-01-04 16:19:21 +01:00
Isaac Bennetch
16fba839bb Changed the SQL window suggestion tool to have DELETE...WHERE 0 instead of 1. 
This should help avoid accidental data loss.

Issue #12859

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-04 16:18:16 +01:00
Vinicius Veroneze
9b7f4f74e9 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.3% (3008 of 3222 strings)

[CI skip]
 2017-01-03 16:54:10 +01:00
Michal Čihař
0376e599f0 Merge pull request #12853 from ibennetch/commatypo 
Fix incorrect comma in message string
 2017-01-02 17:05:58 +01:00
Michal Čihař
5f36fa56c4 Merge remote-tracking branch 'origin/MAINT_4_6_5' into QA_4_6 2017-01-02 16:15:29 +01:00
Michal Čihař
d018add94b Set MySQL SSL parameters even if key is not set 
User might want to set any of the SSL parameters without needing to set
the key.

Fixes #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-02 16:06:09 +01:00
Rodrigo Felix
6a0d330718 Translated using Weblate (Portuguese) 
Currently translated at 53.6% (1728 of 3222 strings)

[CI skip]
 2016-12-31 21:46:10 +01:00
Marek Skiba
6316a71595 Translated using Weblate (Polish) 
Currently translated at 81.8% (2638 of 3222 strings)

[CI skip]
 2016-12-31 12:45:50 +01:00
Fujiwara Software
ef1473a081 Translated using Weblate (Japanese) 
Currently translated at 71.9% (2319 of 3222 strings)

[CI skip]
 2016-12-29 18:45:55 +01:00
Marc Delisle
ead6de8a2a Translated using Weblate (French) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-29 18:45:04 +01:00
Elias Kosunen
b923c07c1a Translated using Weblate (Finnish) 
Currently translated at 69.1% (2228 of 3222 strings)

[CI skip]
 2016-12-29 00:44:51 +01:00
SD SkyKlouD
a1e46e37b4 Translated using Weblate (Korean) 
Currently translated at 80.6% (2600 of 3222 strings)

[CI skip]
 2016-12-28 00:46:11 +01:00
Fujiwara Software
b8c26b74ac Translated using Weblate (Japanese) 
Currently translated at 71.7% (2311 of 3222 strings)

[CI skip]
 2016-12-27 15:45:54 +01:00
Lari Oesch
60061f82ab Translated using Weblate (Finnish) 
Currently translated at 69.1% (2228 of 3222 strings)

[CI skip]
 2016-12-27 00:41:03 +01:00
Elias Kosunen
bdb339d254 Translated using Weblate (Finnish) 
Currently translated at 69.1% (2228 of 3222 strings)

[CI skip]
 2016-12-27 00:40:42 +01:00
Lari Oesch
41a7bad38d Translated using Weblate (Finnish) 
Currently translated at 69.1% (2228 of 3222 strings)

[CI skip]
 2016-12-27 00:39:38 +01:00
Kristjan Räts
95c1ea129f Translated using Weblate (Estonian) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-26 11:22:00 +01:00
ctyzxx
c8c317672d Translated using Weblate (Chinese (China)) 
Currently translated at 87.5% (2820 of 3222 strings)

[CI skip]
 2016-12-26 09:44:23 +01:00
Marco Filipe Ferreira Fidalgo
b4dbefc2ff Translated using Weblate (Portuguese) 
Currently translated at 53.5% (1726 of 3222 strings)

[CI skip]
 2016-12-24 18:45:53 +01:00
Michal Čihař
bba609050e Translated using Weblate (Romanian) 
Currently translated at 53.6% (1729 of 3222 strings)

[CI skip]
 2016-12-22 15:58:42 +01:00
Weblate
401a18464e Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-12-22 15:15:55 +01:00
Oasisone Doe
671d82f8cc Translated using Weblate (Romanian) 
Currently translated at 53.6% (1729 of 3222 strings)

[CI skip]
 2016-12-22 15:15:55 +01:00
Daniel Miloca
066b71535f Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.0% (2999 of 3222 strings)

[CI skip]
 2016-12-22 15:15:55 +01:00
Giovanni Sora
9ebdb20eb5 Translated using Weblate (Interlingua) 
Currently translated at 75.5% (2434 of 3222 strings)

[CI skip]
 2016-12-22 15:15:54 +01:00
Michal Čihař
1fb040a1df Fixed editing of virtual columns 
Fixes #12847

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-22 15:15:20 +01:00
Isaac Bennetch
63eaa362e9 Fix incorrect comma in message string 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-12-21 19:02:28 -05:00
Daniel Miloca
a5f9c0273b Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.0% (2997 of 3222 strings)

[CI skip]
 2016-12-21 17:06:16 +01:00
Michal Čihař
a950a5952b Translated using Weblate (German) 
Currently translated at 99.5% (3206 of 3222 strings)

[CI skip]
 2016-12-21 17:06:15 +01:00
dingo thirteen
2e8c8af9b8 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-21 17:06:14 +01:00
Michal Čihař
19ff794893 Translated using Weblate (Czech) 
Currently translated at 93.8% (3024 of 3222 strings)

[CI skip]
 2016-12-21 17:06:14 +01:00
Rogerio Marques
8973db0651 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.9% (2995 of 3222 strings)

[CI skip]
 2016-12-21 17:00:58 +01:00
Michal Čihař
f792f294f2 Disable setup if configuration already exists 
The setup allows to figure out quite a lot about system and network, so
it's safer to block access to it once phpMyAdmin has been configured.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 11:36:32 +01:00
Michal Čihař
c962ee4287 Remove setup download/load/delete features 
This removes risk of third party manipulating with the configuration as
there was race condition between editing and using the file.

Downloading the file should not be big hassle and this really makes the
whole setup a bit simpler.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 11:34:42 +01:00
Michal Čihař
695a488c42 Do not allow arbitrary connection in replication setup without AllowArbitraryServer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 11:10:32 +01:00
Michal Čihař
e1d9e31dff Merge branch 'QA_4_6' into QA_4_6-security 2016-12-21 11:10:25 +01:00
Michal Čihař
6f01864e89 Fixed moving of columns with whitespace in name 
Fixes #12841

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-21 10:45:52 +01:00
Michal Čihař
c8a15f2212 Merge remote-tracking branch 'origin/pull/12815' into QA_4_6 2016-12-20 16:44:44 +01:00
Michal Čihař
09da5eb49f Test both with and without phpseclib 
This ensures we generate compatible data in both cases.

Issue #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-20 14:40:31 +01:00
Michal Čihař
30cd5fc358 Use same encryption key with openssl and phpseclib 
Issue #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-20 14:38:34 +01:00
Michal Čihař
03bc52f6dc Correctly report OpenSSL errors from cookie encryption 
Without calling openssl_error_string() we pollute openssl global state
and some other library might report this as failure (eg. mysqlnd driver
when connecting to SSL enabled server).

Fixes #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-20 14:38:03 +01:00
Michal Čihař
b866371b9a Determine whether to use openssl just once 
Issue #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-20 14:30:51 +01:00