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

105743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
2ec1f50d45 Merge branch 'QA_4_6' into QA_4_6-security 2016-08-03 10:03:05 +02:00
Michal Čihař
5385099b40 Changelog for issue #12423 
Fixed replication status in database listing

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-03 10:01:44 +02:00
Michal Čihař
f6d1c90188 Merge pull request #12423 from rpv-tomsk/fix-replication-status 
Fix replication status output in database tables list.
 2016-08-03 10:01:03 +02:00
Weblate
1816bb0d2c Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-08-03 06:42:43 +02:00
Masahiro Nishi
7b17fe8cef Translated using Weblate (Japanese) 
Currently translated at 70.3% (2259 of 3213 strings)

[CI skip]
 2016-08-03 06:42:42 +02:00
Deven Bansod
88a1c7e1fa Merge branch 'QA_4_6' of http://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-08-03 10:12:11 +05:30
Deven Bansod
369c53aee3 Fix Label's 'for' attribute for Auto-incr in Copy Mutliple tables 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-03 10:10:50 +05:30
Michal Čihař
bb9317d192 Do not try to load old transformation plugins 
Fixes #12395

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-02 15:13:07 +02:00
dingo thirteen
ae2f9d125c Translated using Weblate (Dutch) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-08-02 15:12:56 +02:00
Kristjan Räts
8eb46799ca Translated using Weblate (Estonian) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-08-02 15:01:43 +02:00
dingo thirteen
34d028a3d5 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-08-02 12:27:59 +02:00
Stefano Martinelli
a897d5c710 Translated using Weblate (Italian) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-08-02 10:17:05 +02:00
Michal Čihař
e7d4ef2fbc Merge branch 'QA_4_6' into QA_4_6-security 2016-08-02 09:16:03 +02:00
Michal Čihař
07a4316bf5 Merge remote-tracking branch 'origin/pull/12420' into QA_4_6 2016-08-02 09:00:20 +02:00
Michal Čihař
f9563d6fcc Merge pull request #12421 from rpv-tomsk/fix-ru-translation 
Translation improvements
 2016-08-02 08:58:40 +02:00
Michal Čihař
1af9db6baf Changelog for issue #12422 - Improvements to the original theme 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-02 08:57:02 +02:00
Michal Čihař
aa427068ec Merge pull request #12422 from rpv-tomsk/fix-notices-original-theme 
Improved indents, alignment and rtl in Original theme
 2016-08-02 08:56:21 +02:00
Michal Čihař
ae79ceb3a4 Do not error on unset server port 
Fixes #12339

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-02 08:53:06 +02:00
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
Pavel Rochnyack
eae10b89f9 Fix advisory rule 'Slow launch time' 
Issue string: 'Slow_launch_thread' changed to 'Slow_launch_time' to match variable checked.

Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
 2016-08-01 12:27:53 +01:00
Pavel Rochnyack
d48b88284b Translation improvements 
* Improved Russian translation
* Translated 'Go' button in edit_routine_privileges.phtml
* Removed whitespace from end of "Table comments: " phrase.
* Removed \n and whitespaces from phrase in libraries/config/messages.inc.php:813.
* Unified form of changed phrases in translation files.

Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
 2016-08-01 12:22:33 +01: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
Pavel Rochnyack
9d3da1b408 Fix replication status output in database tables list. 
Issue is second part to #12416

Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
 2016-08-01 03:37:20 +01:00
Pavel Rochnyack
37c2886845 Improved indents, alignment and rtl in Original theme 
* Fixed list items aligment in rtl view
* Fixed notices icon alignment in rtl and ltr views
* Fixed Footer.php getErrorMessages() to avoid <div id="pma_errors"><div id="pma_errors">....</div></div> nested blocks.
* Removed indentation by &nbsp;

Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
 2016-08-01 03:08:48 +01:00
서준원
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