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

109533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
272baec2cc Pass false as cache to Twig 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-05 13:28:20 +02:00
Michal Čihař
e852abc344 Fallback to disabled cache in case template loading fails 
Fixes #13238

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-05 13:27:34 +02:00
Michal Čihař
92a1e5a47b Merge pull request #13237 from nijel/tempdir 
Share TempDir for Twig and other uses
 2017-05-05 12:03:53 +02:00
Weblate
dff57bb33a Merge remote-tracking branch 'origin/master' 2017-05-05 11:12:08 +02:00
Viktar Vauchkevich
bf81ef22d3 Translated using Weblate (Belarusian) 
Currently translated at 31.8% (1018 of 3198 strings)

[CI skip]
 2017-05-05 11:12:02 +02:00
Michal Čihař
b7668cd442 Merge pull request #13192 from mauriciofauth/fix/coding-standard 
Fix errors detected by PHP_CodeSniffer
 2017-05-05 11:11:53 +02:00
Michal Čihař
69da96b3e1 Show warning if twig cache can not be used 
Issue #13225

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-05 11:08:36 +02:00
Michal Čihař
ae9006e9be Use one temporary directory 
Share one directory for Twig cache, SHP import and file uploads.

The code now also validates the cache directory and creates it on the
fly, so it properly detects if the directory can not be used.

Also the documentation has been improved to document securing this
directory.

Fixes #13225
Fixes #13226

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-05 11:08:36 +02:00
Maurício Meneghini Fauth
bd73df573c Rename MrgMyisamTest and TablePropertyTest 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-05-04 19:49:57 -03:00
Maurício Meneghini Fauth
0e236f43bf Rename export plugins helpers 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-05-04 19:33:55 -03:00
Franco
91e5c34f5d Translated using Weblate (Spanish) 
Currently translated at 100.0% (3198 of 3198 strings)

[CI skip]
 2017-05-04 20:57:08 +02:00
Michal Čihař
604e3329f1 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-05-04 13:57:42 +02:00
Michal Čihař
964d189f5c Merge branch 'QA_4_7' 2017-05-04 13:56:58 +02:00
Michal Čihař
0647138e7e Properly report not working sessions 
If saved session no longer contains variable we have just saved to it,
there is some problem. It's better to warn user right now than failing
later.

Fixes #13234

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-04 13:56:17 +02:00
Michal Čihař
61f294062a Merge pull request #13236 from mauriciofauth/templates 
Port some templates to Twig
 2017-05-04 13:18:36 +02:00
Michal Čihař
5f63aed0b2 Add traefik example for docker 
See https://github.com/phpmyadmin/docker/issues/101#issuecomment-298728726

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-04 12:53:48 +02:00
Michal Čihař
0ab13fbec2 Merge branch 'QA_4_7' 2017-05-04 12:44:52 +02:00
Michal Čihař
0dcce79863 Merge commit 'aa1171f24fb92347455bdc08274984732d989bcd' 2017-05-04 12:44:46 +02:00
Michal Čihař
f9167cf9de Merge commit 'cfb66a5b9fac69fb69277de5d9b9abbe486d89bc' 2017-05-04 12:44:34 +02:00
Michal Čihař
eaf50f2983 Merge commit '298b431b4b53c7af344263696475bc868bb3cb85' 2017-05-04 12:44:28 +02:00
Michal Čihař
436b68258d Changelog entries for #13216 and #13218 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-04 12:42:59 +02:00
Michal Čihař
c419aad2b9 Merge pull request #13224 from nijel/collations 
Rewite collation naming code
 2017-05-04 12:41:33 +02:00
Weblate
aa1171f24f Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-05-04 12:25:17 +02:00
Isuru Udana Palihawadana
2bef0598c7 Translated using Weblate (Sinhala) 
Currently translated at 59.8% (1912 of 3192 strings)

[CI skip]
 2017-05-04 12:25:16 +02:00
Muḥend Belqasem
bb2373e445 Translated using Weblate (Kabyle) 
Currently translated at 2.5% (80 of 3192 strings)

[CI skip]
 2017-05-04 12:25:15 +02:00
Viktar Vauchkevich
e8c67d3c09 Translated using Weblate (Belarusian) 
Currently translated at 28.7% (917 of 3192 strings)

[CI skip]
 2017-05-04 12:25:14 +02:00
Michal Čihař
cfb66a5b9f Merge pull request #13223 from nijel/logo 
Update logo images
 2017-05-04 12:25:07 +02:00
Weblate
287739b962 Merge remote-tracking branch 'origin/master' 2017-05-04 12:24:24 +02:00
Isuru Udana Palihawadana
cdc3225acb Translated using Weblate (Sinhala) 
Currently translated at 59.5% (1906 of 3198 strings)

[CI skip]
 2017-05-04 12:24:23 +02:00
Muḥend Belqasem
ead3076722 Translated using Weblate (Kabyle) 
Currently translated at 2.5% (80 of 3198 strings)

[CI skip]
 2017-05-04 12:24:22 +02:00
Viktar Vauchkevich
28869cd148 Translated using Weblate (Belarusian) 
Currently translated at 28.5% (912 of 3198 strings)

[CI skip]
 2017-05-04 12:24:19 +02:00
Luís Pedro Algarvio
8e91ad5b35 Implement AUTOLOAD_FILE constant (#13213) 
Replace hardcoded paths for autoload.php with vendor defined AUTOLOAD_FILE constant.

Signed-off-by: Luís Pedro Algarvio <lp.algarvio@gmail.com>
 2017-05-04 12:24:11 +02:00
Maurício Meneghini Fauth
3fad8945e6 Fix unwanted escaping 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-05-03 23:16:47 -03:00
Maurício Meneghini Fauth
a35f8798f4 Port some templates to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-05-03 22:52:39 -03:00
Viktar Vauchkevich
298b431b4b Translated using Weblate (Belarusian) 
Currently translated at 25.4% (812 of 3192 strings)

[CI skip]
 2017-05-01 00:44:18 +02:00
Viktar Vauchkevich
574ac6541a Translated using Weblate (Belarusian) 
Currently translated at 25.2% (807 of 3198 strings)

[CI skip]
 2017-05-01 00:44:13 +02:00
Michal Čihař
b2d9f03829 Merge branch 'QA_4_7' 2017-04-28 16:50:42 +02:00
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ř
2227f33c74 Merge pull request #13191 from udan11/fix_designer 
Fix designer
 2017-04-28 16:27:31 +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ř
031d379bdc Rewite collation naming code 
Rewritten to use level based parser instead of hardcoding ordering. This
is necessary as MySQL charset naming got even more complex with MySQL
8.0.

Fixes #13216

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-28 16:04:27 +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