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

92124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ann + J.M
ddbe5aed27 DBQbe::_getInsDelAndOrCell: Fix PHPDoc param type 2014-05-21 20:19:23 +02:00
Ann + J.M
9f186aae7d ini_set: Use string for param 2 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-21 20:19:17 +02:00
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
45f33fdafe Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2 2014-05-20 08:28:52 -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
Weblate
c3860e8f5b Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-20 14:21:52 +02:00
Jouni Kähkönen
37ea4aa905 Translated using Weblate (Finnish) 
Currently translated at 62.2% (1722 of 2768)
 2014-05-20 14:21:49 +02: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
67901f390e ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-18 13:53:27 -04:00
Todd Crane
17b085148c bug #4421 empty maxInputVars on js/messages.php 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-18 13:51:36 -04:00
Weblate
a941632ad8 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-18 19:22:58 +02:00
Yungu Kim
0780e97f3b Translated using Weblate (Korean) 
Currently translated at 81.1% (2247 of 2768)
 2014-05-18 19:22:55 +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
Weblate
ec9f73c4b5 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-18 10:44:05 +02:00
Rahoz Yaseen
47399d82fd Translated using Weblate (Kurdish Sorani) 
Currently translated at 17.9% (496 of 2768)
 2014-05-18 10:44:02 +02: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
Weblate
41c8f76eeb Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-17 09:38:53 +02:00
Sorawee Porncharoenwase
a0140e7aae Translated using Weblate (Thai) 
Currently translated at 38.6% (1069 of 2768)
 2014-05-17 09:38:50 +02:00
Hugues Peccatte
a0397557fc ChangeLog entry 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-17 07:38:17 +02:00
Marc Delisle
52cf4a6491 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-16 12:36:18 -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
453178b9cd ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-16 07:53:05 -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
Marc Delisle
13654357ff ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-15 12:47:06 -04:00
Marc Delisle
1fd2567e23 Merge remote-tracking branch 'D-storm/Bug-4414' into QA_4_2 2014-05-15 12:42:45 -04:00
Weblate
ebad795ac5 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-15 17:35:31 +02:00
Atul Pratap Singh
1a3c958f39 Add datepicker to monmitor log analyzer 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-05-16 02:29:14 +05:30
Anders Jonsson
fcd437cd21 Translated using Weblate (Swedish) 
Currently translated at 99.9% (2767 of 2768)
 2014-05-15 17:35:28 +02:00
Edie Johnny
95aab308e9 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2768 of 2768)
 2014-05-15 17:35:26 +02: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
1deac8fa43 Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2 2014-05-14 08:18:30 -04:00
Marc Delisle
cf743642a8 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-14 08:18:21 -04:00
Weblate
0d4c91ba33 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-14 14:16:23 +02:00
Dieter Adriaenssens
3ba9fef03c Translated using Weblate (Dutch) 
Currently translated at 100.0% (2768 of 2768)
 2014-05-14 14:16:20 +02:00