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

14466 Commits

Author SHA1 Message Date
Michal Čihař
201731121a Simplify the message 
Having uploaded and moved is confusing for translators and for user it's
uploaded file which can't be read.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-05 10:44:05 +02:00
ZhiFeng Hu
0c56d0b9bb Strict check for create_addfield.lib.php 
Signed-off-by: ZhiFeng Hu <hufeng1987@gmail.com>
 2015-08-04 12:13:03 +08:00
Atul Pratap Singh
899337cc1a more fixes for table structure bulk actions 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-08-04 02:20:28 +05:30
Atul Pratap Singh
42eb5a1b76 Fix bulk actions on table=>structure: move related code out of mult_submits_inc toStructureController 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-08-04 02:20:11 +05:30
Atul Pratap Singh
356d2cd147 Fix change link 404 not found 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-08-04 02:19:58 +05:30
Atul Pratap Singh
a66a756769 Merge pull request #11332 from gzzhanghao/structctrl 
Create StructureController
 2015-08-04 02:19:24 +05:30
Marc Delisle
36ba14ad8e Make scrutinizer happy 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-03 16:04:58 -04:00
Michal Čihař
e83457dd14 Better formatting for SHA256 password hashing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-03 11:12:04 +02:00
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
Jason
73b6025e04 Fix: bulk action does not work 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-08-03 01:09:22 +08: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
Jason
785fb3e2b7 Fix: warnings in "Change" link 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-08-02 14:33:57 +08:00
Jason
c880e02d98 Try resolve test failure 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-08-01 22:51:43 +08:00
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
Jason
963ace6ada Cleaning the code 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-31 15:22:09 +08:00
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
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
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