1
0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-31 10:54:46 +03:00
Commit Graph

206 Commits

Author SHA1 Message Date
Marc Delisle
836529be42 Fix merge conflicts 2013-07-28 05:55:40 -04:00
Dieter Adriaenssens
e0c8704f72 [security] Fix stored XSS in link transformation plugin, see PMASA-2013-13 2013-07-28 02:26:26 +02:00
Marc Delisle
77e67c3f2c - bug #4019 Create database if not exists (export): add an option to the
interface to enable generating CREATE DATABASE and USE (false by default)
2013-07-19 09:09:24 -04:00
Marc Delisle
90d968b447 Fix merge conflicts 2013-07-17 15:18:09 -04:00
Dieter Adriaenssens
d0c0d0d207 fix typo 2013-06-24 13:29:36 +02:00
Michal Čihař
85e5a3b5ce bug #3645 Better handling of invalid ODS documents 2013-06-11 14:58:02 +02:00
Kari Söderholm
0181fa9400 Fix regression: Missing removeCRLF option in ExportCsv and ExportExcel plugins. 2013-06-10 12:57:27 -04:00
Marc Delisle
ec6a47d8a0 bug #3957 Cookies must be enabled past this point 2013-05-28 08:46:04 -04:00
Marc Delisle
078da8d57f bug #3933 Do not translate "Open Document" in export settings 2013-05-23 02:54:47 -04:00
Madhura Jayaratne
b3e6f8cee7 bug #3924 Show warning when CSV file does not contain data for all columns 2013-05-20 17:50:19 +05:30
Marc Delisle
e72f1a0daa Merge pull request #395 from ayusun/exportsqlupdate
creating database while exporting at database level
2013-05-20 05:08:21 -07:00
Marc Delisle
9b61212b48 bug #3946 Missing CSV import option "Do not abort on INSERT error" 2013-05-19 08:44:45 -04:00
ayusun
d8b9a0b28c creating database while exporting at database level 2013-05-16 20:52:50 +05:30
Marc Delisle
920d827c37 Merge pull request #379 from mynetx/bug-3907
Fix most analysis results discovered in bug 3907
2013-05-15 09:52:03 -07:00
ayusun
25e71b71da Bug fix #3910 with updated code indentation 2013-05-14 22:40:39 +05:30
ayusun
44dd0e8405 Bug fix 3910. Updated Export plugin to support zero rows 2013-05-13 15:16:46 +05:30
J.M
529903e0dd Fix bug #3907 undefined variables, function parameter problems
Thanks Rasmus Lerdorf for analyzing!
2013-05-13 11:27:56 +02:00
Marc Delisle
4113d9e98b bug #3915 Import of CSV file (Replace table data with file) with duplicate values 2013-05-12 08:09:02 -04:00
J.M
e25bba8bcc Fix notice Undefined index: old_usr in AuthenticationHttp.class.php:162 2013-04-28 17:29:50 +02:00
J.M
4fa8633474 Add rfe #1421 Add retry button on connection failure with config auth 2013-04-28 12:31:21 +02:00
J.M
459b2807fd Correct welcome message horizontal alignment for config auth 2013-04-28 12:00:11 +02:00
Madhura Jayaratne
5ff9e989b7 Merge pull request #267 from kasunchathuranga/Bug3879
Fix bug #3879 Import broken for CSV using LOAD DATA
2013-04-25 08:14:45 -07:00
Marc Delisle
ac65210a28 Typo in input field name 2013-04-24 14:41:57 -04:00
Kasun Chathuranga
edbe925d8a Minimize code duplication by pushing most of the common code to abstract parent class's setProperties() method 2013-04-19 23:00:22 +05:30
Kasun Chathuranga
175cb7b0ae Fix format specific options that were missing from ImportLdi plugin. Common code pulled out to AbstractImportCsv.class.php. 2013-04-18 22:44:49 +05:30
Kasun Chathuranga
4477494216 Importing CSV was also broken 2013-04-17 23:25:53 +05:30
Kasun Chathuranga
06655bf45d Fix bug #3879 Import broken for CSV using LOAD DATA 2013-04-17 23:25:16 +05:30
Marc Delisle
29b297f41f Fix bug "#3853 Blowfish implementation might be broken" by replacing the
library with phpseclib

I could not make PMA_blowfish_test.php work with the new library.
2013-04-01 07:04:25 -04:00
Marc Delisle
7b7abce116 Clarify the logic 2013-04-01 06:44:42 -04:00
Madhura Jayaratne
b3db1f0d6f Change mysqlDie() to return the error message when $exit parameter is false 2013-03-28 17:34:40 +05:30
Marc Delisle
f138f8b385 Fix fatal error in PHP 5.2 2013-02-08 07:09:49 -05:00
Michal Čihař
b3a317da78 bug #3519 [export] Prevent infinite recursion in PDF export. 2013-02-07 12:16:13 +01:00
Michal Čihař
22dfaaf622 bug #2951 [export] Correctly export decimal fields. 2013-02-07 11:49:43 +01:00
Dieter Adriaenssens
2683f32033 Temporary workaround for bug #3783 :
Calling a method from a variable class is not possible before PHP 5.3.
2013-02-06 16:56:01 +01:00
Gemorroj
fc51a91713 many some minor fixes (sorry, see diff) 2013-01-26 15:35:29 +03:00
Dieter Adriaenssens
688642560d use 'self' when calling static methods 2013-01-26 00:20:57 +01:00
Dieter Adriaenssens
f14aef2866 remove unused variables 2013-01-24 17:31:06 +01:00
Dieter Adriaenssens
87a70c8843 improve coding style 2013-01-21 13:37:45 +01:00
Michal Čihař
54b2540d87 Use ellipsis where appropriate 2013-01-10 13:33:29 +01:00
Michal Čihař
7207a4ebac Avoid double exporting of structure
Debian bug #670734
2013-01-09 12:58:51 +01:00
J.M
49771711fe After session expiry and re-login, bring user back to the page they were on. See issue #125 2012-12-27 19:33:48 +01:00
J.M
18d2463b41 Show login link in error message on cookie or session expiry 2012-12-27 16:06:09 +01:00
Marc Delisle
95fa48fc8e Remove remaining code in tbl_alter.php 2012-12-18 15:44:39 -05:00
Rouslan Placella
f730b7745d Improve response for failed http login 2012-11-26 23:08:15 +00:00
Rouslan Placella
bc9e81aa14 Fixed broken logout functionality got http auth 2012-11-26 22:56:37 +00:00
Michal Čihař
61a601fc73 Implement linking to new documentation 2012-11-12 09:48:05 +01:00
Dieter Adriaenssens
a040717237 tell importplugin function not to load XmlExport 2012-11-08 16:43:35 +01:00
Michal Čihař
3c68a0b020 Merge pull request #104 from roccivic/drop-dead-code
Dropped dead code
2012-11-07 07:02:48 -08:00
Rouslan Placella
03561b892c Dropped dead code 2012-11-05 22:19:18 +00:00
Rouslan Placella
ece1ae6b17 Fixed bug #3583343 - Incorrect page after expired session 2012-11-05 22:10:39 +00:00