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

495 Commits

Author SHA1 Message Date
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
Hugues Peccatte
570ca18011 PHPDoc update. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-08-19 17:23:41 +02:00
Marc Delisle
8537e1d966 Merge commit '5681db5' 2014-08-14 12:08:12 -04:00
Smita Kumari
5681db5084 fix bug #4516 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-08-14 20:55:02 +05:30
Hugues Peccatte
128ad75d38 Coding style modifications. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-08-10 12:14:23 +02:00
Bimal Yashodha
7e1f1d21ef Document correct type 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-08-10 11:51:55 +05:30
Bimal Yashodha
b2f80eb97a Merge branch 'master' into designer 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-08-10 08:57:43 +05:30
Bimal Yashodha
268a1a05e4 Fix failing tests 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-08-10 01:31:05 +05:30
Bimal Yashodha
a32465f398 Update tests 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-08-10 00:16:57 +05:30
Bimal Yashodha
7259665f94 Cleanup globals 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-08-09 22:49:38 +05:30
Bimal Yashodha
16e28773d3 Remove duplicate code 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-08-09 22:21:06 +05:30
Bimal Yashodha
dc42693489 Schema export plugins 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-08-09 21:22:30 +05:30
Ashutosh Dhundhara
508f0a752b RFE#919: Multiple-column foreign key relation. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix missing master column.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix failing test.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix coding styles.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix function doc.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix coding styles.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-01 19:50:12 +05:30
Chirayu Chiripal
871ad6d8ab update transformation path in getInfo method 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-24 14:14:03 +05:30
Marc Delisle
1be91c8de6 Clarify message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-13 07:52:49 -04:00
Chirayu Chiripal
1f324be4b1 RFE-637: Custom field handlers (input transformations) 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-07-12 01:52:32 +05:30
Michal Čihař
7089858ab0 Allow to use system phpseclib 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-07-08 16:29:54 +02:00
Ann + J.M
f5a9a60382 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-07-03 20:27:39 +02:00
Michal Čihař
6be21dcb47 Merge pull request #1251 from WhaleWatching/console 
PMA console, history and bookmarks.
 2014-06-25 15:37:29 +02:00
Edward Cheng
fb14e92d62 PMA console, history and bookmarks. 
Modified: resizer of navigation bar: whole-time-bind events removed.

Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-06-25 21:22:33 +08:00
Michal Čihař
34fec13115 Merge pull request #1252 from nijel/remove-observer 
Remove plugin manager and observer classes
 2014-06-25 14:27:45 +02:00
Michal Čihař
06b1ffc8da Fix comments 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-25 14:11:01 +02:00
Michal Čihař
e6f6dab3b0 Fixed cookie based login for installations without mcrypt 
bug #4469

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-25 14:08:03 +02:00
Michal Čihař
dca981481d Remove plugin manager and observer classes 
We don't really need the observer pattern, so let's simplify the code.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-25 09:25:59 +02:00