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

13508 Commits

Author SHA1 Message Date
Madhura Jayaratne
15caf48a9a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-20 13:54:02 +05:30
Madhura Jayaratne
0d109ac824 This is only a output transformation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-20 13:52:03 +05:30
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
ed27666193 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-18 06:28:21 -04:00
Marc Delisle
6b44f39c21 Merge branch 'QA_4_4' 2015-04-17 08:41:43 -04:00
Smita Kumari
90336ba418 fix bug #4857 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2015-04-17 16:09:43 +05:30
Madhura Jayaratne
a8decb18db Adhere to coding style. Check for length of 4 first 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-17 14:41:46 +05:30
Madhura Jayaratne
bb8ca9eab5 Update description 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-17 14:35:13 +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
Madhura Jayaratne
cee4764196 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-17 08:59:07 +05:30
Madhura Jayaratne
4dfaa448eb Better way to check for ui preferences 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-17 08:57:54 +05:30
Dan Ungureanu
f9a88ad930 Old MySQL extension is not available in newer PHP versions. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-16 11:23:50 -04:00
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
Madhura Jayaratne
f15f67e604 More resources 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-15 18:18:30 +05:30
Madhura Jayaratne
266588e74f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-15 18:09:22 +05:30
Madhura Jayaratne
3e363c45b9 These are resources 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-15 18:08:32 +05:30
Marc Delisle
223b205866 Merge commit '9a04e80' 2015-04-15 08:03:17 -04:00
Marc Delisle
1659caf8e8 Merge pull request #1646 from madhuracj/Bug4853 
Bug #4853 Relation view between 1600 and 1780 px
 2015-04-15 08:00:23 -04:00
Madhura Jayaratne
9a04e80561 Make the layout responsive 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-15 16:58:11 +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
111cb8235a $meta->decimals is not available for mysql extension 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-15 08:12:07 +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
0327c0273d Merge commit 'cfa542c' 2015-04-14 13:28:48 -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
Ryan Stasel
cfa542cfa9 Bug #4845 White screen (Cloudflare) 
Signed-off-by: Ryan Stasel <staze@staze.org>
 2015-04-14 13:09:56 -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
51f317690e Merge pull request #1644 from udan11/patch_1 
Old MySQL extension is not available in newer PHP versions.
 2015-04-13 15:13:24 -04:00
Dan Ungureanu
8cc3a7635c Old MySQL extension is not available in newer PHP versions. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-04-13 21:58:44 +03: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
ffac71c312 Consistently provide editing for procedures, functions, events and triggers 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-13 12:18:56 +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
6e748aa7fb Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-12 07:30:53 -04:00
Marc Delisle
4c6181dbf1 Fix some PMD ShortVariable warnings 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-12 07:02:59 -04:00
Marc Delisle
f9873b553a Starting from PHP 7, the mysql extension is no longer present 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-11 08:38:11 -04:00
Marc Delisle
81bf0afe40 Merge pull request #1637 from Kdecherf/master 
Add option to show/hide git revision on main panel
 2015-04-11 06:42:12 -04:00
Marc Delisle
9edefa2e6c Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-04-10 10:20:30 -04:00
Evert Beurskens
d76971d8dd Clarify configuration message 
Signed-off-by: Evert Beurskens evertbeurskens@gmail.com
 2015-04-10 10:18:38 -04:00