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

9097 Commits

Author SHA1 Message Date
Madhura Jayaratne
85064d4ae3 Merge branch 'QA_4_4' 2015-04-24 10:03:41 +05:30
Madhura Jayaratne
738b37477b bug #4869 Drop column action not asking to confirm 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-24 10:01:29 +05:30
Madhura Jayaratne
648e2e1120 Merge branch 'QA_4_4' 2015-04-24 06:08:20 +05:30
Madhura Jayaratne
ef3b023c63 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-24 06:06:50 +05:30
Madhura Jayaratne
b4cddffe9d bug #4870 Inconsistency in 'Ignore' checkbox in insert page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-24 06:05:01 +05:30
Marc Delisle
408675bb13 Merge branch 'QA_4_4' 2015-04-23 14:49:45 -04:00
Marc Delisle
64aa8cd2ab ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-23 14:49:14 -04:00
Madhura Jayaratne
95eb45fddc rfe #1661 Support checksum table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-23 15:05:53 +05:30
Madhura Jayaratne
c6d21e3c16 rfe Option groups for 'With selected' dropdown in database structure page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-23 13:10:27 +05:30
Madhura Jayaratne
8dc1fe4727 Merge branch 'QA_4_4' 2015-04-23 12:48:26 +05:30
Madhura Jayaratne
179e581475 bug #4866 Limit column ordering in index edit dialog 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-23 12:47:03 +05:30
Marc Delisle
efa7f0d3c9 Merge commit 'f120a77' 2015-04-22 09:46:43 -04:00
Marc Delisle
f120a77f4c bug #4865 sprintf(): Too few arguments 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-22 09:45:22 -04:00
Marc Delisle
0fe34e4ef2 Merge branch 'QA_4_4' 2015-04-21 11:28:35 -04:00
Marc Delisle
b0ddd7e743 bug #4861 Use of undefined constant PMA_DRIZZLE 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-21 11:28:08 -04:00
Madhura Jayaratne
8d8b2677db Merge branch 'QA_4_4' 2015-04-21 11:34:37 +05:30
Madhura Jayaratne
2981728987 bug #4862 Misaligned Inline edit field 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-21 11:33:16 +05:30
Madhura Jayaratne
9627e352b0 Merge branch 'QA_4_4' 2015-04-21 10:20:26 +05:30
Madhura Jayaratne
a204b56f2d Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-21 10:19:17 +05:30
Madhura Jayaratne
af2755217f bug #4859 Don't scroll (to bottom) when editing multiple rows 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-21 10:17:00 +05:30
Marc Delisle
924b8d0ddd Merge branch 'QA_4_4' 2015-04-20 12:03:33 -04:00
Marc Delisle
f5361aadf0 Ticket was moved to bugs 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-20 12:03:00 -04:00
Madhura Jayaratne
a74f0d97df Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-20 18:39:35 +05:30
Madhura Jayaratne
60e3af04fd bug #1656 Edit vs Change 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-20 18:04:50 +05:30
Marc Delisle
ce73509ecf 4.4.4-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-20 07:40:54 -04:00
Marc Delisle
e603b3459a 4.4.4-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-20 07:39:51 -04:00
Marc Delisle
6e7386ee91 Merge branch 'QA_4_4' 2015-04-19 05:58:38 -04:00
Marc Delisle
ec72500d52 bug #4830 Maximum execution time exceeded in Util.class.php 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-19 05:57:47 -04:00
Marc Delisle
6b44f39c21 Merge branch 'QA_4_4' 2015-04-17 08:41:43 -04:00
Smita Kumari
71f07d1e87 edit changeLog 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2015-04-17 17:33:21 +05:30
Madhura Jayaratne
a90fd8096a rfe #1655 Support IPv6 browser transformation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-17 14:33:56 +05:30
Marc Delisle
146f790b47 Merge branch 'QA_4_4' 2015-04-16 09:01:20 -04:00
Marc Delisle
95868e896e Bug PHP 7 session_regenerate_id() warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-16 09:00:28 -04:00
Marc Delisle
7df3cb4552 Merge branch 'QA_4_4' 2015-04-15 14:57:13 -04:00
Marc Delisle
011438e74a Bug PHP 7 compatibility in bfShapeFiles 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-15 12:56:56 -04:00
Marc Delisle
1ad1a3846b Merge branch 'QA_4_4' 2015-04-15 12:17:58 -04:00
Marc Delisle
77369e5e2b Bug PHP 7 compatibility in php-gettext 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-15 11:32:31 -04:00
Marc Delisle
c8b943b556 Revert "Bug PHP 7 compatibility in php-gettext" 
This reverts commit e637c57c42.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-15 10:18:49 -04:00
Marc Delisle
e637c57c42 Bug PHP 7 compatibility in php-gettext 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-15 10:06:48 -04:00
Marc Delisle
36ca744181 Merge commit '603f93d' 2015-04-15 08:03:40 -04:00
Marc Delisle
603f93d168 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-15 08:01:01 -04:00
Madhura Jayaratne
d1b77a2949 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-15 09:00:32 +05:30
Madhura Jayaratne
91da1a8f38 Fix issues related to number of decimal places in time 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-15 08:55:44 +05:30
Madhura Jayaratne
29f59a7090 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-15 08:16:03 +05:30
Madhura Jayaratne
0e13997475 bug #4794 Server error viewing table content 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-15 07:56:17 +05:30
Marc Delisle
bc76252f26 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-14 13:29:23 -04:00
Marc Delisle
c16798e0b4 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-14 13:27:43 -04:00
Madhura Jayaratne
5b8b8bc8dc Merge branch 'QA_4_4' 2015-04-14 22:57:35 +05:30
Madhura Jayaratne
0f3840138f bug #4207 json_encode error due to strftime returning non utf8 chars in Windows 8.1 Chinese version 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-14 22:56:00 +05:30
Marc Delisle
6806cff468 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-14 13:11:47 -04:00