gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
91,972 Commits 12 Branches 481 Tags 2.4 GiB
7efb5bd96b
Commit Graph

11367 Commits

Author SHA1 Message Date
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
Hugues Peccatte
ebc2739c89 Update documentation. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-22 21:36:26 +02:00
Hugues Peccatte
8873df3581 Update queries about DB navigation. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-22 21:20:56 +02:00
Michal Čihař
94988899c5 Add missing full stop 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-04-22 14:06:44 +02:00
Marc Delisle
dbc6d3e06f Clarify function description 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-22 07:58:16 -04:00
Marc Delisle
9899ac3e93 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-21 16:36:19 -04:00
Marc Delisle
f310833cb4 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-21 16:26:27 -04:00
Marc Delisle
75b3820eac Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-21 16:15:40 -04:00
Hugues Peccatte
5ca2afd632 Remove useless comments. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-21 22:14:33 +02:00
Hugues Peccatte
6cb5756e7d Manage a config proporty to limit the number of items at first level in navigation panel. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-21 22:14:31 +02:00
Marc Delisle
8ef6a0fac0 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-21 16:12:35 -04:00
Marc Delisle
db6ec58907 bug #4372 Changing browser transformation results in unnecessary table rebuild 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-21 16:07:49 -04:00
Ann + J.M
e0c64783a3 Merge branch QA_4_1 into master 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-04-21 20:01:09 +02:00
Hugues Peccatte
2d8ed166e3 Merge pull request #1149 from Tithugues/b4375 
Group two databases, when one's name is the prefix of the second one.
 2014-04-21 16:08:43 +02:00
Hugues Peccatte
1afc95134e Bug fix: #4375 Group two DB, one's name is the prefix of the other one. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-21 16:03:35 +02:00
Chanaka Indrajith
a7e8820820 Limited the access to _tables variable in PMA_RecentFavoriteTable class 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-04-20 22:47:14 +05:30
Hugues Peccatte
cd3ad518a7 Group two databases, when one's name is the prefix of the second one. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-20 16:30:30 +02:00
Chanaka Indrajith Dharmarathna
0c94149533 Merge pull request #1143 from WhaleWatching/navigation 
Improve RecentFavorite static function
 2014-04-20 19:09:23 +05:30
Edward Cheng
a0193c934e Improve RecentFavorite static function 
Signed-off-by: Edward Cheng <c4150221@gmail.com>

Bug fix
Signed-off-by: Edward Cheng <c4150221@gmail.com>

Change var name, make __construct private, init the var at getInstance().
Signed-off-by: Edward Cheng <c4150221@gmail.com>

Fixes.
Signed-off-by: Edward Cheng <c4150221@gmail.com>

streamline code

Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-04-19 17:19:12 +08:00
Hugues Peccatte
e512768fce Fix coding style. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-18 18:51:04 +02:00
Marc Delisle
2f35b7f23e 4.2.0-beta1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-18 10:10:18 -04:00
Hugues Peccatte
b61c12bff1 Fix coding style. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-18 10:19:58 +02:00
Hugues Peccatte
5c9aa93c90 Fix coding style. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-17 20:29:18 +02:00
Hugues Peccatte
b8ca923968 Fix coding style. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-17 12:50:58 +02:00
Ann + J.M
e7e8b64dd1 HTML5 data attributes for favorite table links 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-04-17 09:02:28 +02:00
Ashutosh Dhundhara
ca562232dd Bug Fix: #4368 Recent/Favorite tables persist even if they don't exist. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-04-16 17:18:58 +05:30
Michal Čihař
8495ac3b50 Add Colognian translaation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-04-16 12:58:51 +02:00
Marc Delisle
a182cca004 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-14 12:26:32 -04:00
Marc Delisle
d1a067c4d9 4.1.14-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-13 06:34:10 -04:00
Ashutosh Dhundhara
57f8e18e96 Bug Fix: #4362 Adding index to column by button in structure view shows wrong dialog. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-04-12 18:34:47 +05:30
Michal Čihař
e82c1b2e09 Add CSPAllow to script-src as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-04-12 11:43:06 +02:00
Marc Delisle
9a1099eaee Merge commit 'd542180' 2014-04-11 13:17:46 -04:00
Marc Delisle
72f0507841 Merge commit 'f220ef2' 2014-04-11 13:17:15 -04:00
Marc Delisle
d542180fb1 Remove unneeded test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-11 13:16:28 -04:00