gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,721 Commits 12 Branches 481 Tags 2.4 GiB
493ece49ee
Commit Graph

331 Commits

Author SHA1 Message Date
Ann + J.M
64fddc4c6e Fix PHPDoc param types for PMA_executeQueryAndSendQueryResponse 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-07-02 21:28:39 +02:00
Marc Delisle
8453488a26 Merge commit '5b1fe4e' 2014-06-29 07:26:54 -04:00
Marc Delisle
5b1fe4e55f Add comments and todo for the justBrowsing logic 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-29 07:22:53 -04:00
Shivam Dixit
3f21378e4c Fix for bug 4027 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-29 07:14:39 -04:00
Marc Delisle
e1b598ff1e Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-25 13:05:57 -04:00
Chirayu Chiripal
026c8184dd bug-4473: incorrect result count when having clause is used w/o group by 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-25 14:24:57 +05:30
Marc Delisle
3c84487ca0 Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-22 14:56:54 -04:00
Ashutosh Dhundhara
04d7be1b06 RFE#869: Run SQL query: Allow rollback for InnoDB tables. 
Rollback support for other Transactional engines other than InnoDB.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-06-22 22:41:23 +05:30
Ann + J.M
6b778e09d9 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-22 16:34:34 +02:00
Marc Delisle
8ea7d15c16 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-16 12:44:27 -04:00
Marc Delisle
9b1a29131a Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-16 12:34:10 -04:00
Marc Delisle
ed9265489b Merge branch 'QA_4_2' 2014-06-15 10:10:18 -04:00
Marc Delisle
7e5e4d026d bug #4435 WHERE clause can be undefined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-15 10:07:38 -04:00
Michal Čihař
98034ba148 Remove $GLOBALS['cfg']['Bookmark'] variable 
It makes it impossible to include bookmark library at any time as when
it is included before configuration is loaded it caches false result for
bookmarks support.

And anyway, using superglobals is always bad idea.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-12 13:45:03 +02:00
Madhura Jayaratne
9a12fe5d0b Wrap some long lines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-06-06 18:23:56 +05:30
Chirayu Chiripal
85390a7169 rfe-982: Support for editing binary fields in hexadecimal 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-21 21:42:21 +05:30
Ann + J.M
6743e78ea4 PMA_Bookmark_delete: Drop unnecessary $db param 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 22:04:22 +02:00
Chirayu Chiripal
c3f2abe873 FR #1487: Browse Foreign Values should be modal dialog 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-14 17:30:11 +05:30
Marc Delisle
e57088ef79 Remove unused parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-08 16:16:52 +02:00
Marc Delisle
d2c527890c Clarify variable name and its description 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-01 08:41:36 -04:00
Marc Delisle
002e22f0e9 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-01 07:56:55 -04:00
Marc Delisle
89f7dffecc Merge commit 'bd9e66f' 2014-04-26 17:59:39 -04:00
Ashutosh Dhundhara
bd9e66f4bc Bug Fix: #4366 Creating Index doesn't update index-list. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-04-27 01:00:10 +05:30
Marc Delisle
9a1099eaee Merge commit 'd542180' 2014-04-11 13:17:46 -04:00
Marc Delisle
72f0507841 Merge commit 'f220ef2' 2014-04-11 13:17:15 -04:00
Marc Delisle
d542180fb1 Remove unneeded test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-11 13:16:28 -04:00
Ashutosh Dhundhara
f220ef2c72 Bug Fix: #4356 GROUPed selects show number of rows as if not grouped. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Minor fix for group_by_clause condition.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-04-11 22:08:31 +05:30
Atul Pratap Singh
9718b7ba52 Merge branch 'QA_4_1' 2014-04-06 13:38:42 +05:30
Atul Pratap Singh
deb8075db4 Fix bug#4353 makeProfilingChart is not defined 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-04-06 13:17:58 +05:30
Michal Čihař
7233657d4d Remove support for SQL validator 
The SOAP service seems to be down for quite some time and it is not
mentioned anywhere on Mimer website.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-04-02 12:10:52 +02:00
Edward Cheng
9ba932077e Fix jqplot display 
Add clearfloat before jqplot element.
Fix bug: legend overflow.

Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-02-27 22:28:05 +08:00
Marc Delisle
1029776df1 Merge commit 'ac80367' 2014-02-16 06:49:53 -05:00
Sampath Liyanage
ac80367c8c bug fix 4286 
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
 2014-02-14 17:18:46 +05:30
Marc Delisle
3b76a7549a Merge commit 'b6cd8cd' 2014-02-11 12:31:28 -05:00
Sampath Liyanage
b6cd8cdb33 bug fix 4249 
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
 2014-02-08 22:24:03 +05:30
Michal Čihař
9d17a602f5 Better messasge after creating a bookmark 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-02 11:32:15 +01:00
Madhura Jayaratne
510b3fd7be Wrap a long line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-29 23:56:42 +05:30
Madhura Jayaratne
cdd53ace21 Merge branch 'QA_4_1' 
Conflicts:
	libraries/Util.class.php
	test/libraries/PMA_insert_edit_test.php
 2014-01-29 23:30:33 +05:30
Madhura Jayaratne
212a7e5a7e Fix bug #4245 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-29 23:15:58 +05:30
Madhura Jayaratne
c1c50b5944 Revert e8fa9e5335, ea0ad9d41c and f36fbfd4c6 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-29 23:06:43 +05:30
Marc Delisle
8cdb92be5a Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-29 08:10:23 -05:00
Marc Delisle
f36fbfd4c6 Bug #4258 Grid editing broken 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-29 07:58:19 -05:00
Michal Čihař
177308f134 Consistent message with other location 2014-01-29 13:32:16 +01:00
Marc Delisle
8ba4548146 Merge commit 'e8fa9e5' 2014-01-27 12:45:29 -05:00
Sampath Liyanage
e8fa9e5335 bug 4245 fix with minimum changes 
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
 2014-01-27 21:29:27 +05:30
Marc Delisle
3d72b1cc87 Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-24 08:24:14 -05:00
Marc Delisle
2fac99a707 Merge commit 'cd46fbe' 2014-01-21 05:54:07 -05:00
Marc Delisle
cd46fbef11 Another case for bug #4239 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-21 05:52:25 -05:00
Marc Delisle
764c2cb5a9 Merge branch 'QA_4_1' 2014-01-20 12:52:10 -05:00
Marc Delisle
3091d6c4ee bug #4239 Missing LIMIT clause for some queries 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-20 12:46:42 -05:00
Madhura Jayaratne
6335b10574 Fix coding style 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-08 14:35:15 +05:30
Madhura Jayaratne
aecd5f7072 Merge branch 'QA_4_1' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-01 18:45:40 +05:30
Madhura Jayaratne
0ae77814a7 bug #4208 Can't browse tables after sorting on columns with fieldnames that have a '-' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-01 18:41:09 +05:30
Hugues Peccatte
f8b9f66a5e Remove unused local variables. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-21 23:09:43 +01:00
Marc Delisle
b3cf4dc89f Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-13 05:43:36 -05:00
Smita Kumari
72f422b157 fix bug #3903 and retaing ORDER BY preference when query having ORDER BY clause without backquoting 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2013-12-13 14:38:03 +05:30
Marc Delisle
6720751744 Fix undefined variable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-08 09:28:58 -05:00
lakshit
274943c0c5 Fixed bug 4154 
Signed-off-by: lakshit <lakshitarora26@gmail.com>
 2013-12-08 06:38:20 -05:00
Madhura Jayaratne
5bf243b8e6 Specify types 2013-11-11 07:14:37 +05:30
Hugues Peccatte
d7df8b8185 Update types in PHPDoc. 2013-11-08 19:28:18 +01:00
Marc Delisle
5cb21ef969 Fix coding style 2013-11-05 12:25:54 -05:00
Hugues Peccatte
12f1627656 Fix repositioning after delete. 
Fix test related to repositioning.
 2013-11-03 19:19:15 +01:00
Hugues Peccatte
d3adbcaf05 Fix calculation of pos after delete. 2013-11-03 16:02:50 +01:00
Hugues Peccatte
1aedeefc43 Update start position after a delete. 2013-11-03 15:29:44 +01:00
Marc Delisle
6a082ec77e Clarify parameter name 2013-10-28 06:21:18 -04:00
Marc Delisle
b7180be8d5 Bug #4136 2013-10-17 06:16:09 -04:00
Marc Delisle
88da7eeba0 Fixes many coding style "line too long" 2013-10-17 05:41:51 -04:00
Marc Delisle
effa00f209 Bug #4135 When searching, error "No database selected" 2013-10-15 15:36:13 -04:00
Madhura Jayaratne
71950aaf08 Make these long parameter lists a bit easier to read 2013-10-15 07:03:14 +05:30
Atul Pratap Singh
ec6f20fac9 Database was being set at wrong place 2013-10-15 00:08:50 +05:30
Marc Delisle
57c58eebac Fix merge conflicts 2013-10-05 07:16:08 -04:00
Marc Delisle
8a57dbf16d Bug #4121 Print view does not work 2013-10-04 07:56:07 -04:00
Chanaka Indrajith
6a2b56f35c Fixed warning in browse table, after perform table maintenance action 2013-10-03 00:04:52 +05:30
Madhura Jayaratne
cdd9312e65 bug #4000 "Table does not contain unique column" message appears after adding a unique column 2013-09-17 07:27:06 +05:30
Spun Nakandala
3c785e76ed modified PMA_handleQueryExecuteError method in sql.lib.php 2013-09-13 23:13:11 +05:30
Atul Pratap Singh
f0585a2693 Fix reload flag on database change 2013-09-06 02:55:34 +05:30
Michal Čihař
309669820e Missing ; 2013-08-07 19:40:12 +02:00
Michal Čihař
b2e1f81c0c Use PMA_URL_getCommon for generating all params 2013-08-07 17:00:52 +02:00
Michal Čihař
0a3d1d5be8 Better names for URL generating functions 2013-08-07 10:58:17 +02:00
Michal Čihař
d1bb142e87 Remove unused param from PMA_Util::showMySQLDocu 2013-08-07 08:48:50 +02:00
Spun Nakandala
7b77857602 Query results operations not shown in Show PHP Code 2013-07-28 11:33:48 +05:30
Spun Nakandala
5d539b1b61 duplicate messages after without php code clicked corrected 2013-07-28 11:32:07 +05:30
Marc Delisle
ea6582984e Return the correct db name 2013-07-27 05:19:24 -04:00
Marc Delisle
5dd6e4de3e Clarify comment 2013-07-26 17:24:22 -04:00
Spun Nakandala
69b7c86f50 class redeclaration error corrected 2013-07-23 21:20:18 +05:30
Marc Delisle
957a204c5a Fix typos 2013-07-23 07:12:44 -04:00
Marc Delisle
e186cffe2d Clarify code path 2013-07-22 06:03:03 -04:00
Spun Nakandala
36a4ba240a corrected error display shown when browsing a table for the first time after logging 2013-07-20 21:13:50 +05:30
Spun Nakandala
d15028ead2 sorted column not remembering error corrected 2013-07-19 21:42:35 +05:30
Marc Delisle
b1b39e8b0f Fix typos 2013-07-18 13:19:55 -04:00
Marc Delisle
ff2ccc4a43 Fix merge conflicts 2013-07-18 13:14:26 -04:00
Spun Nakandala
be6864a5a7 phpcs errors and warnings corrected 2013-07-18 22:29:52 +05:30
Spun Nakandala
edc8042fec error corrected 2013-07-18 21:28:42 +05:30
Spun Nakandala
2b39b25f30 changed comments to better reflect the origin of the parameter $selected 2013-07-18 20:44:46 +05:30
Spun Nakandala
f31bb7a196 renamed methods to better reflect their usage. 2013-07-18 20:39:43 +05:30
Spun Nakandala
b2a63c9654 use $GLOBALS['cfg'] instead of parsing $cfg variable among methods 2013-07-18 20:35:07 +05:30
Spun Nakandala
f043cf18e0 phpcs errors and warnings corrected 2013-07-18 19:39:43 +05:30
Spun Nakandala
e8994364a8 added methods PMA_executeQueryAndSendResponse, PMA_sendResponse 2013-07-18 19:35:06 +05:30
Spun Nakandala
d835def513 added missing parameter 2013-07-18 18:35:23 +05:30
Marc Delisle
55746b58ec Clarify the origin of $text_dir (text direction) global 2013-07-16 09:33:05 -04:00
Spun Nakandala
0fee81639e extracted method PMA_sendResponseForResultsReturned 2013-07-16 14:01:56 +05:30
Spun Nakandala
c60b65abd6 removed redundant parameter 2013-07-15 20:15:35 +05:30
Marc Delisle
c6ee63bd4e Fix typo 2013-07-14 15:44:51 -04:00
Marc Delisle
63149abf45 Fix merge conflicts 2013-07-14 15:19:33 -04:00
Spun Nakandala
6e20974920 extracted methods PMA_analyzeAndGetTableHtmlForProfilingResults, PMA_getTableHtmlForProfilingSummaryByState from PMA_getHtmlForProfilingChart 2013-07-14 13:55:30 +05:30
Michal Čihař
1346134199 Various coding style improvements 2013-07-10 15:05:05 +02:00
Michal Čihař
c58489a2fa Correct function declarations 2013-07-10 15:00:28 +02:00
Michal Čihař
ba544d4639 Correct spacing in function calls 2013-07-10 14:59:42 +02:00
Michal Čihař
e6b6720730 Fixed if spacing 2013-07-10 14:57:45 +02:00
Michal Čihař
c0ce163e05 Drop some unused local variables 
Found by PMD on our CI server
 2013-07-10 14:53:05 +02:00
Spun Nakandala
5a261ac112 Missing PMA_ added 2013-07-10 13:20:50 +05:30
Spun Nakandala
18517902db phpcs warnings and errors corrected 2013-07-09 23:31:19 +05:30
Spun Nakandala
503df0a6a7 removed redundant methods 2013-07-09 22:32:02 +05:30
Spun Nakandala
07cd7234cf removed method PMA_getHtmlForPrintView and changed the method PMA_getHtmlForPrintViewHeader 2013-07-09 21:12:00 +05:30
Spun Nakandala
419876ee4c changed method PMA_getHtmlForProfilingChart 2013-07-09 21:03:16 +05:30
Spun Nakandala
765a3e464a changed PMA_getHtmlForBookmark function 2013-07-09 19:32:33 +05:30
Spun Nakandala
9c14ce3ee8 added method PMA_getHtmlForPrintView 2013-07-09 18:27:24 +05:30
Spun Nakandala
e5f3f7e0ac added methods PMA_getHtmlForPrintButton, PMA_getHtmlForIndexesProblems, PMA_getMessageIfMissingColumnIndex, PMA_getHtmlForPreviousUpdateQuery, PMA_getHtmlForSqlQueryResultsTable, PMA_getBookmarkCreatedMessage 2013-07-09 18:05:17 +05:30
Spun Nakandala
ebef06fa0d added method PMA_getHtmlForSqlQueryResults 2013-07-09 16:27:34 +05:30
Spun Nakandala
27859550cf added methods PMA_getHtmlForTableMaintenanceResponse, PMA_sendResponseOrGetHtmlForTableMaintenance 2013-07-09 14:17:08 +05:30
Spun Nakandala
4c912a6ae7 added method PMA_sendResponseForGridEdit 2013-07-09 11:29:48 +05:30
Marc Delisle
55fa5d5993 Fix typo 2013-07-08 07:28:07 -04:00
Marc Delisle
c906cccb1a Workaround for missing message when browsing an empty table 2013-07-07 14:03:29 -04:00
Spun Nakandala
ab0b933c44 removed dead code from PMA_sendResponseForNoResultsReturned 2013-07-05 23:10:08 +05:30
Spun Nakandala
dc111344e4 missing doc added 2013-07-02 20:04:28 +05:30
Spun Nakandala
b02a22cc24 added methods PMA_sendResponseForNoResultsReturned, PMA_sendAjaxResponseForNoResultsReturned, PMA_getMessageForNoRowsReturned, PMA_deleteTransformationInfo to the libraries/sql.lib.php 2013-07-02 19:48:20 +05:30
Spun Nakandala
f17221af8e invalid $unlim_num_rows error corrected 2013-07-01 20:19:13 +05:30
Spun Nakandala
102350fd03 comment corrected 2013-07-01 20:00:03 +05:30
Spun Nakandala
7cdf9ebeb8 removed unused parameters and code 2013-07-01 19:56:37 +05:30
Spun Nakandala
8045c7ef6c Added methods PMA_cleanupRelations, PMA_countQueryResults, PMA_executeTheQuery 2013-06-30 21:14:04 +05:30
Spun Nakandala
07a5ace900 bookmark creation error corrected 2013-06-28 23:48:40 +05:30
Spun Nakandala
9322cf4317 phpcs warnings and errors corrected 2013-06-28 21:44:03 +05:30
Spun Nakandala
70a58bcfd0 unwanted parameters removed 2013-06-28 20:19:50 +05:30
Spun Nakandala
7014a0fccb parse error corrected 2013-06-28 20:18:28 +05:30
Spun Nakandala
58657ab55f every request will be ajax. Therefore else condition removed 2013-06-27 23:01:19 +05:30
Spun Nakandala
c86d80b8c7 irrelevant for current master. So removed. 2013-06-27 22:53:20 +05:30
Spun Nakandala
d1bbfdcf29 missing doc added 2013-06-27 22:51:01 +05:30
Spun Nakandala
8c40ba768c removed unnecessary code 2013-06-27 22:44:25 +05:30
Spun Nakandala
d3e6df82d3 function renamed 2013-06-27 22:43:56 +05:30
Spun Nakandala
5a2b0b2581 added method PMA_hasCurrentDBChanged 2013-06-27 19:29:10 +05:30
Spun Nakandala
e40d24f52f created method PMA_getNumberOfRowsAffectedOrChanged 2013-06-27 19:18:50 +05:30
Spun Nakandala
67ff3aee1b Added methods PMA_getDefaultSqlQueryForBrowse, PMA_goBackFurtherPage, PMA_handleQueryExecuteError, PMA_storeTheQueryAsBookmark, PMA_executeQueryAndStoreResults 2013-06-27 15:50:50 +05:30
Spun Nakandala
a25f96ebd8 typo corrected 2013-06-26 16:25:44 +05:30
Spun Nakandala
406dbed4d9 corrected the comment 2013-06-26 16:23:53 +05:30
Spun Nakandala
c349581d9a typo corrected 2013-06-26 16:23:01 +05:30
Spun Nakandala
b05a0fdfe8 indentation corrected. comment corrected 2013-06-26 16:18:16 +05:30
Spun Nakandala
9d429aacb4 error corrected 2013-06-25 21:38:42 +05:30
Spun Nakandala
88e3e5fc04 Added the methods PMA_setColumnOrder, PMA_setColumnVisibility, PMA_setColumnOrderOrVisibility, PMA_addBookmark,PMA_findRealEndOfRows, PMA_getRelationalValues, PMA_getEnumOrSetValues, PMA_appendLimitClaues 2013-06-25 21:21:56 +05:30
Spun Nakandala
2da3c58b44 Undefined index: is_superuser corrected 2013-06-25 19:00:33 +05:30
Marc Delisle
765c5abbe1 Fix typos 2013-06-23 19:30:11 -04:00
Spun Nakandala
c00d25b02d PMA_hasNoRightsToDropDatabase, PMA_isDeleteTransformationInfo, PMA_isJustBrowsing, PMA_isAppendLimitClause, PMA_isRememberSortingOrder methods added to the libraries/sql.lib.php 2013-06-24 02:57:58 +05:30
Spun Nakandala
e3298a12d3 Error relating to the uninitialized variable $cfg corrected 2013-06-19 10:58:13 +05:30
Spun Nakandala
9d654bc172 PMA_getHtmlForBookmark method added to the sql.lib.php 2013-06-17 23:28:45 +05:30
Dieter Adriaenssens
9824e13af6 use 'include' not 'require' to include files conditionally 2013-06-17 15:01:17 +02:00
Marc Delisle
32c8ac600f Fix typo 2013-06-16 08:12:17 -04:00
Marc Delisle
c4883127c7 This file should not end in .lib.php 2013-06-16 08:08:07 -04:00
Marc Delisle
e3e16d181d Code has to be executed for each iteration of the loop 2013-06-16 08:04:56 -04:00
Spun Nakandala
c11d079fc9 changed getTableHtmlForMultipleQueries() to use parse_analyze.lib.php 2013-06-15 21:11:40 +05:30
Spun Nakandala
7cecc2f23d code related to analyzing the sql query transferred to the sql analyzer 2013-06-15 14:50:31 +05:30
Kasun Chathuranga
479d2c1847 Fix alignment of doc comments 2013-06-11 21:54:34 +05:30
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