gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,409 Commits 12 Branches 481 Tags 2.4 GiB
846311e7ea
Commit Graph

13284 Commits

Author SHA1 Message Date
Madhura Jayaratne
0f720c5375 bug #4754 pMA DB not detected properly 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-31 18:52:38 +05:30
Marc Delisle
e3735f951c Merge pull request #1619 from madhuracj/bug4821 
bug #4821 Timed-out import fails to restart when file represented
 2015-03-30 08:29:58 -04:00
Madhura Jayaratne
f6dd7c2cd4 Pass local_import_file 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-30 16:14:59 +05:30
Madhura Jayaratne
4c0b0f9687 bug #4821 Timed-out import fails to restart when file represented 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-30 16:01:51 +05:30
Marc Delisle
b28ae18f22 Merge branch 'QA_4_3' into QA_4_4 2015-03-29 07:57:31 -04:00
Andrea Vallorani
cc56e09667 Bug #4718 simulate query fails 
It is not an elegant solution, but it seems functional.
It avoids all the errors caused by the presence of functions in the query.
The $extra_where_clause variable was valorized but never appended to the WHERE clause. (I think that was a mistake)

Signed-off-by: Andrea Vallorani <andrea.vallorani@gmail.com>
 2015-03-29 07:46:49 -04:00
Marc Delisle
53e26b5656 Merge branch 'QA_4_3' into QA_4_4 2015-03-28 14:53:09 -04:00
Deven Bansod
b52a17608c Tries to fix bug-#4820 
Removed the str_replace on $anchor as it seemed to break the anchor links.

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-03-29 03:55:01 +05:30
Madhura Jayaratne
8f58c8f851 bug #4805 Inline edit broken when using functions in query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 19:39:11 +05:30
Madhura Jayaratne
9c56ea6950 Make translatable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 19:20:16 +05:30
Madhura Jayaratne
d32f555a56 bug Missing sort icons in monitor 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 10:35:16 +05:30
Madhura Jayaratne
f3b7d693ec bug #4814 MySQL 5.7.6 and Databases 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 09:21:29 +05:30
Marc Delisle
8e3668044c bug #4818 MySQL 5.7.6 and changing the password for another user 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-24 15:23:52 -04:00
Marc Delisle
40406c5e7e bug #4813 MySQL 5.7.6 and the Users menu tab 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-24 13:26:51 -04:00
Madhura Jayaratne
c5eb730041 Merge branch 'QA_4_3' into QA_4_4 2015-03-24 08:21:35 +05:30
Madhura Jayaratne
f4ddd75bfc Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-24 08:19:33 +05:30
Madhura Jayaratne
eb73dee7c9 Fix tests; auth_type might not be defined 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-24 08:16:49 +05:30
Madhura Jayaratne
c560f47f8d Merge branch 'QA_4_3' into QA_4_4 2015-03-24 08:02:15 +05:30
Madhura Jayaratne
db738687c6 bug #4815 Infinite calls to index.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-24 07:58:28 +05:30
Marc Delisle
624562a9c9 4.4.1-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-23 12:33:13 -04:00
Madhura Jayaratne
04ff48369c Use index parameters defined in create table form 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-20 22:07:53 +05:30
Madhura Jayaratne
a9220d89cf Fix missing title for MySQL documentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-19 18:26:35 +05:30
Madhura Jayaratne
dc4b9a628f Merge branch 'QA_4_3' into QA_4_4 2015-03-19 18:02:43 +05:30
Madhura Jayaratne
610e3c76a2 bug #4804 Undefined Index after export schema 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-19 17:59:02 +05:30
Madhura Jayaratne
e8ced3949d bug #4812 Issues with index dialog while creating a table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-19 10:16:04 +05:30
Madhura Jayaratne
15b8c778c0 Use standard font size 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-19 08:56:22 +05:30
Madhura Jayaratne
b678749e7c Add a class for styling 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-18 13:09:42 +05:30
Madhura Jayaratne
15c19a3b31 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-03-18 13:06:19 +05:30
Madhura Jayaratne
21302c235e Add a class for bitT column 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-18 13:04:56 +05:30
Madhura Jayaratne
24db9d5cde Set row span when there are more privileges 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-18 12:03:43 +05:30
Marc Delisle
a278b809a3 Merge branch 'QA_4_3' into QA_4_4 2015-03-17 16:02:03 -04:00
Marc Delisle
3c49594c56 Merge pull request #1588 from andreaval/QA_4_3 
Bug #4798 Missing column when exporting in sql (2)
 2015-03-17 16:00:06 -04:00
Andrea Vallorani
364b26b0dd Bug #4798 Missing column when exporting in sql (2) 
Export failure when the comments contains reserved keywords (KEY, CONSTRAINT)
To resolve, I removed the SQL comment from the current line before checking the presence of reserved keywords.

Signed-off-by: Andrea Vallorani <andrea.vallorani@gmail.com>
 2015-03-17 18:15:13 +01:00
Marc Delisle
08adc35651 Merge branch 'QA_4_3' into QA_4_4 2015-03-17 08:44:17 -04:00
Nisarg Jhaveri
e12582acdb Fix bug#4807 
Don't add `.` if table name is not set when trying to get column in
sort expression.

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-03-16 19:04:42 +05:30
Marc Delisle
31472e0cf0 Merge branch 'QA_4_3' into QA_4_4 2015-03-16 07:59:52 -04:00
Marc Delisle
d5ae95d7ff Merge pull request #1578 from devenbansod/QA_4_3 
Fixes bug #4803
 2015-03-16 07:58:21 -04:00
Madhura Jayaratne
9f1f0e6bc1 Per server iv 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-16 08:34:40 +05:30
Deven Bansod
18bccea291 Fixes bug #4803 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-03-16 05:09:26 +05:30
Marc Delisle
71530b3089 4.3.13-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-14 07:13:00 -04:00
Marc Delisle
80a9c4518f 4.4.0-beta1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-11 07:40:54 -04:00
Madhura Jayaratne
6aceb6af37 Merge branch 'QA_4_3' into QA_4_4 2015-03-10 12:11:29 +05:30
Madhura Jayaratne
a1e376c45b bug #4789 Views aren't dropped when copying a database 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-10 12:09:40 +05:30
Rakesh Kumar
92d276b3ac Add missing database link 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-10 06:52:52 +05:30
Madhura Jayaratne
19a1f376f5 Fix testPMAGetCentralColumnsCount() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 18:25:44 +05:30
Madhura Jayaratne
547606bd26 Fix testPMAGetColumnsList() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 18:03:05 +05:30
Madhura Jayaratne
19116baec0 Check whether there are columns. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 15:58:52 +05:30
Madhura Jayaratne
3821b724cc Move col_extra handling code to a single method. Add such missing col_extra handling. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 15:49:11 +05:30
Madhura Jayaratne
9bf5792dc0 Merge branch 'QA_4_3' into QA_4_4 2015-03-09 14:48:43 +05:30
Madhura Jayaratne
7dde05cc41 phpUnit is unable to mock private methods 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 14:17:15 +05:30