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

109743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
073a26b0da Use Util::generateRandom for generating CSRF token 
- We reuse existing code for that.
- The token string is now shorter as it can contain any ASCII char,
  compared to hex digits previously.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-01 14:40:26 +02:00
Michal Čihař
71c3f9f7c1 Fix check for phpseclib presence 
The check here was reversed compared to other locations.

Fixes #13308

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-01 14:33:03 +02:00
Michal Čihař
3eb07713fe Merge branch 'QA_4_7' 2017-06-01 14:32:01 +02:00
Michal Čihař
a09ce3c76d Merge commit 'd09bba5bb6b10ca90c366851e45dec2480791f5d' 2017-06-01 14:31:54 +02:00
Michal Čihař
82933cc68d Merge commit 'a39992be43780f2a58709da56e5d41b666b8aa3b' 2017-06-01 14:31:26 +02:00
Michal Čihař
aa18cf7c90 Remove composer lock from branch 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-01 14:30:14 +02:00
Michal Čihař
a586c8ca4f Ensure we reset locales back to English after running tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-01 14:29:08 +02:00
Michal Čihař
b368c38357 Move random string generation to separate method 
It's better to reuse the code in more locations.

See #13308

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-01 14:28:26 +02:00
Michal Čihař
6b18dfa588 Improve secret generation 
Strip highest bit so that we can use more generated bytes in the ASCII
password.

See #13308

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-01 14:12:57 +02:00
Michal Čihař
a07ee72499 Merge pull request #13333 from mauriciofauth/templates 
Port some templates to Twig
 2017-06-01 14:00:04 +02:00
Weblate
8fa57d23ff Merge remote-tracking branch 'origin/master' 2017-06-01 13:58:21 +02:00
Володимир Бриняк
bff42f0338 Translated using Weblate (Ukrainian) 
Currently translated at 99.9% (3206 of 3207 strings)

[CI skip]
 2017-06-01 13:58:20 +02:00
davipatury
d1b28bd1f3 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.0% (2951 of 3207 strings)

[CI skip]
 2017-06-01 13:58:19 +02:00
Rajat Sharma
ad2f03b9cd Translated using Weblate (Hindi) 
Currently translated at 36.6% (1174 of 3207 strings)

[CI skip]
 2017-06-01 13:58:18 +02:00
Viktar Vauchkevich
e5b1449935 Translated using Weblate (Belarusian) 
Currently translated at 56.0% (1796 of 3207 strings)

[CI skip]
 2017-06-01 13:58:15 +02:00
Michal Čihař
cf471a0f49 Merge pull request #13340 from mauriciofauth/transformations-lib 
Refactor the transformations functions into static methods
 2017-06-01 13:58:06 +02:00
Maurício Meneghini Fauth
64b1b79933 Refactor the transformations into static methods 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-05-31 16:36:09 -03:00
Michal Čihař
d09bba5bb6 Translated using Weblate (Punjabi) 
Currently translated at 2.5% (81 of 3198 strings)

[CI skip]
 2017-05-31 17:16:34 +02:00
Michal Čihař
572c4b7a3d Translated using Weblate (Punjabi) 
Currently translated at 2.5% (81 of 3207 strings)

[CI skip]
 2017-05-31 17:16:19 +02:00
Maurício Meneghini Fauth
093ed72698 Port some templates to Twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-05-30 22:33:25 -03:00
Viktar Vauchkevich
b9ca93f0fc Translated using Weblate (Belarusian) 
Currently translated at 55.3% (1770 of 3198 strings)

[CI skip]
 2017-05-30 18:44:19 +02:00
Viktar Vauchkevich
6807c8fa71 Translated using Weblate (Belarusian) 
Currently translated at 55.3% (1776 of 3207 strings)

[CI skip]
 2017-05-30 18:44:13 +02:00
Hamid Khanahmadloo
f06da83462 Translated using Weblate (Persian) 
Currently translated at 25.7% (823 of 3198 strings)

[CI skip]
 2017-05-30 00:45:54 +02:00
Hamid Khanahmadloo
e5439795d7 Translated using Weblate (Persian) 
Currently translated at 25.6% (821 of 3207 strings)

[CI skip]
 2017-05-30 00:45:48 +02:00
singh jashan
e90f56bb53 Translated using Weblate (Punjabi) 
Currently translated at 2.5% (81 of 3207 strings)

[CI skip]
 2017-05-28 03:46:14 +02:00
Sifat Ahmed Khan
9cb3600c07 Translated using Weblate (Bengali) 
Currently translated at 71.6% (2298 of 3207 strings)

[CI skip]
 2017-05-28 03:44:14 +02:00
Tobby Guo
8e10650805 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 85.5% (2745 of 3207 strings)

[CI skip]
 2017-05-27 15:44:20 +02:00
Weblate
d3acc7b057 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-05-26 21:45:43 +02:00
singh jashan
dabb07f27b Translated using Weblate (Punjabi) 
Currently translated at 2.5% (81 of 3198 strings)

[CI skip]
 2017-05-26 21:45:42 +02:00
Tobby Guo
9be31c355d Translated using Weblate (Chinese (Simplified)) 
Currently translated at 85.9% (2750 of 3198 strings)

[CI skip]
 2017-05-26 21:45:39 +02:00
Sifat Ahmed Khan
ace8786706 Translated using Weblate (Bengali) 
Currently translated at 72.0% (2304 of 3198 strings)

[CI skip]
 2017-05-26 21:45:38 +02:00
Isaac Bennetch
a39992be43 Prepare for 4.7.2-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-05-26 15:45:12 -04:00
Isaac Bennetch
9471bb970d Adding composer lock for 4.7.1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-05-26 09:22:32 -04:00
Isaac Bennetch
1576a1c80a Prepare for 4.7.1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-05-25 12:41:06 -04:00
Michal Čihař
027ca3d33d Remove no longer needed validation 
This is done by browser now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-23 11:38:24 +02:00
Michal Čihař
39a256dc90 Merge pull request #13291 from manishbisht/remove-inline-javascript 
Removed inline onsubmit
 2017-05-23 11:35:10 +02:00
Michal Čihař
7d11666318 Merge pull request #13286 from lem9/patch-4 
Fix typos, improve wording
 2017-05-23 09:53:16 +02:00
Michal Čihař
52ff758375 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-05-23 09:52:22 +02:00
Michal Čihař
f2edeff02a Merge branch 'QA_4_7' 2017-05-23 09:51:59 +02:00
Marc Delisle
013a9bc24a Fix typo, improve wording 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2017-05-23 09:51:53 +02:00
Michal Čihař
2acd211373 Merge pull request #13293 from mauriciofauth/inline-css 
Remove some inline CSS
 2017-05-23 09:49:15 +02:00
Michal Čihař
4174eca157 Merge branch 'QA_4_7' 2017-05-23 09:15:15 +02:00
Michal Čihař
0cd8af6326 Merge remote-tracking branch 'origin/QA_4_7' 2017-05-23 09:15:10 +02:00
Володимир Бриняк
6cc664c658 Translated using Weblate (Ukrainian) 
Currently translated at 99.9% (3206 of 3207 strings)

[CI skip]
 2017-05-23 09:14:51 +02:00
Viktar Vauchkevich
7a7dcf5527 Translated using Weblate (Belarusian) 
Currently translated at 54.1% (1736 of 3207 strings)

[CI skip]
 2017-05-23 09:14:46 +02:00
Michal Čihař
b1eee56ad3 Actually fix #13274 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-23 09:14:29 +02:00
Володимир Бриняк
b364c74f0a Translated using Weblate (Ukrainian) 
Currently translated at 99.9% (3197 of 3198 strings)

[CI skip]
 2017-05-23 09:14:05 +02:00
Viktar Vauchkevich
42b6e9fd63 Translated using Weblate (Belarusian) 
Currently translated at 54.0% (1730 of 3198 strings)

[CI skip]
 2017-05-23 09:14:01 +02:00
Maurício Meneghini Fauth
05e39541c7 Remove inline CSS 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-05-22 23:21:03 -03:00
Manish Bisht
c7a2c0257b removed inline onsubmit 
Signed-off-by: Manish Bisht <manish.bisht490@gmail.com>
 2017-05-22 11:56:52 +05:30