gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
107,128 Commits 12 Branches 481 Tags 2.4 GiB
138c204cb9
Commit Graph

107128 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
138c204cb9 Merge branch 'QA_4_6' 2016-09-06 12:45:41 +02:00
Michal Čihař
f3cd949738 Changelog for issue #12470 
Fix possible race condition in setting URL hash

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-06 12:45:25 +02:00
Michal Čihař
8ebc43ebc1 Merge pull request #12541 from sudheesh001/QA_4_6 
Fixes #12470 Stores tab_id hash into a variable instead of location.hash
 2016-09-06 12:44:44 +02:00
Sudheesh Singanamalla
40d9d82840 Fixes #12470 Stores tab_id hash into a variable instead of location.hash 
Signed-off-by: Sudheesh Singanamalla <sudheesh1995@outlook.com>
 2016-09-06 15:28:46 +05:30
Michal Čihař
2963740451 Merge branch 'QA_4_6' 2016-09-06 11:34:02 +02:00
Michal Čihař
6c9c8a83d0 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-09-06 11:33:45 +02:00
Michal Čihař
3debfa5d1f Merge branch 'QA_4_6' 2016-09-06 11:33:32 +02:00
Michal Čihař
9df5aebc22 Changelog entry for #12531 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-06 11:33:03 +02:00
Weblate
5e15a2b054 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-09-06 11:32:00 +02:00
Sevdimali İsa
954ebe9cbc Translated using Weblate (Azerbaijani) 
Currently translated at 52.4% (1680 of 3206 strings)

[CI skip]
 2016-09-06 11:31:57 +02:00
Michal Čihař
28c981dd31 Merge pull request #12532 from devenbansod/fix_12531 
Fix #12531 : Properly flag queries as DROP DATABASE
 2016-09-06 11:31:53 +02:00
Deven Bansod
715403c0e7 Fix #12531 : Properly flag queries as DROP DATABASE 
Parser recognizes various DROP statements correctly, but the flags set by SQL Parser are incorrectly used.
In js/functions.js, removed the Regex-based matching, rather handle it in PHP as we have correct flags available from SQL Parser

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-06 14:20:19 +05:30
Michal Čihař
92cb95c6d5 Fix other places of wrong value for # in tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-06 10:24:04 +02:00
Deven Bansod
b1d0589b51 Fix numeric errors 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-06 10:04:05 +02:00
Michal Čihař
eb233da10a Set reasonable mock value for tests 
Set integer where we do a COUNT() SQL.

See also #12539

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-06 10:00:14 +02:00
Michal Čihař
7cb6830ec8 Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-06 09:51:45 +02:00
Weblate
477acc6321 Merge remote-tracking branch 'origin/master' 2016-09-06 09:49:06 +02:00
Sevdimali İsa
46305f3386 Translated using Weblate (Azerbaijani) 
Currently translated at 52.0% (1675 of 3219 strings)

[CI skip]
 2016-09-06 09:49:02 +02:00
Michal Čihař
f23c0b9db9 Set correct Uptime value for tests 
MySQL returns this as integer, so we should do the same for tests.

See also #12539

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-06 09:48:38 +02:00
Deven Bansod
ea5cc4a028 Merge branch 'QA_4_6' 2016-09-05 23:00:24 +05:30
Deven Bansod
6bcc593c84 Fix 'Unsupported query' message from Travis logs 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-05 23:00:12 +05:30
Michal Čihař
e52ceecb3d Ensure font size is integer, we do further calculations with it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-05 18:46:01 +02:00
Michal Čihař
a1ff9aaa9d Merge branch 'QA_4_6' 2016-09-05 18:01:15 +02:00
Michal Čihař
d15f505dfd Add PHP 7.1.0RC1 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-05 18:01:08 +02:00
Balázs Úr
934c740c2c Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3206 of 3206 strings)

[CI skip]
 2016-09-05 18:00:46 +02:00
Balázs Úr
d008580ce5 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-09-05 18:00:34 +02:00
Balázs Úr
0a7d3afd27 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3206 of 3206 strings)

[CI skip]
 2016-09-04 20:17:23 +02:00
Deven Bansod
288b8fdcaa Merge branch 'QA_4_6' 2016-09-04 20:36:28 +05:30
Deven Bansod
2a2d6d8bd6 Fix #12534: Remove option from after_field select after a column is dropped 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-04 20:34:36 +05:30
Deven Bansod
17eda5b968 ChangeLog entry for #12523 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-03 09:55:33 +05:30
Michal Čihař
abbce3ad3d Merge branch 'QA_4_6' 2016-09-02 16:25:17 +02:00
Michal Čihař
e803caed71 Use single quotes in PHP code 
Fixes #12405

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 16:23:21 +02:00
Michal Čihař
bf96f3a21d Merge branch 'QA_4_6' 2016-09-02 16:02:22 +02:00
Michal Čihař
4852e9b070 Perform logout using POST method 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 16:00:48 +02:00
Deven Bansod
3179594220 Variable to be passed by reference should be explicitly defined 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-02 19:05:10 +05:30
Deven Bansod
02fe5205e5 ChangeLog entries for #12474 and #12494 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-02 18:40:47 +05:30
Weblate
2e58cf0105 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-09-02 14:41:00 +02:00
Jozef Pistej
beda3204d5 Translated using Weblate (Slovak) 
Currently translated at 83.4% (2675 of 3206 strings)

[CI skip]
 2016-09-02 14:40:59 +02:00
Michal Čihař
48b44fcf91 Translated using Weblate (Russian) 
Currently translated at 98.1% (3153 of 3213 strings)

[CI skip]
 2016-09-02 14:40:59 +02:00
Michal Čihař
4e36c5bd0c Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-09-02 14:40:50 +02:00
Michal Čihař
aee8184faf Merge branch 'QA_4_6' 2016-09-02 14:40:23 +02:00
Michal Čihař
e01f404804 Remove unused variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 14:40:18 +02:00
Michal Čihař
bfd6a76819 Merge branch 'QA_4_6' 2016-09-02 14:39:45 +02:00
Michal Čihař
829d51c9dd Treat hide_location error as user ones 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 14:38:52 +02:00
Michal Čihař
eb3e3b73c3 Simplified handling of connection errors 
There is no need to retrigger errors, just let the handler know to
handle them without backtrace.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 14:35:36 +02:00
Michal Čihař
2251ca21c0 Fix regexp for file path cleanup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 14:25:04 +02:00
Michal Čihař
cb3f2632a9 Properly escape session startup errors 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 14:23:35 +02:00
Michal Čihař
4305f6e503 Merge pull request #12522 from sudheesh001/Issue-12509 
Fixes #12509 Removes unused function PMA_addJSVar
 2016-09-02 13:34:46 +02:00
Michal Čihař
761281f70c Logout only on POST request 
Issue #12524

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 13:34:17 +02:00
Weblate
44d2784248 Merge remote-tracking branch 'origin/master' 2016-09-02 13:32:37 +02:00