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

109935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
ea5421bcab Merge remote-tracking branch 'origin/master' 2017-06-14 17:32:00 +02:00
Māris
a324c88940 Translated using Weblate (Latvian) 
Currently translated at 17.3% (557 of 3212 strings)

[CI skip]
 2017-06-14 17:31:58 +02:00
Stefano Martinelli
364b51a2e4 Translated using Weblate (Italian) 
Currently translated at 100.0% (3212 of 3212 strings)

[CI skip]
 2017-06-14 17:31:57 +02:00
Giovanni Sora
1c9487b2e7 Translated using Weblate (Interlingua) 
Currently translated at 75.4% (2425 of 3212 strings)

[CI skip]
 2017-06-14 17:31:57 +02:00
dingo thirteen
96963916e3 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3212 of 3212 strings)

[CI skip]
 2017-06-14 17:31:56 +02:00
Viktar Vauchkevich
cd8f4f2951 Translated using Weblate (Belarusian) 
Currently translated at 62.0% (1992 of 3212 strings)

[CI skip]
 2017-06-14 17:31:54 +02:00
Maurício Meneghini Fauth
d853b60762 Change octal escape with hexadecimal escape 
Octal escape sequences are not allowed in strict mode.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-14 12:31:43 -03:00
Burak Yavuz
a09ce953ba Translated using Weblate (Turkish) 
Currently translated at 100.0% (3212 of 3212 strings)

[CI skip]
 2017-06-13 18:32:43 +02:00
Michal Čihař
0cbe90430c Merge branch 'QA_4_7' 2017-06-13 17:35:44 +02:00
Michal Čihař
1ecf2561a1 Unmark field as required 
Otherwise the hidden field blocks form submission.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 17:35:27 +02:00
Michal Čihař
4f30297d38 Cache tracker enabled per table 
This can be executed quite a lot of times during import and there is no
reason to query database again during that.

Fixes #13318

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 17:34:55 +02:00
Michal Čihař
5fd7b2c9de Avoid getting tracking version for non tracked tables 
We won't use it anyway, so it's better to avoid that query.

Issue #13318

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 17:31:43 +02:00
Michal Čihař
c218e5e025 Merge branch 'QA_4_7' 2017-06-13 17:06:16 +02:00
Michal Čihař
c0d841c50f Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 17:06:08 +02:00
Michal Čihař
7af85633c4 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 17:05:20 +02:00
Weblate
3e7c083c91 Merge remote-tracking branch 'origin/master' 2017-06-13 17:05:03 +02:00
Alpix
8a98f20c14 Translated using Weblate (German) 
Currently translated at 98.3% (3152 of 3206 strings)

[CI skip]
 2017-06-13 17:05:00 +02:00
Weblate
89e3820bae Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-06-13 17:04:25 +02:00
Alpix
5f4903bb4a Translated using Weblate (German) 
Currently translated at 98.8% (3161 of 3198 strings)

[CI skip]
 2017-06-13 17:04:22 +02:00
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