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

109363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
2fadf37c7d Merge branch 'QA_4_7' 2017-03-30 13:47:52 +02:00
Michal Čihař
73ab7f380b Allow to run setup on the demo server 
Fixes #13083

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-30 13:47:45 +02:00
Michal Čihař
af0198c0f5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-03-30 13:18:17 +02:00
Michal Čihař
b4c4db4cbc Merge branch 'QA_4_7' 2017-03-30 13:17:51 +02:00
Michal Čihař
042377768b Merge remote-tracking branch 'origin/QA_4_7' 2017-03-30 13:17:47 +02:00
Michal Čihař
1952b2eaa4 Merge branch 'QA_4_7' of github.com:phpmyadmin/phpmyadmin into QA_4_7 2017-03-30 13:17:36 +02:00
Michal Čihař
8602695340 Focus on SQL editor after inserting field name 
Fixes #13125

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-30 13:16:42 +02:00
Piyush Agrawal
f89aafe9bf Fix: Focus back to codemirror editor on selecting column 
Signed-off-by: Piyush Agrawal <poush12@gmail.com>
 2017-03-30 13:13:33 +02:00
Weblate
bc9389abc6 Merge remote-tracking branch 'origin/master' 2017-03-30 13:11:06 +02:00
Weblate
2233104590 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-03-30 13:11:05 +02:00
tmtisfree
4009217a2e Translated using Weblate (French) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-03-30 13:11:04 +02:00
tmtisfree
c74dee72e2 Translated using Weblate (French) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-30 13:11:03 +02:00
Michal Čihař
574bd7213c Merge branch 'QA_4_7' 2017-03-30 13:10:32 +02:00
Michal Čihař
cf525c7876 Always execute tracking queries as controluser 
Fixes #13132

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-30 13:09:08 +02:00
Isaac Bennetch
2f0b6c4169 Prepare for 4.7.1-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-03-29 14:39:15 -04:00
Isaac Bennetch
5538c22c14 Adding composer lock for 4.7.0 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-03-29 08:15:30 -04:00
Isaac Bennetch
08bbf7bdbd Prepare for 4.7.0 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-03-28 20:58:44 -04:00
Isaac Bennetch
a3bff88199 Add ChangeLog for PMASA-2017-08 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-03-28 20:56:55 -04:00
Michal Čihař
eae3b24a1c Merge pull request #13122 from Achilles-96/Selenium-bug1 
Go button not clicked due to not being in view
 2017-03-28 15:15:43 +02:00
Michal Čihař
319f4d98cf Merge commit '53770cf934f32edb8a9b3ba85338e2e6a8c884dd' 2017-03-28 14:36:53 +02:00
Raghuram
d084d25a61 Fixes bugs in PmaSeleniumDbEventsTest.php 
Signed-off-by: Raghuram Vadapalli<raghuram.vadapalli@research.iiit.ac.in>
 2017-03-28 10:38:12 +05:30
Michal Čihař
98a1012ea4 Merge branch 'QA_4_7' 2017-03-27 15:56:34 +02:00
Michal Čihař
7232271a37 Truncate only long passwords 
This avoids problems with certain PHP versions returning false when
first parameter to substr is ''.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-27 15:55:35 +02:00
Michal Čihař
8ef8dbf3e9 Merge pull request #13121 from mauriciofauth/fix/coding-standard 
Fix some coding standard errors
 2017-03-27 12:00:43 +02:00
Michal Čihař
f6aa888e72 Merge branch 'QA_4_7' 2017-03-27 11:37:25 +02:00
Michal Čihař
3fd5c96ff6 Merge remote-tracking branch 'origin/QA_4_7' 2017-03-27 11:37:22 +02:00
Michal Čihař
f67e04987d No longer recommend not used configuration variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-27 11:37:07 +02:00
Weblate
73fce9d2c1 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-03-27 11:29:46 +02:00
Vuong Phan
3f4e69831a Translated using Weblate (Vietnamese) 
Currently translated at 84.5% (2699 of 3192 strings)

[CI skip]
 2017-03-27 11:29:46 +02:00
Weblate
103f4376d6 Merge remote-tracking branch 'origin/master' 2017-03-27 11:29:43 +02:00
tmtisfree
ae2503d9e2 Translated using Weblate (French) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-03-27 11:29:43 +02:00
Vuong Phan
3f3317a9e8 Translated using Weblate (Vietnamese) 
Currently translated at 84.3% (2695 of 3194 strings)

[CI skip]
 2017-03-27 11:29:42 +02:00
tmtisfree
04a33cf305 Translated using Weblate (French) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-27 11:29:38 +02:00
Michal Čihař
f8e83ef36d Merge branch 'QA_4_7' 2017-03-27 11:29:06 +02:00
Michal Čihař
ebaf126501 Do not use empty() for checking submitted username 
The empty() function is evil and will you block from login with username
"0".

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-27 11:28:16 +02:00
Maurício Meneghini Fauth
9f00b60e1b Fix more errors 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-03-26 21:09:35 -03:00
Deven Bansod
da77177a1e ChangeLog for #13119 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-03-24 21:39:04 +05:30
Deven Bansod
035d7cb097 Set the database value for the database interface 
Fix #13119

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-03-24 21:36:18 +05:30
Raghuram
53770cf934 Go button not clicked due to not being in view 
Signed-off-by: Raghuram Vadapalli<raghuram.vadapalli@research.iiit.ac.in>
 2017-03-24 01:03:42 +05:30
Maurício Meneghini Fauth
750e42916f Fix some coding standard errors 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-03-23 11:08:30 -03:00
Michal Čihař
0a3a1f07c4 Generate random passwords for test 
This way nobody will think there is anything secret in the .travis.yml.

Fixes #13115

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-22 10:31:50 +01:00
Michal Čihař
82d18f6229 Merge branch 'QA_4_7' 2017-03-22 10:25:21 +01:00
Michal Čihař
06fe8c0e25 Properly report invalid token error on AJAX requests 
We need to keep ajax_request flag to properly report result in JSON.

Issue #13114

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-22 10:24:31 +01:00
Michal Čihař
e9b3171613 Merge pull request #13116 from mauriciofauth/fix/coding-standard 
Fix coding standard errors using vendor/bin/phpcbf
 2017-03-22 09:27:02 +01:00
Maurício Meneghini Fauth
29a773ed67 Implement PSR-11 
Implement PSR-11 to container interface with tests.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-03-22 09:24:53 +01:00
Maurício Meneghini Fauth
5366c507a5 Fix coding standard errors using vendor/bin/phpcbf 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-03-21 23:16:32 -03:00
Michal Čihař
bd4316419a Merge branch 'QA_4_7' 2017-03-21 13:53:50 +01:00
Raghuram
553d1ff343 Removes default new database name 
Issue #13099

Signed-off-by: Raghuram Vadapalli<raghuram.vadapalli@research.iiit.ac.in>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-21 13:49:37 +01:00
Michal Čihař
d50b997480 Initial version of security policy 
Based on content from wiki and website.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-21 13:31:39 +01:00
Michal Čihař
b31d0cfb91 Merge branch 'QA_4_7' 2017-03-21 11:34:16 +01:00