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

109916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
b372e0d554 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-06-13 17:04:19 +02:00
Michal Čihař
c065224d1c Merge branch 'QA_4_7' 2017-06-13 17:03:42 +02:00
Michal Čihař
30d509238a Merge remote-tracking branch 'origin/QA_4_7' 2017-06-13 17:03:19 +02:00
Michal Čihař
358d2fd1f1 Rewrite export alias defining 
The old code did load all colums for all tables in all databases in
export. This can easily explode for server wide exports or exports on
database with lot of tables.

It has been rewritten in a way to load required data on demand from
server. This will make aliases defining slightly slower, but I think
it's acceptable price for making the export work on larger databases.

Fixes #13008

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 17:02:45 +02:00
Madhura Jayaratne
f0f9311cf5 Fix div id. Use the jQuery UI dialog for index creation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-06-13 22:06:32 +10:00
Madhura Jayaratne
522f1a714e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-06-13 21:50:24 +10:00
Madhura Jayaratne
16aa30cd56 Fix #13350 Add Index issue 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-06-13 21:49:54 +10:00
Michal Čihař
40fb31f460 Remove unused code 
The url_params and args seems to be used in same way, but I could not
find any user of url_params.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 13:02:31 +02:00
Michal Čihař
44975e7e0a Simplify code for generating URL 
There is no need to build it manually

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 12:43:38 +02:00
Michal Čihař
45640d5e0f Remove unused request parameter for Util::checkParameters 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 12:34:43 +02:00
Michal Čihař
6a12e15994 Remove checked_special global variable 
It anyway doesn't work as intented due to most scripts not doing checks
this way.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 12:33:41 +02:00
Michal Čihař
e34ce85875 Avoid checking parameters which are set in same script 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 12:27:52 +02:00
Michal Čihař
608f80e227 Avoid passing empty parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 12:26:55 +02:00
Michal Čihař
9b627d685b Remove no longer needed token parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 12:21:31 +02:00
Michal Čihař
a7fb02fb1e Merge pull request #13379 from nijel/token 
Automatically add token to all AJAX requests
 2017-06-13 12:16:38 +02:00
Michal Čihař
f7bb752573 Automatically add token to all AJAX requests 
This way we don't have to do the same in every AJAX request, it can be
done just once in shared handler.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 11:45:40 +02:00
Michal Čihař
3b0b6ca708 Fix rendering of bookmarks in console 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 11:17:27 +02:00
Michal Čihař
c6c7a12586 Escape token in HTML 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 10:37:14 +02:00
Michal Čihař
44709d69f4 Encode database name in URL 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 10:36:35 +02:00
Michal Čihař
93637cba8e Avoid passing token in GET request 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 10:29:30 +02:00
Michal Čihař
bf60780976 Fix passing token in SQL console 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 10:28:57 +02:00
Michal Čihař
135e82cc69 Replace jquery.cookie.js with js.cookie.js 
The latter one is suggested replacement for no longer maintained
jquery.cookie.js.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 10:19:09 +02:00
Michal Čihař
fc9140c0c5 Remove _url_query attribute from DatabaseStructureController.php 
It was used only in two locations and in both of them the different URL
query was constructed, so it's better to contruct new queries directly.

Fixes #13373

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 09:39:23 +02:00
Michal Čihař
6c376de12a Merge pull request #13376 from mauriciofauth/js-vendor/jquery-validation 
Update jQuery Validation Plugin to 1.16.0
 2017-06-13 08:41:19 +02:00
Michal Čihař
1da2385e62 Merge pull request #13375 from mauriciofauth/js-vendor/jquery 
Update jQuery to 3.2.1
 2017-06-13 08:40:49 +02:00
Michal Čihař
31d7894c8a Merge pull request #13377 from mauriciofauth/js-vendor/jquery-cookie 
Update jQuery Cookie Plugin to 1.4.1
 2017-06-13 08:38:56 +02:00
Michal Čihař
afc908fef5 Merge pull request #13378 from mauriciofauth/js-vendor/codemirror 
Update CodeMirror to 5.26.0
 2017-06-13 08:37:43 +02:00
Deven Bansod
4606b19620 Merge branch 'QA_4_7' 2017-06-13 09:15:55 +05:30
Weblate
97e604adb7 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-06-13 05:45:15 +02:00
João Medeiros
dcea3ce38b Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.5% (3151 of 3198 strings)

[CI skip]
 2017-06-13 05:45:14 +02:00
Cindy Dallaire
9a0d189349 Translated using Weblate (French) 
Currently translated at 98.2% (3142 of 3198 strings)

[CI skip]
 2017-06-13 05:45:12 +02:00
Viktar Vauchkevich
4f4aafd1e3 Translated using Weblate (Belarusian) 
Currently translated at 60.7% (1944 of 3198 strings)

[CI skip]
 2017-06-13 05:45:11 +02:00
Deven Bansod
9f1109fe96 ChangeLog for #13327 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-06-13 09:14:51 +05:30
Deven Bansod
b759e57090 State correct default value in Documentation 
Fix #13327

It should match the value defined in libraries/config.default.php

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-06-13 09:12:46 +05:30
Madhura Jayaratne
18f9d875f5 Space between table name and partition action in the generated query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-06-13 12:21:06 +10:00
Madhura Jayaratne
274239802e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-06-13 12:17:41 +10:00
Madhura Jayaratne
4f24ef410e Icon is already escaped 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-06-13 12:15:07 +10:00
Weblate
eecce16592 Merge remote-tracking branch 'origin/master' 2017-06-13 04:05:23 +02:00
João Medeiros
6b3d5fcd9f Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.1% (3147 of 3206 strings)

[CI skip]
 2017-06-13 04:05:21 +02:00
Cindy Dallaire
130cd9b8c5 Translated using Weblate (French) 
Currently translated at 98.0% (3145 of 3206 strings)

[CI skip]
 2017-06-13 04:05:19 +02:00
Viktar Vauchkevich
0d38dbc115 Translated using Weblate (Belarusian) 
Currently translated at 60.8% (1951 of 3206 strings)

[CI skip]
 2017-06-13 04:05:17 +02:00
Madhura Jayaratne
8a83391ce5 Fix #13372 Current collation not shown / pre-selected in Table Operations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-06-13 11:38:34 +10:00
Maurício Meneghini Fauth
0349d38acb Update CodeMirror to 5.26.0 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-12 22:07:35 -03:00
Maurício Meneghini Fauth
15ff828c5d Update jQuery Cookie Plugin to 1.4.1 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-12 21:38:05 -03:00
Maurício Meneghini Fauth
3148169960 Update jquery-validation to 1.16.0 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-12 21:07:38 -03:00
Maurício Meneghini Fauth
5346c7d882 Update jQuery to 3.2.1 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-12 20:36:45 -03:00
Viktar Vauchkevich
572a52c5ef Translated using Weblate (Belarusian) 
Currently translated at 60.1% (1925 of 3198 strings)

[CI skip]
 2017-06-12 13:15:07 +02:00
Michal Čihař
de2a81d872 Use updated URL for PGP path finder 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-12 13:09:55 +02:00
Weblate
ed8527e56b Merge remote-tracking branch 'origin/master' 2017-06-12 13:08:16 +02:00
Viktar Vauchkevich
c644653eb1 Translated using Weblate (Belarusian) 
Currently translated at 60.2% (1932 of 3206 strings)

[CI skip]
 2017-06-12 13:08:11 +02:00