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

611 Commits

Author SHA1 Message Date
Madhura Jayaratne
19acb28444 Browser transformation and links for mysql and information_schema 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-26 11:56:51 +05:30
Marc Delisle
4458426aa7 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-22 16:01:32 -05:00
Madhura Jayaratne
b1056fc7d4 diagram variable does not have a method dieSchema() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-13 19:08:36 +05:30
Madhura Jayaratne
baa92b32f3 Revert "Remove more dead code" 
This reverts commit c1e220520e.
 2015-01-13 18:51:21 +05:30
Madhura Jayaratne
c1e220520e Remove more dead code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-13 18:18:11 +05:30
Madhura Jayaratne
c895b6147b Remove dead code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-13 18:10:10 +05:30
Madhura Jayaratne
a3477de69a Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-13 18:07:55 +05:30
Madhura Jayaratne
9524db89ce bug #4703 Unsaved schema page exported as pdf.pdf 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-13 18:00:13 +05:30
Madhura Jayaratne
3535ba8578 Fix comments for auto_increment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-09 13:15:49 +05:30
Madhura Jayaratne
373fc4f74c Indent foreign keys 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-09 12:55:15 +05:30
Madhura Jayaratne
d345556888 rfe #1525 Generate keys one per line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-09 12:54:38 +05:30
Madhura Jayaratne
743a528835 rfe #1590 Recaptcha API v2 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-08 15:49:24 +05:30
Hugues Peccatte
763707a72e Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-04 15:19:09 +01:00
Marc Delisle
6eb92ff103 Merge commit 'fc6be4a' 2015-01-04 07:11:47 -05:00
Hugues Peccatte
561ec7ea30 Remove code to ignore commit. 
Fix comment.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-03 21:39:56 +01:00
Hugues Peccatte
4330110c90 Revert "Fix #4645 Import of export created with mysqldump" 
This reverts commit 2dcb1c9b0a.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-03 19:53:09 +01:00
Marc Delisle
1c1c313d76 Merge branch 'QA_4_3' 2014-12-24 06:41:47 -05:00
Marc Delisle
77fec70ee8 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-24 06:40:18 -05:00
Madhura Jayaratne
e16ad76ebd Merge branch 'QA_4_3' 2014-12-24 11:55:32 +05:30
Madhura Jayaratne
32f1ac4211 bug #4670 CSV import reads both commas and values into first column after first row 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-24 11:52:20 +05:30
Madhura Jayaratne
f6b7f98322 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-23 10:43:54 -05:00
Madhura Jayaratne
0430ac6337 #4663 Export missing back ticks for order table name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-23 12:53:12 +05:30
Hugues Peccatte
2dcb1c9b0a Fix #4645 Import of export created with mysqldump 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-21 22:57:25 +01:00
Madhura Jayaratne
aba1d92362 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 16:50:22 +05:30
Madhura Jayaratne
7de549b7f3 bug #4639 Export SQL missing indentation first field 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 16:45:56 +05:30
Madhura Jayaratne
fedb566477 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 13:24:14 +05:30
Madhura Jayaratne
077916c82a bug #3794 failure to handle repeating empty columns when importing ODS 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 13:18:28 +05:30
Madhura Jayaratne
e048511e7f Merge branch 'QA_4_3' 2014-12-09 12:40:43 +05:30
Madhura Jayaratne
3eb3ce396b bug #4628 PHP error while exporting schema as PDF 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-09 12:36:52 +05:30
Marc Delisle
69052a0663 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-07 18:40:53 -05:00
Marc Delisle
f87458719e Merge branch 'QA_4_3' 2014-12-07 06:41:20 -05:00
Robert Scheck
d9468e3fff Bug #4623 Incomplete PHP OpenSSL support 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-07 06:37:15 -05:00
Madhura Jayaratne
478e781f1b Replace more instances of .live() and .die() with .on() and .off() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-04 18:33:37 +05:30
Marc Delisle
41c02abc41 Merge branch 'MAINT_4_3_0' into QA_4_3 2014-12-03 09:02:25 -05:00
Madhura Jayaratne
a4e8d008f4 bug #4611 [security] DOS attack with long passwords 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 08:50:14 -05:00
Michal Čihař
2ce7aa70c4 Move storing password/username after checking password 
The cookie encryption is quite expensive, so let's move it after we
check password validity.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-01 09:50:16 +01:00
Hugues Peccatte
e037f60015 Factorization. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-29 16:04:29 +01:00
Madhura Jayaratne
eb79ad9181 Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 11:09:04 +05:30
Madhura Jayaratne
ea7ca462e5 Document what these flags do 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 10:57:19 +05:30
Madhura Jayaratne
5e1ab952b8 Use a separate flag to avoid confusion 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 10:56:52 +05:30
Madhura Jayaratne
b92d3e1047 Workaround for token mismatch error on server session timeout for config and http authentication types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 10:56:28 +05:30
Marc Delisle
9e9d9c08c7 Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-26 07:46:06 -05:00
Marc Delisle
6f8a253daf Merge pull request #1407 from madhuracj/tokenMismatch 
Workaround for token mismatch error on server session timeout for config and http authentication types
 2014-11-26 07:42:46 -05:00
Madhura Jayaratne
090c10cccf Document what these flags do 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 09:39:16 +05:30
Madhura Jayaratne
5e3a4451e6 Use a separate flag to avoid confusion 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 08:41:33 +05:30
Marc Delisle
b38970d4ac Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-23 06:15:51 -05:00
Madhura Jayaratne
783cacbd1e Workaround for token mismatch error on server session timeout for config and http authentication types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-20 17:37:39 +05:30
Michal Čihař
8fc377d83a Share code for resetting IV size 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-20 10:27:01 +01:00
Michal Čihař
5f1a5a78bc Shared check for OpenSSL support 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-20 10:14:47 +01:00
Robert Scheck
491c426623 Patch by Robert Scheck <robert@fedoraproject.org> for phpMyAdmin 4.2.6 
which enhances cookie encryption/decryption by the optional usage of
PHP OpenSSL. Unfortunately PHP Mcrypt is not shipped by all Linux
distributions however PHP OpenSSL is often enabled by default.
PHP < 5.3.4 does not support passing an IV, thus this has been added as
a requirement. I could have used 'BF-CBC' rather 'AES-128-CBC' but Blowfish
(even it is fast) is seen by experts as weaker algorithm than
AES. If this should be a show-stopper for upstream merging just replace
'AES-128-CBC' by 'BF-CBC', please.

Patch adapted for 4.3.x and tests modified by Marc Delisle

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-19 07:38:32 -05:00