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

8204 Commits

Author SHA1 Message Date
Marc Delisle
b1059197d7 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-02 06:50:05 -04:00
Atul Pratap Singh
f4b9d1f0aa Merge commit '18973db' 2014-07-02 14:13:21 +05:30
Atul Pratap Singh
18973db3c9 Changelog for 4482 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-07-02 11:45:21 +05:30
Marc Delisle
e52092c707 Merge branch 'QA_4_2' 2014-07-01 13:21:54 -04:00
Marc Delisle
cc9f364aab ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-07-01 13:20:48 -04:00
Marc Delisle
8453488a26 Merge commit '5b1fe4e' 2014-06-29 07:26:54 -04:00
Marc Delisle
50cf592e9d ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-29 07:16:43 -04:00
Hugues Peccatte
929dccb9a3 Cherry-pick dd5ba23: Fix #4471: Undefined index warning with referenced column. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-28 19:09:20 +02:00
Hugues Peccatte
920f83da2d Fix #4471: Undefined index warning with referenced column. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-26 21:03:17 +02:00
Marc Delisle
beb5803870 Merge branch 'QA_4_2' 2014-06-26 12:35:49 -04:00
Marc Delisle
719527d0e7 4.2.5 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-26 12:35:15 -04:00
Marc Delisle
39552e232a 4.2.6-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-26 10:02:49 -04:00
Marc Delisle
d8b3f9a766 4.2.6-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-26 10:01:48 -04:00
Marc Delisle
8ce1e316a6 Merge branch 'QA_4_2' 2014-06-26 09:58:01 -04:00
Marc Delisle
18e6cfd5c5 mcrypt: remove the requirement (64-bit) and the related warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-26 09:56:24 -04:00
Marc Delisle
e1b598ff1e Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-25 13:05:57 -04:00
Marc Delisle
e0933c8cba Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-25 13:03:44 -04:00
Michal ฤŒihaล™
e6f6dab3b0 Fixed cookie based login for installations without mcrypt 
bug #4469

Signed-off-by: Michal ฤŒihaล™ <michal@cihar.com>
 2014-06-25 14:08:03 +02:00
Chirayu Chiripal
026c8184dd bug-4473: incorrect result count when having clause is used w/o group by 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-25 14:24:57 +05:30
Chirayu Chiripal
32511719b1 RFE-1490 Dynamic process list 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-24 19:13:21 +05:30
Marc Delisle
268d980436 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-24 08:42:13 -04:00
Hugues Peccatte
72882ea016 Add missing include. (bug #4463) 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-23 18:33:48 +02:00
Hugues Peccatte
1fb1093d0d Add missing include. (bug #4463) 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-22 22:51:13 +02:00
Marc Delisle
695b3a7469 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-22 14:54:39 -04:00
Hugues Peccatte
f0368f0100 Update ChangeLog. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-22 17:01:58 +02:00
Hugues Peccatte
8b5ea8869d Update ChangeLog. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-22 17:00:58 +02:00
Marc Delisle
cf13eb2583 Merge branch 'QA_4_2' 2014-06-21 07:23:14 -04:00
Marc Delisle
da732cc88b ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-21 07:22:36 -04:00
Marc Delisle
67a705b053 Merge branch 'QA_4_2' 2014-06-20 15:41:05 -04:00
Marc Delisle
a30405fe0b bug #4467 shell_exec() has been disabled for security reasons 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-20 15:39:09 -04:00
Marc Delisle
88007a20bc Merge branch 'QA_4_2' 2014-06-20 12:53:08 -04:00
Marc Delisle
f1253cf31f 4.2.4 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-20 12:52:26 -04:00
Marc Delisle
9f37c3ddd7 Fix merge conflits 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-20 12:44:51 -04:00
Marc Delisle
aea604f850 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-20 12:40:11 -04:00
Marc Delisle
85cc97b3fa 4.2.5-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-20 08:48:53 -04:00
Marc Delisle
aebfcfdc9f 4.2.5-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-20 08:47:51 -04:00
Ann + J.M
c68ed5c51b Add Changelog section for 4.2.4.0, list bugs 4464, 4465 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-19 15:26:40 +02:00
Marc Delisle
da7fe3a137 Merge commit '9ca3784' 2014-06-18 12:06:53 -04:00
Chirayu Chiripal
3ea7d2b52d rfe-755: export with table/column name changes 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-16 22:41:50 +05:30
Chirayu Chiripal
9ca3784568 fix: sql export views as tables getting ignored 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-15 23:39:09 +05:30
Marc Delisle
ed9265489b Merge branch 'QA_4_2' 2014-06-15 10:10:18 -04:00
Marc Delisle
7e5e4d026d bug #4435 WHERE clause can be undefined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-15 10:07:38 -04:00
Marc Delisle
dcb4163369 Merge commit 'a33fcad' 2014-06-14 09:21:04 -04:00
Marc Delisle
a33fcad037 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-14 09:19:56 -04:00
Isaac Bennetch
85fdd3cef3 Merge branch 'D-storm-so' 
bug-fix: 4457 SQL tab - Insert queries not showing affected row count

Conflicts:
	ChangeLog
 2014-06-13 09:43:56 -04:00
Isaac Bennetch
ddadc4853e Merge branch 'D-storm-so' into QA_4_2 
bug-fix: 4457 SQL tab - Insert queries not showing affected row count

Conflicts:
	ChangeLog
 2014-06-13 09:40:15 -04:00
Marc Delisle
052eb0ecac Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-13 07:44:39 -04:00
Marc Delisle
531fff09fe bug #4405 Cannot import (open_basedir): fix another case 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-13 07:42:14 -04:00
Atul Pratap Singh
d909aa66b7 Fix bug#4450 Query is duplicated on Ctrl+Enter 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-06-13 11:10:23 +05:30
Chirayu Chiripal
4c4cee598a bugfix: insert queries not showing affected row counts 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-13 00:39:28 +05:30