gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,721 Commits 12 Branches 481 Tags 2.4 GiB
493ece49ee
Commit Graph

105721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
493ece49ee Merge branch 'QA_4_6' into QA_4_6-security 2016-08-02 08:45:16 +02:00
Michal Čihař
77d5a1e07c Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-08-02 08:43:51 +02:00
Michal Čihař
38b73180fd Fix password change in cookie auth 
We can not set same cookie twice, so we have to avoid sending auth
cookie when we're about to change the password.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-02 08:42:44 +02:00
Burak Yavuz
aaf48b98fb Translated using Weblate (Turkish) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2016-08-02 08:34:31 +02:00
Marco Pozzato
0de543c3af Translated using Weblate (Italian) 
Currently translated at 99.9% (3208 of 3209 strings)

[CI skip]
 2016-08-02 08:34:30 +02:00
Michal Čihař
ef9bd20e7a Merge branch 'QA_4_6' into QA_4_6-security 2016-08-02 08:33:39 +02:00
Michal Čihař
cdcf74ab0b Fixed password change on MariaDB without auth plugin 
Fixes #12424

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-02 08:32:59 +02:00
Domen
319c7a8247 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2016-08-01 16:07:40 +02:00
Giovanni Sora
25c4ab1abe Translated using Weblate (Interlingua) 
Currently translated at 73.6% (2367 of 3214 strings)

[CI skip]
 2016-08-01 16:07:38 +02:00
Isaac Bennetch
8d413e7dde Minor grammar improvements 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-08-01 07:10:52 -04:00
Michal Čihař
d621855169 Merge branch 'QA_4_6' into QA_4_6-security 2016-08-01 11:06:57 +02:00
Michal Čihař
aecf9de8fa Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-01 11:04:28 +02:00
Deven Bansod
2ee0e4ed0e ChangeLog entries for #12425 and #12399 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-01 11:45:00 +05:30
Deven Bansod
2c5541a94b Fix #12399: Adding index to table shows wrong top navigation 
If the SQL query analyzing sets the $table value to '',
don't update the original value

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-01 11:41:44 +05:30
Deven Bansod
9ee479b25a Merge branch 'QA_4_6' of http://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-08-01 09:43:36 +05:30
Deven Bansod
9f1f055177 Fix #12425 : Removed double usage of same var name; Fix typo introduced in 545db4a4 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-01 09:42:56 +05:30
서준원
ed284f06a8 Translated using Weblate (Korean) 
Currently translated at 78.2% (2511 of 3209 strings)

[CI skip]
 2016-08-01 00:45:12 +02:00
Sevdimali İsa
17a26ab55f Translated using Weblate (Azerbaijani) 
Currently translated at 52.5% (1685 of 3209 strings)

[CI skip]
 2016-07-31 21:44:15 +02:00
Juha Remes
bebca1139f Translated using Weblate (Finnish) 
Currently translated at 68.8% (2209 of 3209 strings)

[CI skip]
 2016-07-31 15:44:42 +02:00
Michal Čihař
1f595e37e0 Move hostname sanitization to correct place 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 14:09:37 +02:00
Michal Čihař
1221b5ea4a Merge branch 'QA_4_6' into QA_4_6-security 2016-07-29 14:05:48 +02:00
Weblate
7d57024d95 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-07-29 14:05:14 +02:00
Juha
62ad40ef04 Translated using Weblate (Finnish) 
Currently translated at 67.7% (2173 of 3209 strings)

[CI skip]
 2016-07-29 14:05:12 +02:00
Michal Čihař
b27020f108 Avoid typecasting to float when not needed 
Fixes #12303

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 14:03:13 +02:00
Michal Čihař
de1e473a9d Changelog entry for issue #12416 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 10:47:15 +02:00
Michal Čihař
74016bceea Merge pull request #12416 from rpv-tomsk/fix-replication-status 
Fix replication status output in Server > Databases
 2016-07-29 10:46:11 +02:00
Michal Čihař
489970f218 Fixed deleting users in non English locales 
Fixes #12413

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 10:44:58 +02:00
Michal Čihař
c63b11d2bb Fixed rendering of Original theme 
Fixes #12414

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 10:42:06 +02:00
Pavel Rochnyack
b705dc5f67 Fix replication status output in Server > Databases 
Broken by 829a84b46e refactoring.
Incorrectly fixed in c4710c3e1d

Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
 2016-07-29 04:43:08 +01:00
Michal Čihař
76f94e4228 Add changelog entry for issue #12409 
Re-enable overhead on server databases view

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 11:06:26 +02:00
Michal Čihař
263318850c Merge pull request #12409 from rpv-tomsk/restore-overhead-column 
Restore Overhead column in Server > Databases > Enable Statistics.
 2016-07-28 11:05:47 +02:00
Michal Čihař
8dcaae5f83 Do not try to wrap output in case response handling is disabled 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 10:50:35 +02:00
Michal Čihař
1eefa08bb0 Add login and token validation to version_check 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 10:46:38 +02:00
Michal Čihař
4caa90a832 Escape string when showing confirmation message 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 10:30:49 +02:00
Michal Čihař
d31ff5a1e7 Merge branch 'QA_4_6' into QA_4_6-security 2016-07-28 09:43:26 +02:00
Michal Čihař
298f19b3be Use https links in docs where available 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 09:30:29 +02:00
Michal Čihař
257e65ba9f Use https for outbound links where applicable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 09:19:13 +02:00
Michal Čihař
4072c1d29a Use example.com for sample test urls 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 09:12:01 +02:00
Michal Čihař
43a199bdca Use single quotes for filename 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 08:15:04 +02:00
Pavel Rochnyack
c310304712 Restore Overhead column in Server > Databases > Enable Statistics. 
(Was removed in 582b02262b)

Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
 2016-07-27 19:56:43 +01:00
Michal Čihař
3c4226cb8c Add documentation for user groups 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-27 17:26:29 +02:00
Michal Čihař
07d75e1b00 Clarify documentation on AllowUserDropDatabase 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-27 17:09:46 +02:00
Michal Čihař
51b676c8e0 Merge branch 'QA_4_6' into QA_4_6-security 2016-07-27 17:01:32 +02:00
Michal Čihař
2f4fec52d6 Document setup of *Dirs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-27 17:01:02 +02:00
Michal Čihař
471c3377c1 Merge branch 'QA_4_6' into QA_4_6-security 2016-07-27 16:31:43 +02:00
Weblate
6cff8cada5 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-07-27 16:31:12 +02:00
jorge jansen abreu
23b6499dc8 Translated using Weblate (Spanish) 
Currently translated at 99.7% (3202 of 3209 strings)

[CI skip]
 2016-07-27 16:31:11 +02:00
Michal Čihař
af337d2054 Use https to access phpmyadmin.net 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-27 16:29:08 +02:00
Michal Čihař
870ca1cc7a Use https for wiki links 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-27 16:28:07 +02:00
Michal Čihař
774f0c1fef Merge branch 'QA_4_6' into QA_4_6-security 2016-07-27 16:26:57 +02:00