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

11400 Commits

Author SHA1 Message Date
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
Marc Delisle
634307329e 4.2.3-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-20 08:28:42 -04:00
Marc Delisle
fda047361d Fix notice 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-20 08:21:27 -04:00
Marc Delisle
7937cbde62 Complete the fix for bug #4418 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-19 17:38:55 -04:00
Ann + J.M
9207203a56 Code style fixes 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 22:51:33 +02:00
Ann + J.M
d9bd81a2a1 Code style fixes 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 22:40:24 +02:00
Ann + J.M
69ddb29989 Code style fixes 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 22:33:01 +02:00
Ann + J.M
5cab1dfbf2 Add string check for json_decode in SavedSearches::setCriterias 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 22:20:14 +02:00
Ann + J.M
ec5292fb31 Config class: Drop dead initializations 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 22:06:52 +02:00
Ann + J.M
6743e78ea4 PMA_Bookmark_delete: Drop unnecessary $db param 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 22:04:22 +02:00
Ann + J.M
8838d58666 Advisor class: Drop unnecessary initialization 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 22:03:39 +02:00
Ann + J.M
b3dbec1107 Advisor: Check for possibly undefined memory usage values 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 21:48:25 +02:00
Ann + J.M
486dd3b4e3 Monitor: Check for possibly undefined memory usage values 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 13:32:53 +02:00
Marc Delisle
e813cab608 bug #4418 When copying databases, primary key attributes get lost 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-18 13:22:14 -04:00
Madhura Jayaratne
117490393a Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2 
Conflicts:
	ChangeLog
 2014-05-18 14:11:56 +05:30
Madhura Jayaratne
33343fbdf4 bug #4398 Monitor should fit into screen width 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-18 14:09:51 +05:30
Marc Delisle
2986cdcd8a bug #4419 No more calendar into search tab 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-17 07:39:04 -04:00
Petr Tomášek
99dca5d7a6 Respect ['ShowCreateDb'] in the navi panel 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-16 12:35:28 -04:00
Marc Delisle
e2817dfdfd Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2 2014-05-16 09:56:52 -04:00
Marc Delisle
0ee881da71 bug #4395 BLOB link transformation is broken 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-16 09:56:47 -04:00
Isaac Bennetch
0dbbab8fdc Merge pull request #1169 from D-storm/bug-4392 
Bug #4392: Cannot see databases in nav panel on databases grouping when ...
 2014-05-16 09:54:43 -04:00
Marc Delisle
fa1a290948 Merge pull request #1183 from D-storm/bug-4411 
Bug fix #4411 : Fixed ProtectBinary behaviour on insert operation
 2014-05-16 07:51:16 -04:00
Chirayu Chiripal
7f445f99e3 Bug fix #4411 Protect Binary when set to no in settings still does not allow insert binary data 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>

test case fix

Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-15 20:05:52 +05:30
Chirayu Chiripal
aa2c9cd5d6 Bug fix #4414 table display of performance_schema DB structure 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-15 15:09:26 +05:30
Marc Delisle
6be855a6c6 4.2.2-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-12 08:03:14 -04:00
Marc Delisle
44efb8c8f8 Merge pull request #1172 from D-storm/bug-4390 
Bug #4390: Data type changing by itself
 2014-05-12 07:49:57 -04:00
Michal Čihař
b177557c11 Use preg_quote instead of home made replacement to quote string for preg 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 17:35:49 +02:00
Chirayu Chiripal
9154902f6d Bug #4390: Data type changing by itself 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-10 17:37:20 +05:30
Chirayu Chiripal
0d4d696957 Bug #4392: Cannot see databases in nav panel on databases grouping when disabled database expansion 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-10 12:28:47 +05:30
Madhura Jayaratne
bc816af900 Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2 
Conflicts:
	ChangeLog
 2014-05-04 16:24:01 +05:30
Madhura Jayaratne
27202362f0 bug #4313 GIS Visualization Extension does not work with PointFromText() function 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-04 16:18:51 +05:30
Marc Delisle
45d6f47c84 Incorrect attributes for number fields 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-02 08:04:17 -04:00
Marvin Wegener
1690c6fa32 Fix number field size and remove incorrect attributes 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-02 07:55:50 -04:00
Michal Čihař
c1f6b23445 Correctly fetch length of user and host fields in MySQL tables 
Parsing text output is broken and we can get these lengths directly from
information_schema.

See also pull request #1160

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-04-30 08:52:09 +02:00
Marc Delisle
719b1624e3 bug #4381 Cannot remove the last remembered sorted column 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-28 11:48:31 -04:00
Hugues Peccatte
6fb15d8a41 Use PMA_String class to substr multi-bytes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-27 17:30:58 +02:00
Hugues Peccatte
520872da74 Fix 'phpmyadmin refuses to show tables with enums containing special data' bug #4380 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>

Conflicts:
	ChangeLog
 2014-04-27 17:30:19 +02:00
Marc Delisle
fc2cd8f41b 4.2.1-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-27 08:46:30 -04:00
Marc Delisle
89f7dffecc Merge commit 'bd9e66f' 2014-04-26 17:59:39 -04:00
Atul Pratap Singh
9d76696650 We decided to display pagination after 250, see http://sourceforge.net/p/phpmyadmin/mailman/message/31333321/ 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-04-27 05:33:12 +05:30
Ashutosh Dhundhara
bd9e66f4bc Bug Fix: #4366 Creating Index doesn't update index-list. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-04-27 01:00:10 +05:30
Edward Cheng
d51d7de78a A simple fix for bug #4378 
Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-04-26 22:25:32 +08:00
Marc Delisle
ecb9f777ea 4.1.14 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-26 06:50:51 -04:00
Marc Delisle
68a4cee50f Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-26 06:31:54 -04:00
Marc Delisle
48cee9be09 Now that MaxNavigationItems is no longer related to the number of databases, it makes more sense to lower its default value 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-25 06:13:51 -04:00
Marc Delisle
35e282ab4b Remove extra space and improve the message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-24 14:50:47 -04:00
Marc Delisle
e9ddfaf03e Merge pull request #1153 from Tithugues/b4070 
#4070 Confusing database/table grouping
 2014-04-24 12:55:50 -04:00
Hugues Peccatte
aab859a7a8 Fix wrong table page selector. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-24 16:29:39 +02:00
Marc Delisle
89f21f5109 About bug #4280: try to workaround PHP 5 session garbage collection 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-24 09:15:03 -04:00
Hugues Peccatte
9870cb5142 Update DB group queries format. 
Update DB group test.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-23 21:30:12 +02:00