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

109491 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
f0649ad12f Merge pull request #13202 from Fenn-CS/master 
Fix:Column attribute have a different size #13194
 2017-04-28 16:33:50 +02:00
Michal Čihař
f3a4d67347 Merge pull request #13205 from ibennetch/13201-no-gitattributes 
Remove .gitattributes files when creating release
 2017-04-28 16:32:30 +02:00
Michal Čihař
1b4b736575 Merge pull request #13207 from mauriciofauth/templates 
Port some templates to Twig
 2017-04-28 16:17:17 +02:00
Diego Baños Fariñas
d6d9d2ec84 Drop and Truncate display the database name (#13209) 
Display the database name on drop and truncate confirmaton

Fixes #13140

Signed-off-by: Diego Banos <diegobanosfarinas@gmail.com>
 2017-04-28 16:15:11 +02:00
Michal Čihař
e2d6602ec2 Document how to add Signed-off-by manually 
This is needed especially for users creating commits on GitHub.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-28 16:12:47 +02:00
Gemorroj
6d2bf012d2 Simplify HTML: <input></input> -> <input /> 
Signed-off-by: Gemorroj <wapinet@gmail.com>
 2017-04-28 16:09:20 +02:00
Michal Čihař
d53d541307 Merge branch 'QA_4_7' 2017-04-28 16:02:33 +02:00
Michal Čihař
8d6b1dce57 Improved handling of logout with disabled LoginCookieDeleteAll 
- avoid removing session for cookie auth if LoginCookieDeleteAll is
  disabled
- redirect user to other server rather than to login page
- show message about partial logout
- adjust tests
- this is based on #13221

Fixes #12301

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-28 16:02:11 +02:00
Harro Verton
cde775bd2b Don't destroy the session if logins are still present. fixes #12301 
If you are logged-in into multiple database servers, logOut() logs you
out of all of them. This fix will prevent that, and will only destroy
the session when you log out of the last server.

Signed-off-by: Michal Čihař <michal@cihar.com>
Signed-off-by: Harro Verton <wanwizard@wanwizard.eu>
 2017-04-28 15:27:24 +02:00
Michal Čihař
f9177a1c3d Merge branch 'QA_4_7' 2017-04-28 13:13:43 +02:00
Michal Čihař
33feb1bddf Merge remote-tracking branch 'origin/QA_4_7' 2017-04-28 13:13:40 +02:00
Michal Čihař
6e27bc61ef Merge branch 'QA_4_7' of github.com:phpmyadmin/phpmyadmin into QA_4_7 2017-04-28 13:13:27 +02:00
Michal Čihař
bd526cf065 Add issue #13219 to changelog 
It was reported later than fix, but still worth mentioning.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-28 12:09:20 +02:00
Weblate
1be36688ae Merge remote-tracking branch 'origin/master' 2017-04-28 11:48:26 +02:00
Chien Wei Lin
68e6fbd972 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.7% (3191 of 3198 strings)

[CI skip]
 2017-04-28 11:48:19 +02:00
Viktar Vauchkevich
accdba59c6 Translated using Weblate (Belarusian) 
Currently translated at 24.1% (773 of 3198 strings)

[CI skip]
 2017-04-28 11:48:18 +02:00
Michal Čihař
c6b18f16ce Merge branch 'QA_4_7' 2017-04-28 11:48:00 +02:00
Weblate
fe340a3faf Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-04-28 11:47:56 +02:00
Michal Čihař
7da1ae5043 Merge commit 'd99fe15530c324734e78d280652b2e6bec87aaf3' 2017-04-28 11:47:56 +02:00
Chien Wei Lin
65d6549d68 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-04-28 11:47:50 +02:00
Viktar Vauchkevich
ff3ae274cb Translated using Weblate (Belarusian) 
Currently translated at 24.3% (778 of 3192 strings)

[CI skip]
 2017-04-28 11:47:49 +02:00
Michal Čihař
0f1c011c28 Add token to form generated by Util::linkOrButton 
Fixes #13182

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-28 11:46:59 +02:00
Dadan Setia
d99fe15530 Translated using Weblate (Indonesian) 
Currently translated at 70.4% (2249 of 3192 strings)

[CI skip]
 2017-04-25 03:45:34 +02:00
Dadan Setia
75dfd225b2 Translated using Weblate (Indonesian) 
Currently translated at 70.1% (2244 of 3198 strings)

[CI skip]
 2017-04-25 03:45:28 +02:00
Viktar Vauchkevich
e4fe584d43 Translated using Weblate (Belarusian) 
Currently translated at 24.2% (775 of 3192 strings)

[CI skip]
 2017-04-25 00:44:45 +02:00
Viktar Vauchkevich
e28a9063c1 Translated using Weblate (Belarusian) 
Currently translated at 24.0% (770 of 3198 strings)

[CI skip]
 2017-04-25 00:44:26 +02:00
Maurício Meneghini Fauth
9e5a6139b7 Fix unwanted escape on select_lang template 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-04-24 12:59:07 -03:00
Maurício Meneghini Fauth
8cc6f9f908 Port some templates to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-04-23 16:53:19 -03:00
Danilo D. de Godoy
8d61e5d06d Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.7% (2994 of 3192 strings)

[CI skip]
 2017-04-21 21:46:17 +02:00
Danilo D. de Godoy
ffe854a44a Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.4% (2988 of 3198 strings)

[CI skip]
 2017-04-21 21:46:10 +02:00
Maurício Meneghini Fauth
1b9d125d3e Port some templates to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-04-20 00:14:06 -03:00
Isaac Bennetch
7fc01204ab Remove .gitattributes files when creating release. 
Fixes #13201

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-04-18 14:21:24 -04:00
Weblate
ae764905f1 Merge remote-tracking branch 'origin/master' 2017-04-18 18:11:12 +02:00
Володимир Бриняк
f9cde70cff Translated using Weblate (Ukrainian) 
Currently translated at 99.9% (3197 of 3198 strings)

[CI skip]
 2017-04-18 18:11:11 +02:00
Deven Bansod
cf7c622d6e Merge branch 'QA_4_7' 2017-04-18 21:40:16 +05:30
Deven Bansod
6b9f40f516 ChangeLog for b3f6e5cdad 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-04-18 21:36:01 +05:30
Deven Bansod
b3f6e5cdad Fix Refresh of ProcessList 
Issue #13182
Specifically the error mentioned in the comment: https://github.com/phpmyadmin/phpmyadmin/issues/13182#issuecomment-294876981

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-04-18 21:32:34 +05:30
Fenn-CS
34f2a5c703 removed inline style shortening attributes drop down 
Signed-off-by: Fenn-CS <fenn25.fn@gmail.com>
 2017-04-17 22:58:04 +01:00
bhargavi sabbisetty
a40ef5995d Translated using Weblate (Telugu) 
Currently translated at 9.6% (308 of 3192 strings)

[CI skip]
 2017-04-14 18:46:52 +02:00
bhargavi sabbisetty
e51b32afe2 Translated using Weblate (Telugu) 
Currently translated at 9.5% (307 of 3198 strings)

[CI skip]
 2017-04-14 18:46:45 +02:00
Παναγιώτης Παπάζογλου
2a93bdf85a Translated using Weblate (Greek) 
Currently translated at 100.0% (3198 of 3198 strings)

[CI skip]
 2017-04-13 11:16:39 +02:00
dingo thirteen
dc1808253f Translated using Weblate (Dutch) 
Currently translated at 100.0% (3198 of 3198 strings)

[CI skip]
 2017-04-12 14:04:06 +02:00
Burak Yavuz
39fc41d15c Translated using Weblate (Turkish) 
Currently translated at 100.0% (3198 of 3198 strings)

[CI skip]
 2017-04-12 09:45:10 +02:00
Michal Čihař
780bf9653e Remove empty value attributes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-12 09:25:22 +02:00
Michal Čihař
dbdd7bcb9d Adds error if copy database name have the same name 
Fixes #13099
Fixes #13104

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-12 09:01:11 +02:00
Michal Čihař
34795cd742 Do not use intdiv() it's PHP 7 only 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-11 17:37:04 +02:00
Michal Čihař
aa88b1c358 Log correct username on failure 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-11 17:25:26 +02:00
Michal Čihař
2fec79a943 Remove unused use clause 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-11 17:24:31 +02:00
Michal Čihař
05e87b4a92 Move authentication failure handling out of DatabaseInterface 
We really want to check return value of DatabaseInterface::connect() and
not handle every failure case individually there.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-11 17:23:27 +02:00
Michal Čihař
f624f5f742 Merge branch 'QA_4_7' 2017-04-11 17:18:15 +02:00