gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,420 Commits 12 Branches 481 Tags 2.4 GiB
2be24a07ff
Commit Graph

8064 Commits

Author SHA1 Message Date
Marc Delisle
15f42ca8c6 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-10 12:55:41 +02:00
Michal Čihař
8341ddea85 Add ChangeLog entry for rfe #1518 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 10:07:40 +02:00
Marc Delisle
ff86eec0df 4.2.0 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-08 13:20:37 +02:00
Marc Delisle
04210d1b03 Merge branch 'QA_4_2' 2014-05-06 08:27:13 -04:00
Marc Delisle
b0c1a01556 bug #4385 Grid edit on sorted columns fails 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-06 08:26:02 -04:00
Marc Delisle
7d549c9e81 Merge branch 'QA_4_2' 2014-05-05 06:00:23 -04:00
Marc Delisle
d4cdc62fb0 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-05 05:59:33 -04:00
Madhura Jayaratne
49922f24f9 Merge branch 'QA_4_2' 2014-05-04 16:26:05 +05:30
Madhura Jayaratne
bc816af900 Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2 
Conflicts:
	ChangeLog
 2014-05-04 16:24:01 +05:30
Madhura Jayaratne
27202362f0 bug #4313 GIS Visualization Extension does not work with PointFromText() function 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-04 16:18:51 +05:30
Marc Delisle
dcbbbea6bc Merge commit '68c42a9' 2014-05-03 09:46:47 -04:00
Marc Delisle
68c42a9738 bug #4383 Cannot update values in Zoom search 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-03 09:44:54 -04:00
Marc Delisle
77466e2c87 Merge commit '45d6f47' 2014-05-02 08:05:15 -04:00
Marc Delisle
45d6f47c84 Incorrect attributes for number fields 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-02 08:04:17 -04:00
Marc Delisle
d14796361a Merge branch 'QA_4_2' 2014-04-30 13:23:56 -04:00
Marc Delisle
66dcc9d32a bug #4382 Missing source for OpenLayers library: retrieved source code from OpenLayers 2.10 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-30 13:22:43 -04:00
Marc Delisle
bc435c9978 Merge branch 'QA_4_2' 2014-04-30 08:31:01 -04:00
Marc Delisle
8d43cedeff bug #4364 examples/signon.php does not support the SessionSavePath directive 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-30 08:30:11 -04:00
Michal Čihař
32f44ae081 Merge remote-tracking branch 'origin/QA_4_2' 2014-04-30 08:54:22 +02:00
Michal Čihař
c1f6b23445 Correctly fetch length of user and host fields in MySQL tables 
Parsing text output is broken and we can get these lengths directly from
information_schema.

See also pull request #1160

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-04-30 08:52:09 +02:00
Marc Delisle
de0a22d51b Merge commit '719b162' 2014-04-28 11:51:18 -04:00
Marc Delisle
719b1624e3 bug #4381 Cannot remove the last remembered sorted column 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-28 11:48:31 -04:00
Marc Delisle
14d5f77ed6 Merge commit 'f880e55' 2014-04-27 13:30:19 -04:00
Marc Delisle
58f9d3cbfa Merge commit '6fb15d8' 2014-04-27 13:29:50 -04:00
Marc Delisle
f880e5591c Move ChangeLog entry and clarify it 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-27 13:28:09 -04:00
Hugues Peccatte
520872da74 Fix 'phpmyadmin refuses to show tables with enums containing special data' bug #4380 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>

Conflicts:
	ChangeLog
 2014-04-27 17:30:19 +02:00
Marc Delisle
9e5602eb37 4.3.0-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-27 08:49:45 -04:00
Marc Delisle
fc2cd8f41b 4.2.1-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-27 08:46:30 -04:00
Marc Delisle
4299961046 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-26 18:01:41 -04:00
Marc Delisle
972642f86d 4.1.14 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-26 06:52:53 -04:00
Marc Delisle
e9ddfaf03e Merge pull request #1153 from Tithugues/b4070 
#4070 Confusing database/table grouping
 2014-04-24 12:55:50 -04:00
Hugues Peccatte
3319c634cc Update ChangeLog. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-22 21:29:33 +02:00
Marc Delisle
d60d2d402d Patch was reverted 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-22 09:32:51 -04:00
Marc Delisle
75b3820eac Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-21 16:15:40 -04:00
Marc Delisle
db6ec58907 bug #4372 Changing browser transformation results in unnecessary table rebuild 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-21 16:07:49 -04:00
Ann + J.M
e0c64783a3 Merge branch QA_4_1 into master 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-04-21 20:01:09 +02:00
Ann + J.M
7c39228a1b Add ChangeLog entry for bug #4376 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-04-21 19:57:07 +02:00
Hugues Peccatte
1afc95134e Bug fix: #4375 Group two DB, one's name is the prefix of the other one. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-21 16:03:35 +02:00
Hugues Peccatte
b393eabe1e Update ChangeLog. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-21 14:34:33 +02:00
Marc Delisle
460fa1b39c ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-19 07:57:59 -04:00
Marc Delisle
c9979a4588 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-17 06:11:15 -04:00
Marc Delisle
a81ff24341 Merge commit '0ece94e' 2014-04-15 12:36:58 -04:00
Marc Delisle
0ece94e5f3 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-15 12:32:43 -04:00
Marc Delisle
87eca2dfae 4.1.14-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-13 06:36:03 -04:00
Marc Delisle
d1a067c4d9 4.1.14-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-13 06:34:10 -04:00
Marc Delisle
609c0acaf3 Merge commit 'b82fe09' 2014-04-12 07:28:17 -04:00
Marc Delisle
b82fe0977e ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-12 07:10:26 -04:00
Marc Delisle
2129098824 Merge commit '1842f13' 2014-04-11 13:17:37 -04:00
Marc Delisle
1842f13488 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-11 13:02:57 -04:00
Marc Delisle
fb96545044 Merge commit '5fb647c' 2014-04-10 11:29:37 -04:00