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

109885 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Michal Čihař
fe0cef51fd Merge pull request #13294 from manishbisht/remove-inline-javascript 
Removed inline onchange
 2017-06-12 13:08:02 +02:00
Gustavo de Oliveira Silva
c7705e8705 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.3% (3145 of 3198 strings)

[CI skip]
 2017-06-10 21:46:04 +02:00
Manish Bisht
d5e32c351a remove inline onchange 
Signed-off-by: Manish Bisht <manish.bisht490@gmail.com>
 2017-06-09 20:31:45 +05:30
Michal Čihař
a42aa8a023 Merge remote-tracking branch 'weblate-master/master' 2017-06-08 20:05:59 +02:00
Gustavo de Oliveira Silva
374aa209be Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 97.9% (3142 of 3207 strings)

[CI skip]
 2017-06-08 20:03:58 +02:00
Gustavo de Oliveira Silva
31510c2d09 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 97.8% (3137 of 3207 strings)

[CI skip]
 2017-06-08 19:49:33 +02:00
Michal Čihař
d409d76dea Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-08 19:48:00 +02:00
Weblate
8bc1032feb Merge remote-tracking branch 'origin/master' 2017-06-08 18:20:47 +02:00
Gustavo de Oliveira Silva
54309dd8c9 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 94.2% (3023 of 3207 strings)

[CI skip]
 2017-06-08 18:20:46 +02:00
Michal Čihař
e7a09fe7db Bring back missing hash.lib.php requires 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-08 18:20:29 +02:00
Michal Čihař
98098ee63a Merge pull request #13367 from CommanderRoot/patch-1 
Fix double escaping in table structure view
 2017-06-08 16:19:00 +02:00
Michal Čihař
d2e2e9652f Merge branch 'QA_4_7' 2017-06-08 16:15:58 +02:00
Michal Čihař
3fe6c862a6 Adjust tests to scripts loader change 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-08 16:15:54 +02:00
Michal Čihař
61e02b43a8 Merge branch 'QA_4_7' 2017-06-08 16:14:05 +02:00
Michal Čihař
b143069be0 Simplify generating URL for php generated js 
Use URL::getCommon() instead of constructing URL manually.

This fixes regression introduced by e317e481ac.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-08 16:13:56 +02:00
Michal Čihař
fec1886d9b Remove core library to hash 
It now contains only hash polyfills, so let's have clear name.

Also remove no needed requires (it is already loaded from common).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-08 15:58:18 +02:00
Michal Čihař
5a84cf4652 Merge branch 'QA_4_7' 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-08 15:50:32 +02:00
Michal Čihař
929040f3b1 Merge remote-tracking branch 'origin/QA_4_7' 2017-06-08 15:49:42 +02:00
Viktar Vauchkevich
8464cc18fc Translated using Weblate (Belarusian) 
Currently translated at 58.9% (1892 of 3207 strings)

[CI skip]
 2017-06-08 15:49:17 +02:00
Michal Čihař
f4ae5f0d25 Gracefully handle early fatal errors in AJAX requests 
Generate response manually when Response object is not yet ready to be
used but we need AJAX response.

Fixes #13092

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-08 15:47:07 +02:00
Michal Čihař
e317e481ac Remove not needed parameters 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-08 15:47:07 +02:00
Viktar Vauchkevich
0b3e188d40 Translated using Weblate (Belarusian) 
Currently translated at 58.9% (1886 of 3198 strings)

[CI skip]
 2017-06-08 15:46:54 +02:00
CommanderRoot
73e7179ccf Fix double escaping 
Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
 2017-06-08 03:30:57 +02:00
Michal Čihař
8ea97c72a4 Fix url for table tracking 
Issue #13354

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-07 10:05:46 +02:00
Michal Čihař
f887b65bb2 Fixed url query handling in table structure 
Fixes #13366
See also issue #13354

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-07 09:53:03 +02:00
Michal Čihař
faf47b676c Avoid escaping URL for template in prefs autoload 
Issue #13354

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-07 09:08:41 +02:00
Michal Čihař
2a7fe79890 Merge branch 'QA_4_7' 2017-06-06 16:46:22 +02:00
Michal Čihař
2bf3356879 Use new SQL mode constants in SQL parser 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-06 16:46:18 +02:00
Michal Čihař
6eae509982 Remove no longer used directory 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-06 16:35:08 +02:00
Michal Čihař
24c0e48f50 Merge branch 'QA_4_7' 2017-06-06 16:32:39 +02:00
Michal Čihař
4d9b9cad36 Added documentation on user settings 
Fixes #13193

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-06 16:32:34 +02:00