Madhura Jayaratne
|
2baf473ad7
|
Merge branch 'master' into OOP_DBI
Conflicts:
libraries/database_interface.lib.php
|
2013-05-26 21:43:33 +05:30 |
|
Madhura Jayaratne
|
3dd99512f0
|
These constants are better as a part of DatabaseInterface class
|
2013-05-26 21:15:24 +05:30 |
|
Atul Pratap Singh
|
51651ea74a
|
Fix sorting in new profiling tables
|
2013-05-25 16:50:02 +05:30 |
|
Madhura Jayaratne
|
ce85ebd950
|
Merge branch 'master' into OOP_DBI
|
2013-05-24 19:06:45 +05:30 |
|
Marc Delisle
|
9ce77e21b2
|
Localize strings
|
2013-05-24 09:02:19 -04:00 |
|
Marc Delisle
|
be31655c38
|
Fix merge conflicts
|
2013-05-24 08:59:13 -04:00 |
|
Madhura Jayaratne
|
650a8cdda3
|
Convert database interface to a class
|
2013-05-24 17:30:59 +05:30 |
|
Brad Jorgensen
|
d71478f56f
|
table title updates
|
2013-05-20 15:57:48 -05:00 |
|
Atul Pratap Singh
|
3a68fb3e6c
|
Fix bug#3936 in master
|
2013-05-17 11:03:19 +05:30 |
|
Marc Delisle
|
92b35fec45
|
Bug #3907, other fixes
|
2013-05-16 12:55:36 -04:00 |
|
Brad Jorgensen
|
5ba39c172a
|
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin.git into profiler3
|
2013-05-15 10:06:08 -05:00 |
|
Brad Jorgensen
|
4d79fabac3
|
implementation of feature request #1363
|
2013-05-15 09:54:18 -05:00 |
|
Marc Delisle
|
e1078c38ee
|
Fix merge conflicts
|
2013-05-13 16:33:21 -04:00 |
|
Mohamed Ashraf
|
200e22ad4b
|
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into refactor
|
2013-05-10 22:36:23 +02:00 |
|
Mohamed Ashraf
|
ddaff8aba7
|
Fixed warning for unintialized variable
|
2013-05-10 22:31:26 +02:00 |
|
Michal Čihař
|
89b3d80ebc
|
Fixed docstring alignment
|
2013-05-10 10:30:32 +02:00 |
|
Michal Čihař
|
308ec40a8c
|
Shorter name for a parameter
|
2013-05-10 10:28:24 +02:00 |
|
Mohamed Ashraf
|
9c63a2b5f3
|
Moved code that creates the profiling chart in to a method
|
2013-05-08 18:50:34 +02:00 |
|
Mohamed Ashraf
|
28a91c941d
|
Moved code that creates the header for the print view in to method
|
2013-05-08 18:49:17 +02:00 |
|
Kasun Chathuranga
|
5ef0833210
|
Merge branch 'master' into DBI_naming_cleanUp2
Conflicts:
sql.php
|
2013-05-05 20:58:07 +05:30 |
|
Spun Nakandala
|
d09597c86f
|
libraries/sql.lib.php file added. Functions in the sql.php transfered into sql.lib.php
|
2013-05-03 00:04:51 +05:30 |
|
