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

112 Commits

Author SHA1 Message Date
Hugues Peccatte
e512768fce Fix coding style. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-18 18:51:04 +02:00
Hugues Peccatte
b61c12bff1 Fix coding style. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-18 10:19:58 +02:00
Michal Čihař
d559fa6a21 Remove trailing whitespace from the code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-20 09:36:48 +01:00
Hugues Peccatte
3f546b010d PHPCS updates. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-15 15:52:00 +01:00
Marc Delisle
b50ed1aac4 Merge commit '65e24c0' 2014-03-02 09:41:02 -05:00
Marc Delisle
8c795aede7 Merge commit '089b382' 2014-03-02 09:40:49 -05:00
Smita Kumari
65e24c0b0a bug fix #4298: added javascript allow just one character if first character is not escape character else allow two including escape character 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-02-27 00:21:03 +05:30
Smita Kumari
089b382e22 bug fix #4298:ImportCSV options UI validation includes "Columns separated with" allows string while "Columns enclosed with" and "Columns escaped with" allow to enter just one character 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-02-26 19:32:31 +05:30
Marc Delisle
d30b1d314d Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-26 07:33:52 -05:00
Smita Kumari
a8052ee602 adding explanation to parameter names 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-02-26 17:19:56 +05:30
Smita Kumari
6f095c8a3c Feature Request #1418, added new function docblock 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-02-26 00:12:19 +05:30
Marc Delisle
e08c4449e6 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-25 12:38:54 -05:00
Smita Kumari
66952d75b1 Implemented Feature request #1418: using string as Column_Sepearted_With parameter 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-25 12:26:47 -05:00
Michal Čihař
0b008c44fa Correct punctuation for error messages 2014-02-02 11:19:15 +01:00
Madhura Jayaratne
16587a8c6b Suffix files containing classes with .class.php file extension 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-22 18:19:48 +05:30
Madhura Jayaratne
74aebe629b Spaces around . operator 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-08 18:06:02 +05:30
Marc Delisle
1615fe1180 We now use gettext 2013-11-22 12:59:51 -05:00
Marc Delisle
ca053deb24 Merge pull request #765 from slimtim/bug_4153 
When importing a SQL file convert \r line-endings to \n
 2013-11-21 04:16:11 -08:00
Marc Delisle
088b0f7818 Fix coding style 2013-11-21 06:51:52 -05:00
slimtim
f604be8bd2 When importing a SQL file convert carriage return (\r) line-endings to line feeds (\n) otherwise all queries in the file may not get executed on some platforms (e.g. Linux) 2013-11-20 21:44:48 -05:00
slimtim
2e7c024df6 When importing a CSV file force a trailing new line at EOF to prevent parsing problems. (bug #4133) 2013-11-20 16:43:01 -05:00
Marc Delisle
5f5b49d27e Merge pull request #749 from Tithugues/fix-unitialized 
Minor: Fix unitialized variables
 2013-11-11 11:02:21 -08:00
Hugues Peccatte
7e1e6e5691 Add initialization of some variables and useless code. 2013-11-11 18:56:46 +01:00
Madhura Jayaratne
26249a17fe Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-11-11 22:58:46 +05:30
Madhura Jayaratne
5bf243b8e6 Specify types 2013-11-11 07:14:37 +05:30
Hugues Peccatte
464ec23ad8 Huge PHPDoc update. 2013-11-10 23:04:58 +01:00
Dieter Adriaenssens
0b86704892 fix coding style : wrap long lines 2013-09-24 15:33:21 +02:00
Dieter Adriaenssens
ccd9835347 offset is a global var 2013-09-17 15:40:51 +02:00
Dieter Adriaenssens
d0d419fe8d display esri-type in message 2013-09-17 13:52:07 +02:00
Madhura Jayaratne
5638d6b956 Merge branch 'QA_4_0' 2013-09-17 16:51:07 +05:30
Madhura Jayaratne
f9300c7b07 bug #4001 Import error: Class 'ImportOds' not found 2013-09-17 16:49:06 +05:30
Michal Čihař
3fef046acf Do not set memory limit in SHP import as well 
- First of all current detection is wrong and it will fail on values as
  65536K.
- Also I see no reason why single import should override global settings
  we have.
 2013-09-16 09:19:42 +02:00
Michal Čihař
db178d62c2 Avoid hardcoded time limit in SHP import 2013-09-16 09:17:05 +02:00
Michal Čihař
9310e76a0e Fix indentation 2013-07-30 13:23:51 +02:00
Michal Čihař
c0ce163e05 Drop some unused local variables 
Found by PMD on our CI server
 2013-07-10 14:53:05 +02:00
Michal Čihař
e51f32d001 Properly set global message 2013-07-10 14:53:05 +02:00
Michal Čihař
dc809d6a8d Properly use global offset variable 2013-07-10 14:53:04 +02:00
Dieter Adriaenssens
4f63bb6bf1 Merge branch 'QA_4_0' 2013-06-24 13:30:11 +02:00
Dieter Adriaenssens
d0c0d0d207 fix typo 2013-06-24 13:29:36 +02:00
Michal Čihař
34dce1d3b4 Various coding style improvements 2013-06-11 16:27:31 +02:00
Michal Čihař
999a898aa3 Merge commit '85e5a3b5cebf5a7479779297bfcb50294f3f8725' 2013-06-11 14:58:48 +02:00
Michal Čihař
85e5a3b5ce bug #3645 Better handling of invalid ODS documents 2013-06-11 14:58:02 +02:00
Madhura Jayaratne
9c681b30af Rename PMA_import_sessionCheck() -> PMA_Import_sessionCheck() 2013-06-11 17:02:20 +05:30
Madhura Jayaratne
0ecadbba0d Rename PMA_import_progressCheck() -> PMA_Import_progressCheck() 2013-06-11 17:01:42 +05:30
Madhura Jayaratne
37eaa0a680 rename PMA_import_apcCheck() -> PMA_Import_apcCheck() 2013-06-11 17:00:11 +05:30
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Marc Delisle
140eb64350 Merge commit '078da8d' 2013-05-23 02:57:02 -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
d7db600379 Merge branch 'QA_4_0' 2013-05-20 17:53:15 +05:30
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