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

250 Commits

Author SHA1 Message Date
Jason
6636153071 Resolve conflicts from upstream 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-23 11:29:53 +08:00
Madhura Jayaratne
6e788d45cc Remove redundant style causing trouble in rtl 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-21 10:34:32 +05:30
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-19 00:18:38 +03:00
Madhura Jayaratne
8c19eedca1 Use correct name format 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:11:19 +05:30
Madhura Jayaratne
8c6261c73f Underscores are preferred to separate words in configuration storage table names/directives 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-09 17:06:28 +05:30
Madhura Jayaratne
cf7484d573 Fix case 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-08 18:16:03 +05:30
Marc Delisle
b0994d0507 Merge pull request #1771 from madhuracj/rfe812 
#812 store export definitions for reuse
 2015-07-07 06:57:14 -04:00
Madhura Jayaratne
71d6a654e2 Bug - correctly set lock_table directive when repopulating on back button click 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-06 13:16:11 +05:30
Madhura Jayaratne
c987104160 Make scrutinizer happy 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-06 12:09:04 +05:30
Madhura Jayaratne
61cbf6b3d9 Submit template form on template change. Select template on Back button 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-06 08:56:13 +05:30
Madhura Jayaratne
8865744945 Select newly created template from dropdown. Add an empty option to template dropdown to show selected template. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 21:04:04 +05:30
Madhura Jayaratne
8255a2d539 Specify maxlength for template name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 21:04:03 +05:30
Madhura Jayaratne
4ab83556c6 Allow using templates created for other databases/tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 21:04:02 +05:30
Madhura Jayaratne
545db4a443 rfe #812 store export definitions for reuse 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 21:03:57 +05:30
Deven Bansod
863c29bbe7 Separate file export works with ZIP only 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-07-01 02:10:12 +05:30
Madhura Jayaratne
69e1c473de Config option for Export\as_separate_files 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-30 15:37:30 +05:30
Madhura Jayaratne
7a6e1bf6e4 Match with config names, more instances 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-30 15:23:19 +05:30
Madhura Jayaratne
dadecaf393 Match the name of corresponding config value. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-30 15:16:42 +05:30
Nisarg Jhaveri
9ef59e49e5 rfe#1603 select structure or data for each table when exporting 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-27 17:09:59 +05:30
Deven Bansod
a49e6f533d Provide an option to export tables in a database as separate files 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-21 16:05:43 +05:30
Madhura Jayaratne
4c66580174 Set parameter types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-10 21:29:55 +05:30
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