webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-11-06 13:24:31 +03:00
Code Activity
101,585 Commits 12 Branches 481 Tags
e38ff1d04d78ebfec79a8e7faed4ea203c77df2a
Commit Graph

2563 Commits

Author SHA1 Message Date
Atul Pratap Singh
ea383a7992 test to be moved to StructureController 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-08-04 02:32:07 +05:30
Atul Pratap Singh
a66a756769 Merge pull request #11332 from gzzhanghao/structctrl 
Create StructureController
 2015-08-04 02:19:24 +05:30
Dan Ungureanu
364cf435ed Removed the old formatting library. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-08-01 01:01:06 +03:00
Marc Delisle
f62fba7fc7 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-31 09:01:48 -04:00
Madhura Jayaratne
e9dfc964e3 Merge branch 'QA_4_4' 2015-07-31 14:17:46 +05:30
Madhura Jayaratne
199e8d2544 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 14:14:33 +05:30
Jason
3fe4f63f62 Remove structure.lib.php and display_structure.inc.php 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-31 13:55:52 +08:00
Madhura Jayaratne
c0ddc89eb1 Fix missing space between the icon and text 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 10:50:56 +05:30
Jason
1c28e6a8ab Creating StructureController 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-31 01:04:30 +08:00
Marc Delisle
ee70ff7236 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-29 19:33:44 -04:00
Marc Delisle
7e44dc321a Merge pull request #11331 from Tithugues/templatingDisplayJavascript_master 
Templating PMA_displayJavascript function.
 2015-07-29 10:22:53 -04:00
Marc Delisle
4751ca3a21 Merge pull request #11329 from udan11/update 
Fixes #11325 and #11327.
 2015-07-29 05:54:19 -04:00
Madhura Jayaratne
cba50c1e5a Merge branch 'issue10307' 2015-07-29 12:01:44 +05:30
Madhura Jayaratne
c21377d2da Fix #10307 Replication broken when using cross-database master/slave config and phpmyadmin 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-29 08:29:25 +05:30
Hugues Peccatte
caf3695b53 Templating PMA_displayJavascript function. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-28 22:38:56 +02:00
Dan Ungureanu
f539a7398b Fix failing test. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-28 22:49:38 +03:00
Hugues Peccatte
bce60613ae Update comments style. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-28 20:38:59 +02:00
Madhura Jayaratne
87fadc20b0 Remove extraneous spaces around values. Remove deprecated cellpadding and cellspacing attributes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-28 15:12:52 +05:30
Isaac Bennetch
7b1765f1fd Merge pull request #1792 from devenbansod/rfe1396 
RFE #1396 : Add support for MySQL 5.6.6+ SHA256 Auth plugin
 2015-07-27 14:04:51 -04:00
Madhura Jayaratne
cd76cb6acc Avoid caching JS and CSS files across phpMyAdmin versions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-27 21:52:20 +05:30
Atul Pratap Singh
bbbb6c7482 correct indentation 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-07-27 01:37:02 +05:30
Jason
2a5a91e9f3 Refactor PMA_getHtmlForShowCreate, PMA_tableHeader, PMA_getHtmlForMoveColumnsDialog, PMA_getHtmlForStructureTableRow 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-26 21:09:07 +08:00
Hugues Peccatte
a0070f411d Add/update PHPDoc. 
Make PHPCS happy.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-26 12:31:57 +02:00
Marc Delisle
a240b32979 Merge pull request #1816 from udan11/misc 
Added tests for sql.lib.php and parse_analyze.inc.php.
 2015-07-25 20:36:32 -04:00
Hugues Peccatte
c11155e744 Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-25 22:50:54 +02:00
Dan Ungureanu
1b4a6847e7 Updated tests. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-25 19:39:34 +03:00
Dan Ungureanu
66406e154e Fixed a few more issues. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-25 19:39:33 +03:00
Dan Ungureanu
b6fc66649e Added tests for sql.lib.php and parse_analyze.inc.php. 
Removed dead code.
Fixed miscellaneous issues.
Fixed a bug in PMA_isJustBrowsing().
Updated sql-parser library to udan11/sql-parser@e713c9f.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-25 19:39:33 +03:00
Marc Delisle
c777c9d0a2 Merge pull request #1806 from Tithugues/replaceUnescapeByDecodeURI_master 
Replace deprecated unescape function by decodeURI.
 2015-07-25 06:47:41 -07:00
Deven Bansod
56b4352719 RFE#1396 : Support MySQL 5.6.6+ SHA256 Auth Plugin 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-07-23 21:49:05 +05:30
Atul Pratap Singh
682614277c Merge pull request #1777 from gzzhanghao/table 
WIP: Refining Table & TableSearch class
 2015-07-23 18:35:03 +05:30
Jason
6fd29078b6 Fix test failures 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-23 11:46:40 +08:00
Jason
12ac57e0bd Remove references to TableSearch.class.php 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-23 11:29:53 +08:00
Jason
6636153071 Resolve conflicts from upstream 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-23 11:29:53 +08:00
Dan Ungureanu
2b3febf652 Localization. 
Updated sql-parser library to udan11/sql-parser@e1b91ed.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-22 19:13:38 +03:00
Marc Delisle
a31d108a32 Merge branch 'QA_4_4' 2015-07-22 08:37:22 -07:00
Madhura Jayaratne
7d55220cce Another failing test fixed 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-21 18:03:27 +05:30
Madhura Jayaratne
dfea8ffda7 Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-21 17:56:07 +05:30
Hugues Peccatte
77a40e7f9e Fix typo. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-21 00:08:26 +02:00
Hugues Peccatte
1cc57abb78 Remove duplicate keys in array. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-21 00:02:35 +02:00
Hugues Peccatte
126eab2ffe Replace deprecated unescape function by decodeURI. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-20 23:39:49 +02:00
Hugues Peccatte
4dadfa16b2 Remove useless call function parameter. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-20 22:23:18 +02:00
Madhura Jayaratne
473d9ba54a For tests MySQL version is defined as 5.50. So document links will get point to the latest, which is 5.7 now 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-20 09:54:02 +05:30
Hugues Peccatte
7ae011d1a5 Merge pull request #1794 from Tithugues/templatingHeaderLocation 
Templating header location
 2015-07-19 21:53:34 +02:00
Hugues Peccatte
ad59cb9c20 Templating header location. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-19 17:36:06 +02:00
Hugues Peccatte
114f1a66e1 Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-19 13:41:13 +02:00
Marc Delisle
a9391348da Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-18 18:01:58 -04:00
Marc Delisle
48044b5d48 Merge pull request #1798 from udan11/coding_style 
Miscellaneous coding style fixes
 2015-07-18 17:57:15 -04:00
Marc Delisle
e4d4349024 Merge pull request #1788 from udan11/lint 
[WIP] Added lint.
 2015-07-18 17:54:40 -04:00
Dan Ungureanu
236e0b6a6b Fixed coding style. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-19 00:18:49 +03:00