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

14452 Commits

Author SHA1 Message Date
Michal Čihař
d71eae0969 Clarify message 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-03 11:10:28 +02:00
Michal Čihař
d8b48ac7a7 Clarify error message 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-03 09:50:45 +02:00
Michal Čihař
5664fe52fb Better string for MySQL native password 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-03 09:49:34 +02:00
Marc Delisle
0e4f2ce7a8 Merge commit 'b1d567d' 2015-08-02 10:28:36 -04:00
Marc Delisle
b1d567dd54 Merge pull request #11342 from nisargjhaveri/issue_11339 
Handle comments in the beginning of the query
 2015-08-02 10:26:33 -04:00
Nisarg Jhaveri
55a2d06cca Handle comments in the beginning of the query 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-08-02 18:42:37 +05:30
Marc Delisle
6c9e566b3e Clarify verification 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-01 08:39:39 -04:00
Dan Ungureanu
364cf435ed Removed the old formatting library. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-08-01 01:01:06 +03:00
Dan Ungureanu
ade277dae5 Using the sql-parser library for formatting the queries. 
Updated sql-parser library to udan11/sql-parser@e6a562e3e5.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-08-01 00:59:38 +03:00
Marc Delisle
d00b21b202 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-31 13:30:58 -04:00
Marc Delisle
f62fba7fc7 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-31 09:01:48 -04:00
Marc Delisle
3be360f062 Improve a message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-31 07:06:31 -04:00
Madhura Jayaratne
f8c00915dd Use proper names as file names. Fix undefined notices 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 15:32:51 +05:30
Madhura Jayaratne
35d36f966d Revert "Support alias" 
This reverts commit 2cfaf8f411.

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 14:08:10 +05:30
Madhura Jayaratne
3354439a86 Reorganize to improve clarity. Join routines with tables when exporting as separate files. Export metadata and events when exporting as separate files. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 14:06:39 +05:30
Madhura Jayaratne
91fd305782 Do not export events in case of exporting tables separately 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 13:01:46 +05:30
Madhura Jayaratne
2cfaf8f411 Support alias 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 12:54:51 +05:30
Madhura Jayaratne
8ebb632bc2 Merge branch 'QA_4_4' 2015-07-31 12:42:54 +05:30
Madhura Jayaratne
eea2bf811a Fix #11336 Exporting a table exports database level events 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 12:36:53 +05:30
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
Marc Delisle
301dd9e05f Fix notice 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-30 12:06:09 -04:00
Marc Delisle
ee70ff7236 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-29 19:33:44 -04:00
Hugues Peccatte
a810409135 Replace require_once by include_once. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-29 19:32:25 +02:00
Marc Delisle
afadbc662b Intermediate variable not needed 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-29 10:26:11 -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
8d0a9ff74e Fix another instance of issue #10307 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-29 12:07:58 +05:30
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
Marc Delisle
0e8c6983b8 Make scrutinizer happy 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-28 20:43:08 -04:00
Marc Delisle
11472afa87 Make scrutinizer happy 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-28 19:49:40 -04:00
Hugues Peccatte
caf3695b53 Templating PMA_displayJavascript function. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-28 22:38:56 +02:00
Hugues Peccatte
2efdf5f197 Make PHPCS happy. 
Return null values instead of void.
Update PHPDoc.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-28 22:36:49 +02:00
Dan Ungureanu
8722d7c5c6 Fixes #11325 and #11327. 
Updated sql-parser library to udan11/sql-parser@e603c283cd.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-28 16:47:08 +03:00
Madhura Jayaratne
9a8e8e60c8 Fix #11328 Exporting table generates AUTO_INCREMENT=; for new tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-28 16:13:42 +05:30
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
Madhura Jayaratne
9b0b23cbfe Do not jump to the top of the page when clicking on these links to open a section 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-28 13:31:13 +05:30
Madhura Jayaratne
75cf9e7d59 Merge branch 'QA_4_4' 2015-07-28 08:17:42 +05:30
Madhura Jayaratne
7c1c639ef4 Fix #11326 Exported schema includes all the tables of the database 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-28 08:11:38 +05:30
Marc Delisle
877fc06c2a Complete type definition 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-27 17:11:04 -04:00
Hugues Peccatte
f661b97c6d Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-27 21:35:19 +02:00
Hugues Peccatte
5888218060 Fix HTML attribute value. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-27 21:14:45 +02:00
Hugues Peccatte
6434fbfa80 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-27 21:13:58 +02:00
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
Isaac Bennetch
9456ee8514 Merge pull request #1797 from devenbansod/reload_privs_visibility 
Make visibility of Reload privs notice conditional
 2015-07-27 13:41:36 -04:00
Hugues Peccatte
0a7ff32c28 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-07-27 18:50:55 +02:00
Hugues Peccatte
839ac8412a Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-27 18:50:45 +02:00
Marc Delisle
5bddfec5c5 Merge pull request #11323 from madhuracj/cache 
Avoid caching JS and CSS files across phpMyAdmin versions
 2015-07-27 12:50:16 -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
Marc Delisle
e9f0554775 Fix loose comparison 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-27 10:34:59 -04:00