gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,186 Commits 12 Branches 481 Tags 2.4 GiB
331e7b9fda
Commit Graph

8150 Commits

Author SHA1 Message Date
Michal Čihař
6751384d16 Merge remote-tracking branch 'origin/QA_4_2' 2014-06-10 09:17:47 +02:00
Michal Čihař
e71869daf1 Merge branch 'b4445_42' of git://github.com/Tithugues/phpmyadmin into QA_4_2 
Conflicts:
	ChangeLog
 2014-06-10 09:15:00 +02:00
Michal Čihař
15b5051928 Merge branch 'b4442_42' of git://github.com/Tithugues/phpmyadmin into QA_4_2 
Conflicts:
	ChangeLog
 2014-06-10 09:14:07 +02:00
Michal Čihař
06abaaa33f Merge remote-tracking branch 'origin/QA_4_2' 2014-06-10 08:59:18 +02:00
Isaac Bennetch
307dd3b798 Bug 4449: Mediawiki export does not produce table header row; also fix related PHP warnings 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2014-06-09 16:37:43 -04:00
Chirayu Chiripal
33dfef377f RFE-759 Use aliases in SQL export for tables and columns 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-09 22:44:07 +05:30
Hugues Peccatte
8295af58b5 Update ChangeLog. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-09 16:46:27 +02:00
Hugues Peccatte
4a10628d81 Update ChangeLog. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-09 15:32:32 +02:00
Marc Delisle
a8572e1afd 4.2.3 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-08 18:37:09 -04:00
Marc Delisle
199982f0d0 4.2.4-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-08 18:35:23 -04:00
Madhura Jayaratne
d99088e794 Merge branch 'QA_4_2' 2014-06-08 23:55:22 +05:30
Madhura Jayaratne
55e87fe8fe bug #4434 Unchecking 'Show SQL queries' results NaN 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-06-08 23:44:39 +05:30
Marc Delisle
563fcfab53 Merge commit 'e2ce715' 2014-06-07 09:33:30 -04:00
Marc Delisle
e2ce71566f Missing space in index creation/edit generated query 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-07 09:31:17 -04:00
Marc Delisle
36d2c402fa Merge branch 'QA_4_2' 2014-06-07 09:03:10 -04:00
Marc Delisle
9342cc6709 Incorrect menu tab generation from usergroups 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-07 09:02:10 -04:00
Marc Delisle
34f56c1d7f ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-07 06:41:40 -04:00
Marc Delisle
662c54b77e Merge commit '588bb79' 2014-06-06 08:11:16 -04:00
Marc Delisle
588bb79413 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-06 08:10:32 -04:00
Madhura Jayaratne
dcfd72abad Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-06-06 12:06:33 +05:30
Madhura Jayaratne
0c159c56f2 Allow saving query charts as images 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-06-06 12:06:13 +05:30
Marc Delisle
17fd38e23e Merge branch 'QA_4_2' 2014-06-05 12:45:07 -04:00
Marc Delisle
94e43de453 Add enforcement of the minimum supported PHP version (5.3.0) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-05 12:44:34 -04:00
Marc Delisle
ee22d3e65d Merge branch 'QA_4_2' 2014-06-05 12:28:25 -04:00
Marc Delisle
9112d7c930 bug #4437 Problems due to missing enforcement of the minimum supported MySQL version 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-05 12:27:03 -04:00
Madhura Jayaratne
9455673a26 Merge branch 'QA_4_2' 2014-06-05 16:48:57 +05:30
Madhura Jayaratne
2e645ede7f bug #4436 Insert form numeric field with function drop-down list 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-06-05 16:47:41 +05:30
Marc Delisle
a4cbabc533 Revert fix for bug #4415 that was not in this branch 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-01 13:34:41 -04:00
Marc Delisle
f5ee17fb40 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-01 13:12:19 -04:00
Chirayu Chiripal
73f8189df2 changelog: plus sign for rfe 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-01 11:51:29 +05:30
Marc Delisle
f28cc43b28 Merge commit '206f4f4' 2014-05-31 15:31:19 -04:00
Marc Delisle
206f4f45a2 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-31 15:30:07 -04:00
Marc Delisle
a2c3db5fa9 Merge branch 'QA_4_2' 2014-05-31 11:42:03 -04:00
Marc Delisle
e5367c1c40 bug #4433 Missing privileges submenu 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-31 11:41:10 -04:00
Marc Delisle
2a42b64499 Merge branch 'QA_4_2' 2014-05-31 11:15:50 -04:00
Marc Delisle
c75e168fdc ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-31 11:15:11 -04:00
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