gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108,904 Commits 12 Branches 481 Tags 2.4 GiB
26ff0c7b5a
Commit Graph

108904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
26ff0c7b5a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-02-13 16:00:10 +01:00
Michal Čihař
28339ec22d Merge branch 'QA_4_7' 2017-02-13 15:59:54 +01:00
Michal Čihař
28cf3578e1 Merge remote-tracking branch 'origin/QA_4_7' 2017-02-13 15:59:50 +01:00
Michal Čihař
87a2953b78 Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 15:59:36 +01:00
Michal Čihař
3d8e4b74d0 Fix GIS tests 
- correct order of parameters for assertEquals
- fix expectations for zero values

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 15:58:58 +01:00
Weblate
b36fbd243e Merge remote-tracking branch 'origin/master' 2017-02-13 15:32:25 +01:00
Yungu Kim
b809ee3f8d Translated using Weblate (Korean) 
Currently translated at 81.9% (2622 of 3199 strings)

[CI skip]
 2017-02-13 15:32:24 +01:00
Michal Čihař
46434c1f69 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-02-13 15:32:10 +01:00
Weblate
0738c2f7e5 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-13 15:31:55 +01:00
Yungu Kim
45c6fb1ab7 Translated using Weblate (Korean) 
Currently translated at 81.9% (2622 of 3199 strings)

[CI skip]
 2017-02-13 15:31:53 +01:00
Michal Čihař
7f8e401294 Merge branch 'QA_4_7' 2017-02-13 15:31:41 +01:00
Michal Čihař
45afdc84ed Merge remote-tracking branch 'origin/QA_4_7' 2017-02-13 15:31:35 +01:00
Michal Čihař
58472a97d2 Fixed javascript error on 3NF normalization 
Fixes #12927

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 15:30:51 +01:00
Michal Čihař
7da83511ec Do not use deprecated jQuery functionality 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 15:24:25 +01:00
Weblate
b7b2d804d9 Merge remote-tracking branch 'origin/master' 2017-02-13 15:08:52 +01:00
Yungu Kim
dee950a75e Translated using Weblate (Korean) 
Currently translated at 81.0% (2592 of 3199 strings)

[CI skip]
 2017-02-13 15:08:51 +01:00
Michal Čihař
36c7e76285 Merge branch 'QA_4_7' 2017-02-13 15:08:39 +01:00
Michal Čihař
f33a7d89fa Merge commit '6eede38ac158495a4f13e7d2417cc444e40bd787' 2017-02-13 15:08:34 +01:00
Weblate
8cc1232063 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-13 15:07:38 +01:00
Yungu Kim
55ca7bb3a3 Translated using Weblate (Korean) 
Currently translated at 81.0% (2592 of 3199 strings)

[CI skip]
 2017-02-13 15:07:37 +01:00
Michal Čihař
dda0d8b69d Load server stats queries scripts in order 
We can not load first script which uses later one.

Fixes #12934

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 15:06:13 +01:00
Weblate
1dfd5a93d5 Merge remote-tracking branch 'origin/master' 2017-02-13 15:03:22 +01:00
Yungu Kim
8203e1b1c1 Translated using Weblate (Korean) 
Currently translated at 80.9% (2589 of 3199 strings)

[CI skip]
 2017-02-13 15:03:20 +01:00
Michal Čihař
274f1da99f Merge branch 'QA_4_7' 2017-02-13 15:02:56 +01:00
Weblate
6eede38ac1 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-13 15:01:24 +01:00
Yungu Kim
6f9b505b1a Translated using Weblate (Korean) 
Currently translated at 80.9% (2588 of 3199 strings)

[CI skip]
 2017-02-13 15:01:22 +01:00
Michal Čihař
bca2e1c588 Use standard way for getting token value in designer 
This way we share code with rest of phpMyAdmin, not building it again.

Fixes #12804

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 15:00:11 +01:00
Michal Čihař
a083a4c839 Fixed manipulation with GIS data having zero coordinates 
Another example when using PHP's empty() leads to problems.

Fixes #12957

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 14:44:47 +01:00
Michal Čihař
522c0598fa Sort column names as well 
Fixes #12941

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 14:17:20 +01:00
Michal Čihař
8f611f05cf Fixed rendering of foreign key browsing 
Fixes #12985

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 13:51:13 +01:00
Weblate
287e384cf2 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-13 12:54:00 +01:00
Fujiwara Software
0f8ee2a630 Translated using Weblate (Japanese) 
Currently translated at 71.2% (2278 of 3199 strings)

[CI skip]
 2017-02-13 12:53:59 +01:00
Michal Čihař
cc68f8d147 Merge branch 'QA_4_7' 2017-02-13 12:53:47 +01:00
Michal Čihař
d54061d1f8 Include token in hidden fields 
This will fix few broken users:

- error reporting
- table search in navigation
- user preferences

Fixes #12964

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 12:53:36 +01:00
Weblate
881b7daa03 Merge remote-tracking branch 'origin/master' 2017-02-13 12:32:31 +01:00
Fujiwara Software
7011eca6c1 Translated using Weblate (Japanese) 
Currently translated at 71.2% (2278 of 3199 strings)

[CI skip]
 2017-02-13 12:32:29 +01:00
Michal Čihař
a58df231b0 Merge pull request #12989 from jublonet/feature/fix-checkall-spacing 
Remove trailing spacing for Check all link text
 2017-02-13 12:32:21 +01:00
Michal Čihař
eff9cc26e6 Merge branch 'QA_4_7' 2017-02-13 12:24:52 +01:00
Michal Čihař
fc1c784a43 Changelog entry for #12922 and #12933 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 12:24:20 +01:00
Michal Čihař
0cba123659 Specify sorting order 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 12:23:46 +01:00
Piyush Agrawal
82429cd01c ascending order of bookmarks list 
Signed-off-by: Piyush Agrawal <poush12@gmail.com>
 2017-02-13 12:22:11 +01:00
Michal Čihař
0038245ec8 Improved rendering of new version information 
- remove extra space in from of new version information
- add space between sentence and new version

Fixes #12981

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 11:56:36 +01:00
Michal Čihař
baa390df89 Fixed error when loading favorite tables to console 
The token was missing in POST request.

Fixes #12990

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 11:34:57 +01:00
Michal Čihař
bcc7c7af35 Allow secure.php.net in url redirector 
Fixes #12993

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-13 11:30:42 +01:00
Weblate
5eddd3af11 Merge remote-tracking branch 'origin/master' 2017-02-13 11:25:24 +01:00
Domen
e083908743 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
 2017-02-13 11:25:23 +01:00
tmtisfree
7cd56fa7a4 Translated using Weblate (French) 
Currently translated at 99.3% (3177 of 3199 strings)

[CI skip]
 2017-02-13 11:25:21 +01:00
Michal Čihař
e1c0084ad7 Merge branch 'QA_4_7' 2017-02-13 11:25:07 +01:00
Michal Čihař
094afae6cc Merge commit '924aabf652f35a35ccfe66a6fa706bb434282081' 2017-02-13 11:24:55 +01:00
Michal Čihař
901784b3b8 Merge commit '3a21b99e63ca715ed2ad2d1b772d50ea9bd7abdf' 2017-02-13 11:24:44 +01:00