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

106622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deven Bansod
e285b95c42 Merge branch 'QA_4_6' 2016-08-03 10:13:17 +05:30
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ř
957e2d0b11 Merge branch 'QA_4_6' 2016-08-02 15:14:54 +02:00
Michal Čihař
5331315c22 Merge remote-tracking branch 'origin/QA_4_6' 2016-08-02 15:14:48 +02:00
Stefano Martinelli
ef55abd661 Translated using Weblate (Italian) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-08-02 15:13:56 +02:00
Giovanni Sora
ad1919fb50 Translated using Weblate (Interlingua) 
Currently translated at 73.6% (2370 of 3217 strings)

[CI skip]
 2016-08-02 15:13:55 +02:00
Kristjan Räts
79768b7c32 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-08-02 15:13:54 +02:00
dingo thirteen
6976123e55 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-08-02 15:13:54 +02:00
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
1d25a84920 Translated using Weblate (Italian) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-08-02 10:24:45 +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ř
1de346b3fe Store composer.lock in Git for releases 
Once release is created, commit composer.lock to releasing branch, so
that we know what has been shipped there.

Fixes #12408

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-02 09:23:40 +02:00
Michal Čihař
2995dc5b23 Merge branch 'QA_4_6' 2016-08-02 09:15:31 +02:00
Michal Čihař
6bfde0908d Merge pull request #12417 from Newman101/patch-1 
credits.rst - Finnish language (missing surname)
 2016-08-02 09:02:54 +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ř
21a9bbea9f Merge branch 'QA_4_6' 2016-08-02 08:57:17 +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ř
0c94e568bb Merge branch 'QA_4_6' 2016-08-02 08:54:00 +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ř
f67d0e918e Merge branch 'QA_4_6' 2016-08-02 08:45:07 +02:00
Michal Čihař
245f85f6c5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-08-02 08:44:58 +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
Burak Yavuz
2ef39d4d0d Translated using Weblate (Turkish) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-08-02 08:43:32 +02:00
Belkacem Mohammed
73460225af Translated using Weblate (Kabyle) 
Currently translated at 0.0% (2 of 3217 strings)

[CI skip]
 2016-08-02 08:43:31 +02:00
Marco Pozzato
b8e8859c9d Translated using Weblate (Italian) 
Currently translated at 99.5% (3204 of 3217 strings)

[CI skip]
 2016-08-02 08:43:31 +02:00
Michal Čihař
696eeb463d Merge branch 'QA_4_6' 2016-08-02 08:43:22 +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
Michal Čihař
afcec9d9d7 Merge branch 'QA_4_6' 2016-08-02 08:34:42 +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ř
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
Burak Yavuz
7954c40c76 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-08-01 17:58:37 +02:00
Michal Čihař
ea91f38e09 Translated using Weblate (Kabyle) 
Currently translated at 0.0% (1 of 3217 strings)

[CI skip]
 2016-08-01 16:21:24 +02:00
Michal Čihař
aeb0cbabd6 Merge branch 'QA_4_6' 2016-08-01 16:08:05 +02:00
Michal Čihař
380dcad2d4 Merge commit '8d413e7ddea4d48df5fa8240c420d19ce47e56f3' 2016-08-01 16:07:58 +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
Michal Čihař
8b26bc1f65 Start Kabylian translation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-01 16:07:16 +02:00
Burak Yavuz
3172b801ec Translated using Weblate (Turkish) 
Currently translated at 99.8% (3211 of 3217 strings)

[CI skip]
 2016-08-01 16:06:59 +02:00
Domen
f2550a5844 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-08-01 16:06:58 +02:00
Giovanni Sora
886ef5d573 Translated using Weblate (Interlingua) 
Currently translated at 73.5% (2365 of 3217 strings)

[CI skip]
 2016-08-01 16:06:57 +02:00
dingo thirteen
207c63e432 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-08-01 15:30:53 +02:00
Domen
84490893cc Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-08-01 14:55:24 +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