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

9071 Commits

Author SHA1 Message Date
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
Madhura Jayaratne
b398635e1a Merge branch 'QA_4_4' 2015-04-14 10:01:05 +05:30
Madhura Jayaratne
fe3a103767 bug #4851 PHP errors in login dialogue 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-14 09:57:52 +05:30
Marc Delisle
9dd71d465a 4.4.2 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-13 08:22:38 -04:00
Marc Delisle
8384d54fee 4.4.3-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-13 08:21:27 -04:00
Madhura Jayaratne
abe7f3bdcd Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-13 14:36:18 +05:30
Madhura Jayaratne
d56b35ec08 bug #4850 Relation view on 1920 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-13 14:34:44 +05:30
Madhura Jayaratne
0be5115f01 Merge branch 'QA_4_4' 2015-04-13 12:09:37 +05:30
Madhura Jayaratne
677c8f7c62 bug #4849 Functions accessed from navigation do not load on ajax dialog 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-13 12:07:44 +05:30
Madhura Jayaratne
66304349ad rfe #1639 Add grouping to stored procedures in the navigation tree 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-13 09:59:22 +05:30
Marc Delisle
a582077812 Merge branch 'QA_4_4' 2015-04-10 09:55:33 -04:00
Marc Delisle
566c9d1ced ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-10 09:54:40 -04:00
Madhura Jayaratne
ef981aa335 rfe #1632 Importing and exporting pMA meta-data 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-10 16:00:57 +05:30
Madhura Jayaratne
6a611abf99 rfe #1653 New data validation feature and datetime type 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-10 10:59:26 +05:30
Madhura Jayaratne
4bb1346913 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-09 21:01:09 +05:30
Madhura Jayaratne
be47fbac53 bug #4829 Create procedure via SQL Editor not more possible 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-09 20:56:57 +05:30
Madhura Jayaratne
fd7eab22d7 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-09 15:34:42 +05:30
Madhura Jayaratne
632ec90185 rfe #1643 No SQL query for loading data 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-09 15:33:44 +05:30
Marc Delisle
966252d33b Merge branch 'QA_4_4' 2015-04-08 11:29:05 -04:00
Marc Delisle
3099f2876e ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-08 11:28:13 -04:00
Marc Delisle
ba5c7c19dc Merge branch 'QA_4_4' 2015-04-08 08:14:57 -04:00
Marc Delisle
30323b8520 4.4.1.1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-08 08:13:04 -04:00
Madhura Jayaratne
0b57843356 rfe #1651 Allow copying mutiple rows 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-08 12:52:43 +05:30
Madhura Jayaratne
1c52bc2a81 rfe #1650 Support a default page in designer 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-08 10:15:27 +05:30
Michal Čihař
fd5cdbaab0 Merge commit '25a05bd6c81e0b938586e22e4a5eb229df99b01e' 2015-04-07 15:21:04 +02:00
Madhura Jayaratne
2b1a3732cb Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-04-07 18:24:21 +05:30
Madhura Jayaratne
25a05bd6c8 MIME Transformation link fixed 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-07 18:08:43 +05:30