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

229 Commits

Author SHA1 Message Date
Madhura Jayaratne
df38a76b9f rfe #1306 Add lock tables, disable keys options 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 10:48:59 +05:30
Madhura Jayaratne
0aac18fcda Missed file from commit 1d73964695 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-16 09:28:24 +05:30
Madhura Jayaratne
4f1ce1004e bug #4638 Default Export Method setting broken 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-11 15:57:19 +05:30
Madhura Jayaratne
0b662922db Merge branch 'QA_4_2' into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-19 09:30:30 +05:30
Madhura Jayaratne
2e42e8a11b bug #4602 Exporting selected rows exports all rows of the query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-19 09:26:11 +05:30
Hugues Peccatte
70a21ec25c Merge from master. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-08 21:49:37 +02:00
Hugues Peccatte
48bd3b8ee5 Remove unused $pmaString. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-05 10:42:44 +02:00
Hugues Peccatte
e20510de39 Replace mb functions by standard string functions. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-03 23:08:43 +02:00
Chirayu Chiripal
aae1b30d62 fix export with more than 1000 input fields (db/table/column alias) 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-09-29 18:50:12 +05:30
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
Hugues Peccatte
ff0011ac3f Merge pull request #1353 from Tithugues/securityStringSquash 
Mass modifications to use PMA_String.
 2014-09-06 19:15:06 +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
461035cbed Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-04 05:55:44 -04:00
Ann + J.M
6b778e09d9 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-22 16:34:34 +02:00
Isaac Bennetch
ff913e2855 Merge pull request #1238 from D-storm/export-back-link 
fix: error in export with option view output as text
 2014-06-19 12:51:08 -04:00
Chirayu Chiripal
1dd8d8c28c fix: error in export with option view output as text 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-19 17:30:50 +05:30
Chirayu Chiripal
c8a6ea0467 scrutinizer issues fix 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-19 17:10:55 +05:30
Chirayu Chiripal
3ea7d2b52d rfe-755: export with table/column name changes 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-16 22:41:50 +05:30
Hugues Peccatte
c0b5648cf6 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-06-03 21:36:03 +02:00
Hugues Peccatte
ceddfffac4 Update PHPDoc. 
Add return.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-03 21:35:25 +02:00
Marc Delisle
673fce8145 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-03 12:33:25 -04:00
Marc Delisle
9115548f00 Merge commit 'abe4702' 2014-04-10 06:12:01 -04:00
Marc Delisle
05912b5c2c Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-10 06:11:24 -04:00
Marc Delisle
abe4702d87 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-10 06:08:52 -04:00
Smita Kumari
b21c43245d bugfix 4346: if exeTimeLimit is set to zero then export timeout won't occur so need to check for it 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-04-09 22:07:38 +05:30
Marc Delisle
6a47828210 Signed-off-by: Marc Delisle <marc@infomarc.info> 
- localize the size suffix
- improve XHTML
- the label needs an id
- add a todo
 2014-03-24 12:59:51 -04:00
Aditya Sastry
fa88c27ad6 Adds the maximum table size to export option (Feature request 1515) 
Added a textbox to the custom export options, in the loop where the
Exporting is done, I added a query which checks the current table's size.
If this size is greater than the limit specified we don't export the current
table.

Signed-off-by: Aditya Sastry <ganeshaditya1@gmail.com>
 2014-03-22 20:21:19 +05:30
Marc Delisle
379f8b6704 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-15 08:53:00 -05:00
Marc Delisle
144e00e5da bug #4221 Bzip2 export cannot be directly imported (so withdraw bz2 export) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-15 08:39:42 -05:00
Madhura Jayaratne
74aebe629b Spaces around . operator 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-08 18:06:02 +05:30
Smita Kumari
675e457f50 bug fix #2760 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2013-12-18 19:17:59 +05:30
Hugues Peccatte
464ec23ad8 Huge PHPDoc update. 2013-11-10 23:04:58 +01:00
Madhura Jayaratne
20608589c3 Remove trailing white spaces 2013-10-19 14:29:05 +05:30
Michal Čihař
0a3d1d5be8 Better names for URL generating functions 2013-08-07 10:58:17 +02:00
xmujay
b49988b4b1 1. rename display_import.lib.php to display_import.inc.php 
2. split long code to functions
3. move function to display_import.lib.php
4. fix the included file: table, database, server
 2013-07-27 19:06:39 +08:00
Marc Delisle
1b34f8fd28 Fix typos and clarify comment 2013-07-21 08:58:05 -04:00
xmujay
0157002bd1 rename server_export.lib.php to display_export.lib.php due to it works for server and database, table level export 2013-07-21 10:23:35 +08:00
xmujay
95ba127006 fix undefined variable: multi_values 2013-07-21 01:09:18 +08:00
xmujay
b1eabfb597 fix the undefined error 2013-07-21 00:58:37 +08:00
xmujay
0817d6971e refactor the code style of server_export 2013-07-21 00:44:58 +08:00
xmujay
577fd13514 refactor server_export 2013-07-20 22:36:56 +08:00
Michal Čihař
051834dccd Remove spaces param from PMA_Kanji_encodingForm 
We mostly don't indent code anyway now.
 2013-05-10 10:00:05 +02:00
Michal Čihař
0c2832ca04 Consistent function naming in Kanji support module 2013-05-10 09:53:41 +02:00
Michal Čihař
3751572ad8 Wrap some long lines 2013-04-26 10:07:53 +02:00
Michal Čihař
62035e1551 Forgotten printf refactoring 2013-04-25 14:30:00 +02:00
Marc Delisle
ae7e542a51 Fix merge conflict 2013-04-15 12:47:19 -04:00
xmujay
d81ebdb847 refactor display_export.lib.php 2013-04-14 23:05:18 +08:00
J.M
050d6d31aa Fix bug #3874 [export] No preselected option when exporting table 2013-04-14 14:46:00 +02:00
J.M
3839f5379d Fix incorrectly closed quick export file overwrite checkbox tag 2013-03-03 22:09:34 +01:00
Marc Delisle
2e9738379d Improved library file name 2012-11-19 12:31:24 -05:00