gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,062 Commits 12 Branches 481 Tags 2.4 GiB
18cfc24743
Commit Graph

4500 Commits

Author SHA1 Message Date
Hugues Peccatte
46478f32c2 Fix typo in tag. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:03:56 +01:00
Hugues Peccatte
c721815dc2 Convert array declaration in JS. 
Remove useless code.
Remove useless declarations.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 22:50:24 +01:00
Hugues Peccatte
ff4517ca60 Remove useless variables and simplify code. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 22:36:54 +01:00
Marc Delisle
8956fa805a Merge branch 'QA_4_5' 2015-12-10 12:19:20 -05:00
Marc Delisle
d008352582 IE 8 compatibility in console 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-10 12:18:38 -05:00
Madhura Jayaratne
000d679d63 Merge branch 'QA_4_5' 2015-12-10 07:07:28 +11:00
Madhura Jayaratne
269fcd2a54 issue #11724 Temporary fix for live data edit of big sets is not working 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-10 07:01:42 +11:00
Marc Delisle
06d22e636e Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-07 09:41:46 -05:00
Madhura Jayaratne
74c651e4d8 Merge branch 'QA_4_5' 2015-12-07 17:03:07 +11:00
Madhura Jayaratne
dade3fa2e4 Fix #11706 Database export template not saving compression option 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-07 16:56:18 +11:00
Marc Delisle
9ee3931c09 Remove some unnecessary string concatenations 
https://github.com/dseguy/clearPHP/blob/master/rules/no-unnecessary-string-concatenation.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-03 10:43:10 -05:00
Madhura Jayaratne
547c977bc1 issue #11701 Allow changing parameter order of routines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-01 12:20:16 +11:00
Nisarg Jhaveri
296caced73 Add grid-edit update query only to last query result box 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-11-30 01:07:34 +05:30
Deven Bansod
1f4cff8fc6 Fix misspelt word 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-11-29 23:05:30 +05:30
Deven Bansod
9e0a7c2513 Merge pull request #11656 from Achilles-96/master 
Fix for issue #11504 - Provide a 'print preview' mode before triggering print directly
 2015-11-29 17:31:39 +05:30
Achilles-96
f72864cb2b Fixes issue 11504 
Signed-off-by: Achilles-96 <raghuram.vadapalli@research.iiit.ac.in>
 2015-11-29 15:44:56 +05:30
Marc Delisle
e257954082 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-28 06:50:23 -05:00
Madhura Jayaratne
ba8859d7df Merge branch 'master' into refactor 
Conflicts:
	db_create.php
 2015-11-24 21:07:09 +11:00
Madhura Jayaratne
0a2b037706 merge db_create.php into ServerDatabasesController 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-24 20:41:40 +11:00
Marc Delisle
9d381167f8 Merge branch 'QA_4_5' 2015-11-21 21:08:47 -05:00
Marc Delisle
348c7d734a Fix incorrect message calling 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-21 21:06:31 -05:00
Atul Pratap Singh
50a9c19fe4 Rename 'Print view' to 'Print' 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-11-18 19:46:28 +05:30
Marc Delisle
0152eca986 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-18 07:59:20 -05:00
Achilles-96
d336301566 Fixes issue #11504 
Signed-off-by: Achilles-96 <raghuram.vadapalli@research.iiit.ac.in>
 2015-11-17 22:32:05 +05:30
Marc Delisle
1fda587e35 Fixes #11667 Disable the tooltip in the navigation panel's filter box 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-13 19:08:29 -05:00
Hugues Peccatte
f9d582bd09 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 15:58:48 +01:00
Madhura Jayaratne
3e244c89be Hide the jqPlot details inside the method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-07 08:08:20 +11:00
Madhura Jayaratne
06821464bf Use generic charting mechanism for profiling chart as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-06 20:36:28 +11:00
Madhura Jayaratne
31b2e776e6 Operate without OpenLayers here as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-06 15:05:53 +11:00
Madhura Jayaratne
ded3f6382d Hide the checkbox to chose OpenLayers 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-06 13:04:38 +11:00
Madhura Jayaratne
b3349e6bfc Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-11-06 13:02:52 +11:00
Madhura Jayaratne
82e9e60cd5 Function without OpenLayers 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-06 12:51:52 +11:00
Michal Čihař
d34fdc3830 Merge branch 'QA_4_5' 2015-11-05 09:11:53 +01:00
Michal Čihař
fde62aad8e Properly handle session expiry after POST requests 
Fixes #11642

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-11-05 09:11:33 +01:00
Madhura Jayaratne
e8a191067a Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-04 09:48:09 +11:00
Madhura Jayaratne
1d0ad159b1 Indicate when there are no parameters 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-04 08:27:10 +11:00
Marc Delisle
b34f9f1c12 Merge commit 'b4044bb' 2015-11-01 05:54:15 -05:00
Nisarg Jhaveri
b4044bb770 fix #11627, CREATE TABLE/INSERT INTO executed twice (ctrl+enter) 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-11-01 03:51:45 +05:30
Madhura Jayaratne
88586bf419 Function declarations should not be placed in blocks. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-29 08:15:15 +11:00
Madhura Jayaratne
227b91617e Use dot notation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-29 08:07:49 +11:00
Madhura Jayaratne
ceb172e748 Make JSLint happy 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-29 07:58:02 +11:00
Hugues Peccatte
8b4590aaa9 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-24 13:08:44 +02:00
Marc Delisle
7ddbfefb9d Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-13 11:32:21 -04:00
Deven Bansod
8a82a04ff9 Refactor code for generation of available auth plugins HTML 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-14 00:33:15 +05:30
Madhura Jayaratne
a72e65e31e Merge branch 'QA_4_5' 
Conflicts:
	js/messages.php
 2015-10-09 10:10:14 +11:00
Madhura Jayaratne
cc4c615720 Fix #11548 Confirm box on "Reset slave" option 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-09 10:06:49 +11:00
Hugues Peccatte
f34e84d635 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-06 20:51:59 +02:00
Madhura Jayaratne
20974c6ae5 Merge branch 'QA_4_5' 2015-10-06 07:42:11 +11:00
Madhura Jayaratne
c2c0a6e179 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-10-06 07:39:51 +11:00
Madhura Jayaratne
38cf9a13f2 Fix #11539 Rename table does not result in refresh in left panel 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-06 07:23:48 +11:00