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

8114 Commits

Author SHA1 Message Date
Madhura Jayaratne
2a5a816753 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-05-30 22:13:47 +05:30
Madhura Jayaratne
cc0fa75cce rfe #1527 Charts for data in <x-axis, series, value> format 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-30 22:12:23 +05:30
Marc Delisle
9376bf580e Merge commit '785ad04' 2014-05-28 15:50:26 -04:00
Marc Delisle
785ad04b38 bug #4405 Cannot import (open_basedir) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-28 15:43:06 -04:00
Madhura Jayaratne
6ef94bec20 Merge branch 'QA_4_2' 2014-05-28 14:06:44 +05:30
Madhura Jayaratne
511c105222 bug #4432 Error while displaying chart at server level 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-28 14:05:40 +05:30
Ashutosh Dhundhara
51b6fc08f3 Fix merge conflict. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Conflicts:
	ChangeLog
 2014-05-25 19:27:10 +05:30
Ashutosh Dhundhara
d8134c9116 RFE#706: Multi-db privileges adding. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-05-25 19:25:36 +05:30
Marc Delisle
9810813411 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-25 08:20:15 -04:00
Marc Delisle
489826139e Merge commit '16036ac' 2014-05-23 10:31:20 -04:00
Atul Pratap Singh
16036ac143 Fix bug#4424 Table indexes disappear after altering field 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-05-22 23:44:31 +05:30
Marc Delisle
6e7c8439c0 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-05-21 12:52:09 -04:00
Marc Delisle
0db68db620 Merge branch 'QA_4_2' 2014-05-21 12:51:03 -04:00
Marc Delisle
c2d719b4eb bug #4423 Moving fields not working 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-21 12:49:55 -04:00
Chirayu Chiripal
85390a7169 rfe-982: Support for editing binary fields in hexadecimal 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-21 21:42:21 +05:30
Marc Delisle
161d22a587 4.2.3-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-20 08:30:25 -04:00
Marc Delisle
634307329e 4.2.3-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-20 08:28:42 -04:00
Ann + J.M
71fb5057a3 rfe #1523 Better visual clue for table structure primary key column 
Signed-Off-By: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 14:02:08 +02:00
Marc Delisle
749becaea0 Merge commit '67901f3' 2014-05-18 13:54:33 -04:00
Marc Delisle
67901f390e ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-18 13:53:27 -04:00
Marc Delisle
39c181ca1e Merge branch 'QA_4_2' 2014-05-18 13:23:16 -04:00
Marc Delisle
e813cab608 bug #4418 When copying databases, primary key attributes get lost 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-18 13:22:14 -04:00
Madhura Jayaratne
f79ab273a2 Merge branch 'QA_4_2' 2014-05-18 14:16:16 +05:30
Madhura Jayaratne
117490393a Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2 
Conflicts:
	ChangeLog
 2014-05-18 14:11:56 +05:30
Madhura Jayaratne
33343fbdf4 bug #4398 Monitor should fit into screen width 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-18 14:09:51 +05:30
Marc Delisle
5574368089 Merge branch 'QA_4_2' 2014-05-17 07:40:49 -04:00
Marc Delisle
2986cdcd8a bug #4419 No more calendar into search tab 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-17 07:39:04 -04:00
Hugues Peccatte
81cd594ea4 ChangeLog entry 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-17 07:39:09 +02:00
Hugues Peccatte
a0397557fc ChangeLog entry 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-17 07:38:17 +02:00
Marc Delisle
f5e76d1b1d Merge branch 'QA_4_2' 2014-05-16 12:36:52 -04:00
Marc Delisle
52cf4a6491 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-16 12:36:18 -04:00
Marc Delisle
49f1bdd822 Merge commit '0ee881d' 2014-05-16 12:20:52 -04:00
Marc Delisle
0ee881da71 bug #4395 BLOB link transformation is broken 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-16 09:56:47 -04:00
Marc Delisle
1a5292e081 Merge commit '453178b' 2014-05-16 07:54:08 -04:00
Marc Delisle
453178b9cd ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-16 07:53:05 -04:00
Marc Delisle
9a81facf41 Merge commit '1365435' 2014-05-15 12:50:16 -04:00
Marc Delisle
13654357ff ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-15 12:47:06 -04:00
Isaac Bennetch
572032bc1f ChangeLog entry for https://github.com/phpmyadmin/phpmyadmin/pull/1180 2014-05-15 12:14:36 -04:00
Marc Delisle
0e339dcb64 Merge commit 'cf74364' 2014-05-14 08:20:55 -04:00
Marc Delisle
cf743642a8 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-14 08:18:21 -04:00
Marc Delisle
0adcec8663 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-14 07:14:41 -04:00
Marc Delisle
6f738d5834 Merge commit '9f9d85c' 2014-05-13 12:25:32 -04:00
Marc Delisle
9f9d85c382 4.2.1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-13 12:24:51 -04:00
Marc Delisle
4baa72d4e5 4.2.2-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-12 08:04:19 -04:00
Marc Delisle
6be855a6c6 4.2.2-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-12 08:03:14 -04:00
Marc Delisle
3a53d2c926 Merge commit '69369fe' 2014-05-12 07:54:37 -04:00
Marc Delisle
69369fe896 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-12 07:51:51 -04:00
Marc Delisle
c9d93bb583 Merge commit 'f1712b2' 2014-05-10 16:18:13 +02:00
Marc Delisle
f1712b2492 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-10 16:16:03 +02:00
Marc Delisle
15f42ca8c6 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-10 12:55:41 +02:00