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

109864 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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ř
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
Michal Čihař
456f3bfffd Merge branch 'QA_4_7' 2017-06-06 15:31:33 +02:00
Michal Čihař
257ba6b7e2 Fixed editing QBE 
Fixes #13343

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-06 15:31:03 +02:00
Michal Čihař
4533e853a6 Merge branch 'QA_4_7' 2017-06-06 14:52:53 +02:00
Michal Čihař
58023e98a8 Fixed loading additional javascripts 
The server side loader does limit to 10 files, but the client side code
happily generates more requests.

Depending on loaded pages, this could lead to some javascript files not
being loaded (eg. if you went to monitor directly from home page).

Fixes #13362

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-06 14:51:18 +02:00
Michal Čihař
3ac2fbfc76 Merge branch 'QA_4_7' 2017-06-06 13:59:18 +02:00
Manish Bisht
253c9bed0e Show warning for users removed from mysql.user table 
Fixes #12718

Signed-off-by: Manish Bisht <manish.bisht490@gmail.com>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-06 13:58:53 +02:00
Michal Čihař
a55d414cb1 Merge branch 'QA_4_7' 2017-06-06 13:49:20 +02:00
Michal Čihař
8a98c29700 Fixed natural sorting in several places 
Fixes #12976

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-06 13:48:49 +02:00
Peter Keller
3a9c2a9259 Fix to issue #12976 
Signed-off-by: Peter Keller <petekeller2@gmail.com>
 2017-06-06 13:46:27 +02:00
Michal Čihař
ae67d1c2a7 Improve rendering of table operations 
- Compact rendering of submit button in fieldsets
- Render lists as lists, it seems easier to read

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-06 13:19:01 +02:00
Michal Čihař
a3719dee91 Merge remote-tracking branch 'origin/pull/13352' 2017-06-06 11:21:26 +02:00
Michal Čihař
48d737cc69 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-06-06 11:19:24 +02:00
Michal Čihař
937c946cfe Merge branch 'QA_4_7' 2017-06-06 11:18:48 +02:00
Karl Van Iseghem
91808cca0c Tablename with special chars shown at triggers 
Fixes #13323
Fixes #13338

Signed-off-by: Karl Van Iseghem <karl.vaniseghem@icloud.com>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-06 11:18:24 +02:00
Michal Čihař
5231ac3e5f Merge pull request #13356 from mauriciofauth/index-lib 
Refactor index.lib function into static method
 2017-06-06 11:15:56 +02:00
Michal Čihař
306486634c Avoid removing token from URL 
It should not be there for any GET request.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-06 11:11:34 +02:00
Michal Čihař
e01319a742 Avoid manual construction of hidden inputs with token 
Issue #13355

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-06 11:10:34 +02:00
Michal Čihař
9ab34dbfd0 Remove unused pma_token js variable 
PMA_commonParams.get('token') is already used instead.

Issue #13355

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-06 11:09:10 +02:00
Michal Čihař
e8f3e0480d Merge branch 'QA_4_7' 2017-06-06 11:03:02 +02:00
Maurício Meneghini Fauth
e10c932133 Improve themes/.gitignore 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-06 11:02:54 +02:00
Michal Čihař
d9527dcf58 Merge pull request #13357 from mauriciofauth/templates/console 
Port console templates to Twig
 2017-06-06 11:02:03 +02:00