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

109413 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Ungureanu
1ca19f0ac1 Replaced deprecated jQuery calls. 
'bind' and 'unbind', 'delegate' and 'undelegate' have been deprecated in
favor of 'on' and 'off'.

Partially fixes #13166.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2017-04-10 13:06:32 +03:00
Michal Čihař
3dedc3de35 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-04-07 16:31:37 +02:00
Michal Čihař
caecd6ce1e Merge branch 'QA_4_7' 2017-04-07 16:30:34 +02:00
Michal Čihař
94576e0943 Fix variable name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-07 16:30:05 +02:00
Michal Čihař
38e34080fa Merge pull request #13161 from atefBB/master 
fix typo
 2017-04-07 15:32:53 +02:00
Michal Čihař
04ebb24cc8 Merge branch 'QA_4_7' 2017-04-07 15:23:34 +02:00
Fenn-CS
a661c06fd6 Added a locale reference for $response in PMA_getChangePassMessage() of user_password.php 
Fixes #13154

Signed-off-by: Fenn-CS <fenn25.fn@gmail.com>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-07 15:23:26 +02:00
Michal Čihař
8cb51ff8e9 Merge branch 'QA_4_7' 2017-04-07 15:20:15 +02:00
Michal Čihař
606dbf8e0a Add documentation for PMA_HOSTS variable 
See https://github.com/phpmyadmin/docker/pull/116

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-07 15:19:52 +02:00
Michal Čihař
fbbbb85c2d Merge pull request #13100 from mauriciofauth/twig-template 
Initial support for Twig template engine
 2017-04-07 12:41:38 +02:00
Maurício Meneghini Fauth
69154289ea Remove unused functions 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-04-07 07:23:31 -03:00
Maurício Meneghini Fauth
d71e097593 Add Twig cache generator and bypass escape option 
- Add script to generate cache files for all Twig templates
- Add option in Twig extension that bypass autoescaping

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-04-06 20:33:32 -03:00
Atef Ben Ali
62b04e8a5f fix typo 
(partial)
 2017-04-06 21:51:39 +01:00
Michal Čihař
0a135fa0ec Merge branch 'QA_4_7' 2017-04-05 10:14:08 +02:00
Michal Čihař
1f4b6ec0ac Ensure we have only integers in colum visibility and ordering data 
Fixes PHP error in case of invalid table preferences.

Fixes #13152

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-05 10:12:24 +02:00
Michal Čihař
3a636ba45a Merge branch 'QA_4_7' 2017-04-05 09:35:35 +02:00
Michal Čihař
96b13f46c5 Ensure the xhr attribute is reset on error 
Not really necessary right now, but better be safe than sorry.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-05 09:35:22 +02:00
Michal Čihař
c6c8c970ac Add debug logging to the AJAX error handler 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-05 09:35:22 +02:00
Michal Čihař
799ac0d4a0 Fix condition to ignore aborted requests 
The status=0 happens on network failure as well, so we can't ignore it
completely.

Fixes #13130

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-05 09:35:22 +02:00
Michal Čihař
a079a55282 Remove duplicite error handler 
There is already ajaxError in js/ajax.js, we can do handling there.

Issue #13130

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-05 09:33:10 +02:00
Michal Čihař
f5655f4429 Do not try to parse error response 
Issue #13130

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-05 09:33:06 +02:00
Michal Čihař
8a692c015c Merge branch 'QA_4_7' 2017-04-04 09:49:55 +02:00
Michal Čihař
946549d2de Do not show New as a database in database dropdown 
Fixes #13144

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-04 09:49:44 +02:00
Michal Čihař
e8104393e0 Merge branch 'QA_4_7' 2017-04-04 08:46:46 +02:00
Michal Čihař
6f9a50f2e7 Do not include devel dependencies in the release 
The composer require does automatically run update and thus pulling in
all things we've removed in previous step. Passing --update-no-dev
avoids this.

Fixes #13146

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-04 08:45:45 +02:00
Michal Čihař
10cbb0552f Fixed outbound links in changelog.php 
There was typo in the replacement regexp.

Fixes #13149

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-04 08:41:54 +02:00
Michal Čihař
924b538815 Merge branch 'QA_4_7' 2017-04-04 08:28:53 +02:00
Michal Čihař
5ee4320b7d Fixed pagination while browsing resuls 
Fixes #13150

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-04 08:28:42 +02:00
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
Maurício Meneghini Fauth
5b8415848a Fix strange bug on HHVM build 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-03-30 15:54:53 -03:00
Maurício Meneghini Fauth
44d56123ba Add support for pgettext 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-03-30 14:01:34 -03:00
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