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

13319 Commits

Author SHA1 Message Date
harish095
dbba36e0b8 MySQL 5.7 Syntax for password change 
Signed-off-by: Harish Kandala <kandalaharish95@gmail.com>

Updated the If condition

Signed-off-by: Harish Kandala <kandalaharish95@gmail.com>
 2015-03-19 12:37:35 -04:00
Madhura Jayaratne
14d5a7b7d8 Merge branch 'QA_4_4' 2015-03-19 18:28:31 +05:30
Madhura Jayaratne
a9220d89cf Fix missing title for MySQL documentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-19 18:26:35 +05:30
Madhura Jayaratne
dc4b9a628f Merge branch 'QA_4_3' into QA_4_4 2015-03-19 18:02:43 +05:30
Madhura Jayaratne
610e3c76a2 bug #4804 Undefined Index after export schema 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-19 17:59:02 +05:30
Madhura Jayaratne
7e4a3e480e Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-19 10:22:10 +05:30
Madhura Jayaratne
e8ced3949d bug #4812 Issues with index dialog while creating a table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-19 10:16:04 +05:30
Madhura Jayaratne
15b8c778c0 Use standard font size 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-19 08:56:22 +05:30
Marc Delisle
582be8cdbe Merge pull request #1585 from harish095/Bug-Fix-#4792 
Bug Fix #4792
 2015-03-18 14:14:57 -04:00
Madhura Jayaratne
6f4f4dbd6c Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-18 13:13:35 +05:30
Madhura Jayaratne
b678749e7c Add a class for styling 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-18 13:09:42 +05:30
Madhura Jayaratne
15c19a3b31 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-03-18 13:06:19 +05:30
Madhura Jayaratne
21302c235e Add a class for bitT column 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-18 13:04:56 +05:30
Madhura Jayaratne
24db9d5cde Set row span when there are more privileges 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-18 12:03:43 +05:30
Marc Delisle
b84c08f4d4 Merge branch 'QA_4_4' 2015-03-17 16:02:54 -04:00
Marc Delisle
a278b809a3 Merge branch 'QA_4_3' into QA_4_4 2015-03-17 16:02:03 -04:00
Marc Delisle
3c49594c56 Merge pull request #1588 from andreaval/QA_4_3 
Bug #4798 Missing column when exporting in sql (2)
 2015-03-17 16:00:06 -04:00
Andrea Vallorani
364b26b0dd Bug #4798 Missing column when exporting in sql (2) 
Export failure when the comments contains reserved keywords (KEY, CONSTRAINT)
To resolve, I removed the SQL comment from the current line before checking the presence of reserved keywords.

Signed-off-by: Andrea Vallorani <andrea.vallorani@gmail.com>
 2015-03-17 18:15:13 +01:00
Marc Delisle
8209948ba7 Merge commit 'e12582a' 2015-03-17 08:47:31 -04:00
Marc Delisle
08adc35651 Merge branch 'QA_4_3' into QA_4_4 2015-03-17 08:44:17 -04:00
harish095
69063ae4a5 Bug fix #4792 
Signed-off-by: harish095 <kandalaharish95@gmail.com>
 2015-03-17 08:05:47 +05:30
Nisarg Jhaveri
e12582acdb Fix bug#4807 
Don't add `.` if table name is not set when trying to get column in
sort expression.

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-03-16 19:04:42 +05:30
Marc Delisle
9a400be32d Merge commit '18bccea' 2015-03-16 08:02:03 -04:00
Marc Delisle
31472e0cf0 Merge branch 'QA_4_3' into QA_4_4 2015-03-16 07:59:52 -04:00
Marc Delisle
d5ae95d7ff Merge pull request #1578 from devenbansod/QA_4_3 
Fixes bug #4803
 2015-03-16 07:58:21 -04:00
Madhura Jayaratne
9f1f0e6bc1 Per server iv 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-16 08:34:40 +05:30
Deven Bansod
18bccea291 Fixes bug #4803 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-03-16 05:09:26 +05:30
Marc Delisle
c326cc9542 Merge pull request #1572 from tapanhalani/master 
Fix Feature#1609- Lock page navigation when entering data.
 2015-03-15 06:52:28 -04:00
Tapan Halani
0ac7e8f0f6 Fix feature#1609: Lock page navigation when entering data. 
Signed-off-by: Tapan Halani <tapanhalani231@gmail.com>
 2015-03-14 22:07:44 +05:30
Marc Delisle
71530b3089 4.3.13-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-14 07:13:00 -04:00
Marc Delisle
7714e86e74 Merge pull request #1563 from madhuracj/rfe1561 
Per server iv
 2015-03-13 12:21:19 -04:00
Marc Delisle
d295244b7b Merge pull request #1565 from udan11/coding_style 
Fix minor coding style issues.
 2015-03-12 08:58:24 -04:00
Madhura Jayaratne
aa74cd29fb Styles were affecting edit columns as well as edit central columns 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 18:47:33 +05:30
Dan Ungureanu
5e27e54f60 Fix minor coding style issues. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-03-11 14:52:04 +02:00
Madhura Jayaratne
ebbaf9685c Improve UI consistency 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 18:05:43 +05:30
Madhura Jayaratne
536a9fd0e6 Use a checkbox for the extra column 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 17:46:03 +05:30
Marc Delisle
80a9c4518f 4.4.0-beta1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-11 07:40:54 -04:00
Madhura Jayaratne
80fad9010c on update CURRENT_TIMESTAMP is now under attributes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 16:55:40 +05:30
Madhura Jayaratne
5e5f5de6dd Use same column order here as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 16:53:22 +05:30
Madhura Jayaratne
390796c01e Use column order similar to create table page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 16:45:18 +05:30
Madhura Jayaratne
0b65741505 Use an icon consistent with the rows 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 16:34:00 +05:30
Madhura Jayaratne
9079e896ca Float content to left in add more columns panel 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 16:25:49 +05:30
Madhura Jayaratne
d162f4f3bd Per server iv 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 15:32:46 +05:30
Madhura Jayaratne
a093119b19 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 10:52:30 +05:30
Madhura Jayaratne
df38a76b9f rfe #1306 Add lock tables, disable keys options 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 10:48:59 +05:30
Marc Delisle
a3b95b6951 Merge pull request #1555 from devenbansod/feat-req-1614 
Tries to implement RFE #1614.
 2015-03-10 12:18:44 -04:00
Deven Bansod
6bfe67c82b Tries to implement RFE #1614. 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-03-11 02:00:48 +05:30
Marc Delisle
39ba31b5ca Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-10 10:05:11 -04:00
Marc Delisle
e234d849f1 Missing ending punctuation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-10 07:47:00 -04:00
Rakesh Kumar
f1ded5625f #1613 Central columns: action on multiple columns 
Signed-off-by: Rakesh Kumar <rakeshkumar4294@gmail.com>
 2015-03-10 14:53:51 +05:30