gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,546 Commits 12 Branches 481 Tags 2.4 GiB
3363f10880
Commit Graph

518 Commits

Author SHA1 Message Date
Hugues Peccatte
3363f10880 Rename ImportSQL method. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-20 21:06:17 +02:00
Hugues Peccatte
74f0beda8f Fix syntax error. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-20 20:56:12 +02:00
Marc Delisle
9680410019 Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-19 10:13:07 -04:00
Hugues Peccatte
4b9058faa9 Manage escaped quotes. 
Improve process not to look for the same thing many times.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-18 23:57:54 +02:00
Hugues Peccatte
d936df12d2 Manage option to read SQL as a multibytes string or not. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-18 20:31:54 +02:00
Marc Delisle
3ec96cb038 Remove unused code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-18 08:31:26 -04:00
Madhura Jayaratne
ae148f37e6 Merge branch 'QA_4_2' 2014-10-17 13:16:45 +05:30
Madhura Jayaratne
bdd76f18ce bug #4259 reCaptcha sound session expired problem 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 13:14:28 +05:30
Marc Delisle
bc7d57f613 The minimum supported MySQL version is 5.5 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-16 13:32:15 -04:00
Hugues Peccatte
2da2c4caf6 Reduce size of data to read. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-12 18:51:02 +02:00
Hugues Peccatte
713a4ef901 Execute query. 
Remove trace.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-12 18:45:43 +02:00
Hugues Peccatte
3f9b63f572 Improve SQL reading. 
Remove trace.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-12 18:36:54 +02:00
Hugues Peccatte
5cfefb8f82 Fix comment read. 
Improve loops.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-10 22:20:33 +02:00
Hugues Peccatte
389763e16e Test to parse SQL in a different way. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-08 22:15:40 +02:00
Hugues Peccatte
70a21ec25c Merge from master. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-08 21:49:37 +02:00
Madhura Jayaratne
e93e128510 Port 'bug #3120 Events are not exported when using xml' to QA_4_2 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 19:23:39 +05:30
Madhura Jayaratne
3ea2e7d81f rfe #3120 Events are not exported when using xml 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 18:30:10 +05:30
Hugues Peccatte
9ca79b379d Replace mb functions by standard string functions. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-05 14:15:42 +02:00
Madhura Jayaratne
f96841ebf4 Merge branch 'QA_4_2' 2014-10-02 11:44:45 +05:30
Madhura Jayaratne
43ec83fbda bug #4259 reCaptcha sound session expired problem 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-02 11:42:44 +05:30
Hugues Peccatte
53e0d9b79b Cast date split. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-01 22:13:40 +02:00
Hugues Peccatte
fe7b5bb23d Replace uses of string iterators by use of mb_substr. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-30 22:05:50 +02:00
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls. 
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-28 20:53:01 +02:00
Marc Delisle
cd2225c997 Merge branch 'QA_4_2' 2014-09-27 09:14:31 -04:00
Marc Delisle
deea8c6946 bug in PDF export: title not present in PDF 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-27 08:39:00 -04:00
Hugues Peccatte
73d376d14a Remove old @todo. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-20 20:17:44 +02:00
Hugues Peccatte
d510e19e77 Fix 14528: Fix SQL import. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-16 22:23:42 +02:00
Hugues Peccatte
e85eddb01f Fix #4528 Can't import dump via SQL field 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-13 23:10:57 +02:00
Smita Kumari
42223e1bf6 avoid session timeout when user is active FR#1529 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-09-13 03:10:40 +05:30
Hugues Peccatte
70366f31c1 Move method definition. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 17:09:48 +02:00
Hugues Peccatte
d4bbde9ec5 Make Scrutinizer happier. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 17:05:00 +02:00
Hugues Peccatte
fe452a7240 Make Scrutinizer happier. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 13:56:42 +02:00
Hugues Peccatte
767b45380c Merge branch 'master' into securityStringSquash 2014-09-06 11:48:24 +02:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 10:44:03 +02:00
Marc Delisle
800dc32e23 Remove useless code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-31 10:44:27 -04:00
Marc Delisle
7c74053c15 Remove dead assignments 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-29 13:04:57 -04:00
Marc Delisle
208adc20ee Merge commit '5f2adcb' 2014-08-29 12:03:40 -04:00
Ashutosh Dhundhara
5f2adcb9ca Bug #4527: Importing ODS files with column names having trailing spaces fails. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-29 20:39:34 +05:30
Marc Delisle
31c1f6e70f Merge commit 'fed4664' 2014-08-28 12:36:53 -04:00
Smita Kumari
fed466498e update bug fix #4487 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-28 21:12:04 +05:30
Marc Delisle
8e9f1bec21 Merge commit '83e90ae' 2014-08-27 12:55:07 -04:00
Smita Kumari
83e90ae1a0 bug fix #4487 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-27 19:12:27 +05:30
Madhura Jayaratne
b5e87c6281 Use page number in filename 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-24 08:36:39 +05:30
Madhura Jayaratne
86ba7a95c0 Append page number to file name only if it is set 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-24 08:32:38 +05:30
Madhura Jayaratne
36f7b18ee1 Align docs 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-24 08:20:05 +05:30
Madhura Jayaratne
59f93153c5 Change confusing variable name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-24 08:18:55 +05:30
Madhura Jayaratne
681bca3560 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-08-24 07:36:53 +05:30
Madhura Jayaratne
e5f1c6d8bf Simplify schema exporting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-24 07:36:10 +05:30
Marc Delisle
70fbae31aa Merge commit '89d57f8' 2014-08-21 13:07:21 -04:00
Smita Kumari
89d57f8336 Fix bug #4518 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-21 21:39:11 +05:30