nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,466 Commits 1 Branch 0 Tags
d17fba309c11bcda59d74f238d75a56c543393f0
Commit Graph

96 Commits

Author SHA1 Message Date
Michal Čihař
d17fba309c Fix permissions. 
Most files were made executable somewhere in ninadsp tree, reverting
this.
 2010-08-30 09:53:37 +02:00
ninadsp
9c34a0eec9 Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches 2010-08-28 01:53:52 +05:30
Michal Čihař
5c63cbd231 Merge branch 'QA_3_3' 
Conflicts:
	Documentation.html
	README
	libraries/Config.class.php
	translators.html
 2010-08-23 17:10:04 +02:00
Michal Čihař
a24e418527 Avoid PHP error when false is passed to PMA_DBI_getError. 
This can be caused by controllink set to false.
 2010-08-23 17:02:15 +02:00
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Michal Čihař
862e3ca2a7 Merge branch 'QA_3_3' 
Conflicts:
	libraries/core.lib.php
	server_databases.php
	server_privileges.php
 2010-08-20 13:40:37 +02:00
Michal Čihař
59b3b4916b Escape error message coming from MySQL to avoid XSS on bad parameters. 2010-08-20 11:35:42 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
3e57a8eca9 No @uses __('Something'). 2010-07-20 15:06:34 +02:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
ninadsp
bed1948d04 testing git setup - no major change made in code yet 
only added a few comments
 2010-05-23 01:22:01 +05:30
Michal Čihař
ea56f74a45 Fix ' escaping. 2010-05-05 11:19:51 +02:00
Marc Delisle
2182098af6 strings to gettext, second batch 2010-05-04 20:07:19 -04:00
Marc Delisle
526dce65cb 3.3 2009-12-31 13:11:19 +00:00
Marc Delisle
f3833884e4 3.3 2009-12-31 13:09:18 +00:00
Marc Delisle
4fda8872e6 avoid going back to login page on slave configuration 2009-12-24 12:18:31 +00:00
Marc Delisle
9ae329e4ad in Synchronize, the connection problems detection no longer worked 2009-10-16 00:32:42 +00:00
Herman van Rink
3a0663061d Replication code cleanup, some untranslated strings, indentation, new TODO's and extra comments. 2009-09-09 13:40:16 +00:00
Michal Čihař
158380c18a Coding style. 2009-08-25 13:42:21 +00:00
Tomas Srnka
e325226e57 *Fixed bug with different port than 3306 
*Fixed support for other server than localhost
*Added support for sockets
*Fixed GUI bugs - strings (localization), table, fieldset...
*new PNG transparent icon.16x16
 2009-08-24 18:10:45 +00:00
Marc Delisle
15441ded5d do not try to display a tab that was not built 2009-08-22 11:22:50 +00:00
Michal Čihař
49036e6003 rfe #1694104 Allow logging of user status with Apache. 2009-03-03 16:20:41 +00:00
Michal Čihař
ec305517f1 rfe #1913541 link to InnoDB status when error 1005 occurs 2008-11-30 14:14:28 +00:00
Michal Čihař
610cc27c57 Some more phpdoc fixes (adding packages, ignoring some symbols,...). 2008-11-24 09:31:30 +00:00
Marc Delisle
e6db29ed88 headwords for sorted column 2008-07-26 15:18:59 +00:00
Marc Delisle
14e5a97890 remove one wrapper for data fetch 2008-07-25 15:57:23 +00:00
Marc Delisle
afbb2a9dc2 protection against XSS when register_globals is on and .htaccess has no effect 2008-06-21 15:01:27 +00:00
Sebastian Mendel
b294b2d647 do not display class twice in query trace 2008-05-09 10:42:13 +00:00
Sebastian Mendel
91007aa3d6 include trace of executed queries 2008-05-08 06:07:00 +00:00
Sebastian Mendel
6207216296 differ between PHP and SQL debugging 2008-01-22 08:19:52 +00:00
Sebastian Mendel
d462d869ad with $GLOBALS['cfg']['DBG']['enable'] = true display executed queries and there times in the main footer 2007-12-13 09:20:41 +00:00
Marc Delisle
c7ba1bb032 bug #1832285 mysql DBI does not handle when control user connection fails 2007-12-09 13:06:21 +00:00
Michal Čihař
a3bdb36ba6 mysql_connect can return false on failure 2007-11-15 07:43:03 +00:00
Sebastian Mendel
9fbb84f28d cleanup 2007-10-18 11:36:27 +00:00
Sebastian Mendel
d9eebc2ae0 removed closing of db connection, closing database connection is only required if script runs longer than database connection is needed 2007-10-16 14:02:16 +00:00
Sebastian Mendel
08c983715f fixed wrong variable scope (bug #1810900 Undefined index: in Message.class.php) 2007-10-10 15:35:41 +00:00
Sebastian Mendel
5dd96d42ce replaced $PMA_errors with new PMA_Error_Handler 2007-10-08 16:02:58 +00:00
Sebastian Mendel
43bd2d44bd removed deprecated PMA_convert_display_charset() 2007-10-02 14:37:33 +00:00
Sebastian Mendel
ada58f99ea removed MySQL < 5 code 2007-10-02 08:34:01 +00:00
Marc Delisle
0effdcaa31 old PHP4 code 2007-08-18 20:33:30 +00:00
Sebastian Mendel
573a6161bd fixed code indention 2007-05-09 12:18:57 +00:00
Sebastian Mendel
cfeb306526 coding standard: no spaces inside braces 2007-04-01 11:02:46 +00:00
Sebastian Mendel
6455acea34 forgot some debug code to remove 2007-03-19 18:19:13 +00:00
Sebastian Mendel
817e790762 synced/fixed vim line 2007-03-19 17:55:39 +00:00
Sebastian Mendel
420a9d58e7 bug #1662976 Authentication fails when controluser/pass is set 2007-03-19 15:06:53 +00:00
Michal Čihař
fb9a3a598e Check before commit! 2006-11-17 08:49:30 +00:00
Sebastian Mendel
1eadc0a41a use @todo tag for todo items, to show up in generated documentation 2006-09-21 14:28:46 +00:00
Sebastian Mendel
45b04ab15d replaced $dblist with new PMA_List_Database class 2006-09-20 11:15:56 +00:00
Marc Delisle
0254076756 bug #1523623, BIGINT auto_increment and mysql extension 2006-07-17 16:51:51 +00:00
Michal Čihař
5850b36472 Use correct server... 2006-02-22 19:02:56 +00:00