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

109574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
887a241c6d Merge pull request #13248 from CommanderRoot/patch-1 
Fix unwanted escaping
 2017-05-09 11:48:14 +02:00
Michal Čihař
35d6feb0d5 Merge pull request #13249 from CommanderRoot/patch-2 
Fix dropdown selector
 2017-05-09 11:46:02 +02:00
Weblate
0379da4618 Merge remote-tracking branch 'origin/master' 2017-05-09 11:42:01 +02:00
Codrin
66d5e769ea Translated using Weblate (Romanian) 
Currently translated at 53.7% (1719 of 3198 strings)

[CI skip]
 2017-05-09 11:42:00 +02:00
Michal Čihař
8a2cb21394 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.6% (2995 of 3198 strings)

[CI skip]
 2017-05-09 11:42:00 +02:00
Michal Čihař
dd52bcbe9a Translated using Weblate (Lithuanian) 
Currently translated at 42.9% (1372 of 3198 strings)

[CI skip]
 2017-05-09 11:41:59 +02:00
Viktar Vauchkevich
e19a3c4ae9 Translated using Weblate (Belarusian) 
Currently translated at 38.3% (1228 of 3198 strings)

[CI skip]
 2017-05-09 11:41:55 +02:00
Michal Čihař
64112a30f8 Merge branch 'QA_4_7' 2017-05-09 11:41:39 +02:00
Michal Čihař
4b4c836a28 Merge remote-tracking branch 'origin/QA_4_7' 2017-05-09 11:41:32 +02:00
Michal Čihař
3a9ab31353 Merge commit 'cb717611e9134dabecc789969df4d6761aaa34c7' 2017-05-09 11:41:17 +02:00
Michal Čihař
8711717fc7 Merge commit '35c6d9c66dc83cb16e07ae89933a874b9b368308' 2017-05-09 11:41:02 +02:00
Michal Čihař
915bcdab5b Changelog entry for #13256 and #13257 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 11:40:16 +02:00
Weblate
9988611a17 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-05-09 11:39:36 +02:00
Codrin
88e2610296 Translated using Weblate (Romanian) 
Currently translated at 54.0% (1724 of 3192 strings)

[CI skip]
 2017-05-09 11:39:35 +02:00
Michal Čihař
b723df0b86 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 94.0% (3001 of 3192 strings)

[CI skip]
 2017-05-09 11:39:35 +02:00
Michal Čihař
a3987b2654 Translated using Weblate (Lithuanian) 
Currently translated at 43.1% (1377 of 3192 strings)

[CI skip]
 2017-05-09 11:39:34 +02:00
Viktar Vauchkevich
5d3f1be1d4 Translated using Weblate (Belarusian) 
Currently translated at 38.5% (1229 of 3192 strings)

[CI skip]
 2017-05-09 11:39:32 +02:00
Michal Čihař
a70025eee2 Translated using Weblate (Arabic) 
Currently translated at 34.6% (1107 of 3192 strings)

[CI skip]
 2017-05-09 11:39:32 +02:00
Michal Čihař
cb717611e9 Merge pull request #13257 from udan11/fix_13256 
zxcvbn dependency was missing.
 2017-05-09 11:39:24 +02:00
Joelso Dias
35c6d9c66d Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 94.0% (3001 of 3192 strings)

[CI skip]
 2017-05-09 03:46:14 +02:00
Joelso Dias
2c246ecdb1 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.6% (2995 of 3198 strings)

[CI skip]
 2017-05-09 03:46:07 +02:00
Cindy Dallaire
97d2c07e24 Translated using Weblate (French) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-05-09 00:45:05 +02:00
Cindy Dallaire
80f41e7128 Translated using Weblate (French) 
Currently translated at 100.0% (3198 of 3198 strings)

[CI skip]
 2017-05-09 00:44:57 +02:00
Dan Ungureanu
41683f3553 zxcvbn dependency was missing. 
Fixes #13256.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2017-05-08 21:37:36 +03:00
Justas Vilimas
d70e87b1b5 Translated using Weblate (Lithuanian) 
Currently translated at 43.1% (1377 of 3192 strings)

[CI skip]
 2017-05-08 10:32:11 +02:00
Justas Vilimas
aa8390724a Translated using Weblate (Lithuanian) 
Currently translated at 42.9% (1372 of 3198 strings)

[CI skip]
 2017-05-08 10:32:02 +02:00
Viktar Vauchkevich
c9efa661e1 Translated using Weblate (Belarusian) 
Currently translated at 32.0% (1023 of 3192 strings)

[CI skip]
 2017-05-07 00:44:14 +02:00
Cindy Dallaire
23e6b8c9c1 Translated using Weblate (French) 
Currently translated at 100.0% (3198 of 3198 strings)

[CI skip]
 2017-05-06 23:10:58 +02:00
CommanderRoot
207eed8030 Fix dropdown selector 
Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
 2017-05-06 21:29:32 +02:00
CommanderRoot
abc32dc25c Fix unwanted escaping 
Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
 2017-05-06 20:16:17 +02:00
CommanderRoot
2592efde70 Fix unwanted escaping 
Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
 2017-05-06 20:16:14 +02:00
CommanderRoot
9780407ca1 Fix unwanted escaping 
Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
 2017-05-06 20:16:10 +02:00
CommanderRoot
9c4bdb0f34 Fix unwanted escaping 
Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
 2017-05-06 20:14:17 +02:00
Michal Čihař
74ec22e3cf Generate sha256 sums even for snapshots 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-05 15:07:08 +02:00
Michal Čihař
f6e09f2c6e Remove Twig documentation and tests from package 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-05 14:38:14 +02:00
Michal Čihař
4ff2c1d1b1 Remove symfony cache tests from the packages 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-05 14:38:08 +02:00
Michal Čihař
718a4fb9b7 Allow + in version 
This will be used for snapshots.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-05 14:32:47 +02:00
Michal Čihař
703054a27a Prepare create-release.sh for daily builds 
Issue #12821

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-05 14:28:36 +02:00
Luís Pedro Algarvio
7e76b22742 Reorder a few keys in the composer.json file (#13199) 
Reorder a few keys to make the composer.json file feel a bit more organized:
- repositories key goes above all the dependencies
- pair homepage with support key and move them to position after name, description and keywords
- pair authors with license key and move them to position just before technical stuff

Signed-off-by: Luís Pedro Algarvio <lp.algarvio@gmail.com>
 2017-05-05 13:53:28 +02:00
Luís Pedro Algarvio
eba529186e Change composer package type to project (#13198) 
Composer doesn't seem to support packages of type application.
Package type library (the default) or project seem to be the most appropriate.

Signed-off-by: Luís Pedro Algarvio <lp.algarvio@gmail.com>
 2017-05-05 13:51:57 +02:00
Michal Čihař
9e693d8e3f Fix syntax error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-05 13:38:42 +02:00
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