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

107101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michal Čihař
2a7889a936 Translated using Weblate (Russian) 
Currently translated at 97.2% (3132 of 3219 strings)

[CI skip]
 2016-09-02 13:32:36 +02:00
Michal Čihař
2d666f0c3e Merge pull request #12524 from devenbansod/fix_token_errors 
Check for token mismatches only if it's a POST request
 2016-09-02 13:32:29 +02:00
Deven Bansod
9c1cfc8553 Check for Token mismatches only if it's a POST request 
Checking for Token mismatches for GET requests does not make sense
because they don't contain the Token parameter

We remove all parameters from POST request in case of token mismatch

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-02 16:46:28 +05:30
Michal Čihař
84a4434ad9 Fix format strings 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 11:46:24 +02:00
Deven Bansod
bf25be1ac3 Fix more Token mismatches in tbl_operations.js 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-02 15:06:47 +05:30
Deven Bansod
7b61c7f413 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2016-09-02 14:13:55 +05:30
Deven Bansod
a41776d6a1 Some more Token mismatch errors in tbl_ scripts, Issue #12523 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-02 14:13:26 +05:30
Deven Bansod
857be4efdf Some more Token mismatch errors, Issue #12523 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-02 14:03:51 +05:30
Deven Bansod
4977f142f1 Fix token mismatch errors in replication and routines 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-02 13:43:08 +05:30
Deven Bansod
33f97474b2 Add token parameter POST requests in indexes.js, navigation.js 
Issue #12523

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-02 12:31:34 +05:30
Weblate
68012b0ab4 Merge remote-tracking branch 'origin/master' 2016-09-02 08:59:52 +02:00
CHINONSO
9a943d464d Translated using Weblate (Igbo) 
Currently translated at 2.3% (76 of 3219 strings)

[CI skip]

Gbasara ohere Reference System nchọpụta
 2016-09-02 08:59:50 +02:00
Deven Bansod
d46a5f5863 Check if '@' exists before exploding over it and assuming it exists always 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-02 11:55:05 +05:30
CHINONSO
a8945a7b43 Translated using Weblate (Igbo) 
Currently translated at 1.4% (46 of 3219 strings)

[CI skip]
 2016-09-01 19:10:52 +02:00
Deven Bansod
df19f9e17a Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2016-09-01 18:41:27 +05:30
Deven Bansod
eb27081a50 Use appropriate name 'params' instead of 'data' 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-01 18:16:29 +05:30
Deven Bansod
9bae7ddc74 Use appropirate name 'params' instead of 'data' 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-01 14:41:24 +05:30
Deven Bansod
18dbcba02d Fix 'Token mismatch' in deleting tracking from db_tracking 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-01 14:36:18 +05:30
Sudheesh Singanamalla
2833c6b324 Fixes #12509 Removes unused function PMA_addJSVar 
Signed-off-by: Sudheesh Singanamalla <sudheesh1995@outlook.com>
 2016-09-01 12:28:16 +05:30
Weblate
c9524984f7 Merge remote-tracking branch 'origin/master' 2016-09-01 08:58:07 +02:00
Deven Bansod
917d9581b7 Fix 'Token mismatch' in drop and truncating a table from db_structure 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-01 12:30:49 +05:30
Jozef Pistej
31676321c6 Translated using Weblate (Slovak) 
Currently translated at 82.8% (2668 of 3219 strings)

[CI skip]
 2016-09-01 08:58:06 +02:00
Deven Bansod
8d65036a09 Fix 'Token mismatch' in db_search 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-01 12:21:35 +05:30
Deven Bansod
a40a948d26 Fix 'Token mismatch' in Drop Database 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-01 11:59:05 +05:30
Deven Bansod
51c04bcaec Remove unneeded debugging statements 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-01 11:45:34 +05:30
Michal Čihař
f4d37041b8 Translated using Weblate (Igbo) 
Currently translated at 0.6% (21 of 3219 strings)

[CI skip]
 2016-08-30 16:12:11 +02:00
Weblate
9fbe896d48 Merge remote-tracking branch 'origin/master' 2016-08-30 15:53:52 +02:00