gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,086 Commits 12 Branches 481 Tags 2.4 GiB
42cbf101b2
Commit Graph

110086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Giovanni Sora
42cbf101b2 Translated using Weblate (Interlingua) 
Currently translated at 75.5% (2425 of 3211 strings)

[CI skip]
 2017-06-28 16:16:53 +02:00
Michal Čihař
157dc8d162 Merge branch 'QA_4_7' 2017-06-28 16:06:41 +02:00
Michal Čihař
a78b963025 Changelog entry for #12944 and #13317 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 16:02:26 +02:00
Michal Čihař
0ded26965b Merge pull request #13317 from manishbisht/json-editor 
JSON data shown in JSON format while editing
 2017-06-28 17:01:26 +03:00
Weblate
1bc5f1fc5c Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-06-28 15:44:28 +02:00
Viktar Vauchkevich
a586ca7a24 Translated using Weblate (Belarusian) 
Currently translated at 63.2% (2027 of 3203 strings)

[CI skip]
 2017-06-28 15:44:24 +02:00
Michal Čihař
688143af8f Merge branch 'QA_4_7' 2017-06-28 15:44:03 +02:00
Michal Čihař
3e6f5f1847 Merge branch 'QA_4_7' of github.com:phpmyadmin/phpmyadmin into QA_4_7 2017-06-28 15:43:47 +02:00
Weblate
ef6085d551 Merge remote-tracking branch 'origin/master' 2017-06-28 15:42:13 +02:00
Viktar Vauchkevich
b397b40b1b Translated using Weblate (Belarusian) 
Currently translated at 63.3% (2034 of 3211 strings)

[CI skip]
 2017-06-28 15:42:08 +02:00
Michal Čihař
4ee38fe8d0 Merge branch 'QA_4_7' 2017-06-28 15:41:55 +02:00
Michal Čihař
49c963542d Add tests for both paths in curl 
Test both CURLOPT_CAPATH and URLOPT_CAINFO setup.

Fixes #13398

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 15:41:47 +02:00
Weblate
a2d71c5d24 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-06-28 15:21:04 +02:00
Burak Yavuz
19fe294049 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3203 of 3203 strings)

[CI skip]
 2017-06-28 15:21:03 +02:00
George Bezerra
b6666e4bc0 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3203 of 3203 strings)

[CI skip]
 2017-06-28 15:21:02 +02:00
Michal Čihař
0ceda63d9d Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-06-28 15:21:00 +02:00
Michal Čihař
1c247ce4ff Merge branch 'QA_4_7' 2017-06-28 15:20:33 +02:00
Michal Čihař
6a86026eac Correctly escape column name when sorting 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 15:20:29 +02:00
George Bezerra
10ae12b900 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2017-06-28 15:17:56 +02:00
Michal Čihař
d639308f48 Share code for sort interactions 
See issues #13330 and #13270

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 15:14:36 +02:00
Michal Čihař
1f7f44c0c0 Merge remote-tracking branch 'origin/pull/13330' 2017-06-28 15:00:02 +02:00
Michal Čihař
58d966360e Avoid changing cursor on hover 
It really makes no sense as it is used only in hover.

See #13332

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 13:16:54 +02:00
Michal Čihař
024d53ab78 Remove not needed escaping (see #13332) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 13:16:41 +02:00
Michal Čihař
1c8fa3cb51 Merge remote-tracking branch 'origin/pull/13332' 2017-06-28 13:10:04 +02:00
Michal Čihař
a8854fa320 Fix tests for changed captcha message 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 12:20:12 +02:00
Michal Čihař
630cfd134e Changelog entry for #12979 and #13095 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 12:15:56 +02:00
Michal Čihař
30ecfb6236 Merge pull request #13095 from MemnoCh242/fix_table_layout 
fix vertical alignment in table cell layout. Fixes #12979
 2017-06-28 13:15:06 +03:00
Michal Čihař
d1c1c8bc0c Add changelog for #12948 and #13093 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 12:13:40 +02:00
mohdluqman
32af52a858 Fixed time selection for TIME type (#13093) 
TIME type in MySql supports a long range of values. The PMA insert
widget don't allow the values greater than 23 currently. So, it is
corrected by setting the timepicker function have a greater hourMax
value than it have by default.

Fixes #12948

Signed-off-by: Mohammad Luqman <me@mohdluqman.com>
 2017-06-28 13:12:18 +03:00
Michal Čihař
153fefb52b Improved rendering of server variables table 
Several improvements to make it look better on various screen sizes:

- remove fixed layout of table, that makes it consume too much space for
  some fields
- remove using float inside the table, it is not necessary
- make the values left aligned
- allow to wrap long values

Fixes #12899

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 12:08:06 +02:00
Burak Yavuz
153e77fa0b Translated using Weblate (Turkish) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2017-06-28 11:44:28 +02:00
Michal Čihař
7d1b0ca1ed Improved error reporting for reCAPTCHA 
Better detect errors coming from ReCaptcha library:

- invalid-json usually means that server side connection has failed
- lack of response usually means that client side connection has failed

Fixes #13058
Fixes #13071

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 11:35:15 +02:00
Michal Čihař
90f22ec3b7 Remove no longer used code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 11:17:49 +02:00
Michal Čihař
f87d51b1dc Changelog entry for #13086 and #13101 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 11:05:18 +02:00
Michal Čihař
daf44c8d1e Merge pull request #13101 from manishbisht/google-recaptcha-upgrade 
upgraded google recpatcha with google invisble recaptcha
 2017-06-28 12:03:57 +03:00
Michal Čihař
b846157d18 Merge pull request #13407 from jublonet/feature/grid-editor-null-checkbox 
Make grid editor NULL checkbox text clickable
 2017-06-28 11:51:39 +03:00
Michal Čihař
d540e3a284 Merge branch 'QA_4_7' 2017-06-28 10:50:30 +02:00
Michal Čihař
1e1bc20f7c Document change for #13189 and #13364. 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 10:50:25 +02:00
Michal Čihař
c97210c9e4 Merge pull request #13364 from nijel/import-timeout-url 
Rewrite URL constructing during import
 2017-06-28 11:48:50 +03:00
Michal Čihař
63e0b5f8f9 Merge branch 'QA_4_7' 2017-06-28 10:47:38 +02:00
Michal Čihař
bf3c6c6145 Merge remote-tracking branch 'origin/pull/13402' into QA_4_7 2017-06-28 10:47:32 +02:00
Michal Čihař
fc5bcc008e Merge branch 'QA_4_7' 2017-06-28 10:44:49 +02:00
Michal Čihař
3933869cbf Merge pull request #13413 from remicollet/issue-php72 
fix brackets
 2017-06-28 11:41:32 +03:00
Remi Collet
49fecb8427 fix brackets 
Signed-off-by: Remi Collet <remi@php.net>
 2017-06-28 10:34:35 +02:00
Michal Čihař
5a0836262b Merge branch 'QA_4_7' 2017-06-28 10:23:21 +02:00
Michal Čihař
fc1de9cab2 Translated using Weblate (Arabic) 
Currently translated at 34.3% (1103 of 3211 strings)

[CI skip]
 2017-06-28 10:21:12 +02:00
Michal Čihař
946d3d159d Translated using Weblate (Arabic) 
Currently translated at 34.6% (1109 of 3203 strings)

[CI skip]
 2017-06-28 10:21:05 +02:00
Michal Čihař
75ab376804 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 09:59:11 +02:00
Michal Čihař
bbfa387123 Merge branch 'QA_4_7' 2017-06-28 09:58:45 +02:00
Michal Čihař
7bc247f2e8 Merge commit 'b9f1eb029642852d2fca0fc4540294e69e86b5db' 2017-06-28 09:58:37 +02:00