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

109376 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sunny Batabyal
3c1cb0b7a9 Right-align decimal values 
Fixes #13131

Signed-off-by: Sunny Batabyal <batabyalsunny@gmail.com>
 2017-04-03 09:54:59 +02:00
Michal Čihař
37b87d7d44 Merge pull request #13134 from ngyikp/master 
Add `object-src 'none'` to Content Security Policy header
 2017-04-03 09:51:47 +02:00
Michal Čihař
691349f1ab Merge branch 'QA_4_7' 2017-04-03 09:50:06 +02:00
Marc Delisle
31ba6ddd14 English improvements and typo fixes 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2017-04-03 09:49:37 +02:00
Deven Bansod
827c71f86a Merge branch 'QA_4_7' 2017-03-31 19:50:20 +05:30
Deven Bansod
4248e33aed ChangeLog for #13135 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-03-31 19:47:33 +05:30
Deven Bansod
8486d8afa7 Use correct value as an argument to the Collation Description function 
Fix #13135

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-03-31 19:46:29 +05:30
Ng Yik Phang
f6b08d3ffb Add object-src 'none' to Content Security Policy header 
There’s no need to embed Flash or Java, so just turn off the ability
to embed them for security.

Ref: https://github.com/phpmyadmin/phpmyadmin/issues/12437

Signed-off-by: Ng Yik Phang <ngyikp@gmail.com>
 2017-03-30 22:10:45 +08:00
Michal Čihař
8643692d75 Merge branch 'QA_4_7' 2017-03-30 14:31:50 +02:00
Michal Čihař
13d3398ec9 Adjust tests to make them output neutral 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-30 14:31:46 +02:00
Michal Čihař
769f9ab88f Merge branch 'QA_4_7' 2017-03-30 14:09:19 +02:00
Michal Čihař
2c6c34fb28 Avoid trying to connect to MySQL server on demo 
This way we avoid PMASA-2016-44 on the demo server.

Issue #13083

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-30 14:07:42 +02:00
Michal Čihař
8beb7f544e Fixed broken links in setup 
Fixes #13133

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-30 14:07:42 +02:00
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