Go to file
Michal Čihař 41145feb12 Merge branch 'MAINT_3_3_5' into QA_3_3
Conflicts:
	ChangeLog
	libraries/common.lib.php
2010-08-20 13:36:49 +02:00
contrib 3.3 2009-12-31 13:11:19 +00:00
documentation-gsoc avoid spaces in file names, as asked by a distro maintainer 2010-03-09 17:36:28 +00:00
js bug #3034026 [confirmation] TRUNCATE queries get no confirmation request 2010-07-31 14:54:05 -04:00
lang Update translation based on current master branch. 2010-08-17 13:36:41 +02:00
libraries Merge branch 'MAINT_3_3_5' into QA_3_3 2010-08-20 13:36:49 +02:00
pmd 3.3 2009-12-31 13:11:19 +00:00
scripts bug [scripts] MySQL 5.5.5 does not accept TIMESTAMP(14) in create_tables.sql 2010-07-25 07:53:07 -04:00
setup Revert "Do not assume that DefaultLang is escaped." 2010-08-19 15:37:06 +02:00
test 3.3 2009-12-31 13:11:19 +00:00
themes Ignore non default themes in git. 2010-08-17 13:38:37 +02:00
.gitignore add locale to .gitignore for this branch too 2010-04-04 17:04:41 -04:00
browse_foreigners.php 3.3 2009-12-31 13:11:19 +00:00
bs_change_mime_type.php 3.3 2009-12-31 13:11:19 +00:00
bs_disp_as_mime_type.php 3.3 2009-12-31 13:11:19 +00:00
bs_play_media.php 3.3 2009-12-31 13:11:19 +00:00
calendar.php 3.3 2009-12-31 13:11:19 +00:00
ChangeLog Merge branch 'MAINT_3_3_5' into QA_3_3 2010-08-20 13:36:49 +02:00
changelog.php 3.3 2009-12-31 13:11:19 +00:00
chk_rel.php 3.3 2009-12-31 13:11:19 +00:00
config.sample.inc.php 3.3 2009-12-31 13:11:19 +00:00
CREDITS 3.3 2009-12-31 13:11:19 +00:00
db_create.php 3.3 2009-12-31 13:11:19 +00:00
db_datadict.php 3.3 2009-12-31 13:11:19 +00:00
db_export.php 3.3 2009-12-31 13:11:19 +00:00
db_import.php 3.3 2009-12-31 13:11:19 +00:00
db_operations.php patch #2969449 Name for MERGE engine varies depending on the MySQL version 2010-03-12 17:16:05 -05:00
db_printview.php patch #2969449 Name for MERGE engine varies depending on the MySQL version 2010-03-12 17:16:05 -05:00
db_qbe.php 3.3 2009-12-31 13:11:19 +00:00
db_search.php Fix XSS on field_str in db_search.php. 2010-08-18 11:30:19 +02:00
db_sql.php Fix XSS on delimiter in db_sql.php. 2010-08-18 11:30:19 +02:00
db_structure.php bug #3026400 [PHP] ereg functions are deprecated 2010-07-08 07:49:11 -04:00
db_tracking.php 3.3 2009-12-31 13:11:19 +00:00
docs.css 3.3 2009-12-31 13:11:19 +00:00
Documentation.html bug #3044189 [doc] Cleared documentation for hide_db. 2010-08-20 11:02:38 +02:00
error.php Avoid information disclossure on error. 2010-08-20 11:33:24 +02:00
export.php patch #2969449 Name for MERGE engine varies depending on the MySQL version 2010-03-12 17:16:05 -05:00
favicon.ico 3.3 2009-12-31 13:11:19 +00:00
import_status.php Backported uploadprogress part of rev 13423 and 13424 to QA_3_3 and MAINT_3_3_0 2010-03-03 09:02:12 +00:00
import.php bug #2986422 [import] Results for query are not displayed 2010-06-13 08:42:24 -04:00
index.php 3.3 2009-12-31 13:11:19 +00:00
INSTALL 3.3 2009-12-31 13:11:19 +00:00
LICENSE 3.3 2009-12-31 13:11:19 +00:00
license.php 3.3 2009-12-31 13:11:19 +00:00
main.php Changed link to git repository on main page 2010-03-17 19:52:11 +01:00
navigation.php Do not group if there would be one table in group. 2010-04-07 09:19:34 +02:00
pdf_pages.php 3.3 2009-12-31 13:11:19 +00:00
pdf_schema.php bug #2993970 Page numbering in Table of Contents 2010-04-29 12:54:25 -04:00
phpinfo.php 3.3 2009-12-31 13:11:19 +00:00
phpmyadmin.css.php 3.3 2009-12-31 13:11:19 +00:00
pmd_common.php 3.3 2009-12-31 13:11:19 +00:00
pmd_display_field.php 3.3 2009-12-31 13:11:19 +00:00
pmd_general.php [interface] Fix initial state of tables in designer. 2010-04-16 09:57:53 +02:00
pmd_help.php 3.3 2009-12-31 13:11:19 +00:00
pmd_pdf.php 3.3 2009-12-31 13:11:19 +00:00
pmd_relation_new.php 3.3 2009-12-31 13:11:19 +00:00
pmd_relation_upd.php 3.3 2009-12-31 13:11:19 +00:00
pmd_save_pos.php 3.3 2009-12-31 13:11:19 +00:00
print.css 3.3 2009-12-31 13:11:19 +00:00
querywindow.php 3.3 2009-12-31 13:11:19 +00:00
README 3.3.5 release 2010-07-26 12:26:41 -04:00
README.VENDOR 3.3 2009-12-31 13:11:19 +00:00
robots.txt 3.3 2009-12-31 13:11:19 +00:00
server_binlog.php 3.3 2009-12-31 13:11:19 +00:00
server_collations.php 3.3 2009-12-31 13:11:19 +00:00
server_databases.php Limit list of correct values for sort order. 2010-08-18 11:30:19 +02:00
server_engines.php 3.3 2009-12-31 13:11:19 +00:00
server_export.php 3.3 2009-12-31 13:11:19 +00:00
server_import.php 3.3 2009-12-31 13:11:19 +00:00
server_privileges.php Merge branch 'MAINT_3_3_5' into QA_3_3 2010-08-20 13:36:49 +02:00
server_processlist.php 3.3 2009-12-31 13:11:19 +00:00
server_replication.php Untranslated string 2010-01-29 12:58:58 +00:00
server_sql.php 3.3 2009-12-31 13:11:19 +00:00
server_status.php Properly format server status parameter 2010-04-01 20:50:03 +02:00
server_synchronize.php bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from master, todo: update PHP excel?) 2010-07-10 08:01:07 -04:00
server_variables.php 3.3 2009-12-31 13:11:19 +00:00
show_config_errors.php 3.3 2009-12-31 13:11:19 +00:00
sql.php Merge branch 'MAINT_3_3_5' into QA_3_3 2010-08-20 13:36:49 +02:00
tbl_addfield.php bug #2970769 Incorrect reference to mootools-more.js 2010-03-15 16:36:19 -04:00
tbl_alter.php 3.3 2009-12-31 13:11:19 +00:00
tbl_change.php problem showing UNHEX function by default when editing a BLOB was not fixed correctly in version 3.3.3 2010-05-29 06:56:27 -04:00
tbl_create.php 3.3 2009-12-31 13:11:19 +00:00
tbl_export.php 3.3 2009-12-31 13:11:19 +00:00
tbl_import.php 3.3 2009-12-31 13:11:19 +00:00
tbl_indexes.php 3.3 2009-12-31 13:11:19 +00:00
tbl_move_copy.php 3.3 2009-12-31 13:11:19 +00:00
tbl_operations.php bug #2983065 Error when changing from Maria to MyISAM engine 2010-04-25 07:09:39 -04:00
tbl_printview.php patch #2969449 Name for MERGE engine varies depending on the MySQL version 2010-03-12 17:16:05 -05:00
tbl_relation.php 3.3 2009-12-31 13:11:19 +00:00
tbl_replace.php 3.3 2009-12-31 13:11:19 +00:00
tbl_row_action.php testing before merge 2010-03-22 13:24:48 -04:00
tbl_select.php bug #2948492 [interface] Slide effect masks some fields on search page 2010-02-16 11:27:24 +00:00
tbl_sql.php Fix XSS on delimiter in tbl_sql.php. 2010-08-18 11:30:19 +02:00
tbl_structure.php bug #2994168 Show auto_increment in uppercase 2010-04-29 12:30:59 -04:00
tbl_tracking.php Tracking report should obey MaxCharactersInDisplayedSQL 2010-04-26 16:38:20 -04:00
themes.php 3.3 2009-12-31 13:11:19 +00:00
TODO 3.3 2009-12-31 13:11:19 +00:00
transformation_overview.php 3.3 2009-12-31 13:11:19 +00:00
transformation_wrapper.php 3.3 2009-12-31 13:11:19 +00:00
translators.html 3.3.5 release 2010-07-26 12:26:41 -04:00
user_password.php 3.3 2009-12-31 13:11:19 +00:00
view_create.php 3.3 2009-12-31 13:11:19 +00:00
webapp.php 3.3 2009-12-31 13:11:19 +00:00

$Id$

phpMyAdmin - Readme
===================

  A set of PHP-scripts to manage MySQL over the web.

  Version 3.3.6-dev
  -----------------
  http://www.phpmyadmin.net/

    Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>
    Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info>
                            Olivier Müller <om_at_omnis.ch>
                            Robin Johnson <robbat2_at_users.sourceforge.net>
                            Alexander M. Turek <me_at_derrabus.de>
                            Michal Čihař <michal_at_cihar.com>
                            Garvin Hicking <me_at_supergarv.de>
                            Michael Keck <mkkeck_at_users.sourceforge.net>
                            Sebastian Mendel <cybot_tm_at_users.sourceforge.net>
                            [check Documentation.txt/.html file for more details]

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License version 2,
    as published by the Free Software Foundation.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

  Requirements:
    php 5.2 or later
    MySQL 5.0 or later
    a web-browser (doh!)

  Summary:
    phpMyAdmin is intended to handle the administration of MySQL over the web.
    For a summary of features, please see the Documentation.txt/.html file.

  Download:
    You can get the newest version at http://www.phpmyadmin.net/.

  Credits:
    Please see the Documentation.txt/.html file.

  Installation:
    Please see the Documentation.txt/.html file.

  ChangeLog:
    Now in ChangeLog

  Documentation:
    Basic documentation available in Documentation.txt/.html

  Support:
    See reference about support forums under http://www.phpmyadmin.net/


    Enjoy!
        The phpMyAdmin Devel team


  PS: Please, don't send us emails with question like "How do I compile
      PHP with MySQL-support". We just don't have the time to be your
      free helpdesk.
      Please send your questions to the appropriate mailinglists / forums.
      Before contacting us, please read the Documentation.html (esp. the
      FAQ part).