phpmyadmin

auth

Resolve merge conflicts for upstream merge

2010-07-29 19:17:25 +05:30

chart

Code cleanup, mostly added extra spaces

2010-08-26 17:01:12 +02:00

config

Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

2010-08-28 12:12:52 +02:00

dbg

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

dbi

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

engines

Resolve merge conflicts for upstream merge

2010-07-29 19:17:25 +05:30

export

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

import

Merge conflict resolved for Lori's tree merge to main

2010-08-22 12:42:54 +05:30

php-gettext

testing git setup - no major change made in code yet

2010-05-23 01:22:01 +05:30

PHPExcel

cleanup (re)moved files

2010-07-13 20:35:14 +02:00

schema

adapted patch #3050492 to new code

2010-08-28 08:57:27 -04:00

tcpdf

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

transformations

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

.htaccess

testing git setup - no major change made in code yet

2010-05-23 01:22:01 +05:30

blobstreaming.lib.php

Merge from upstream. Resolved a conflict in js/functions.js

2010-08-05 23:51:14 +05:30

blowfish.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

bookmark.lib.php

Resolve merge conflicts for upstream merge

2010-07-29 19:17:25 +05:30

charset_conversion.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

chart.lib.php

Code cleanup, mostly added extra spaces

2010-08-26 17:01:12 +02:00

check_user_privileges.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

cleanup.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

common.inc.php

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

common.lib.php

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

Config.class.php

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

config.default.php

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

config.values.php

add custom-no-form to Export/method

2010-08-19 20:35:49 +02:00

core.lib.php

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

database_interface.lib.php

Merge conflict resolved for Lori's tree merge to main

2010-08-22 12:42:54 +05:30

db_common.inc.php

Resolve merge conflicts for upstream merge

2010-07-29 19:17:25 +05:30

db_events.inc.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

db_info.inc.php

Merge conflict resolved for Lori's tree merge to main

2010-08-22 12:42:54 +05:30

db_links.inc.php

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

db_routines.inc.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

db_structure.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

db_table_exists.lib.php

Resolve merge conflicts for upstream merge

2010-07-29 19:17:25 +05:30

display_change_password.lib.php

Ajaxified Change Password action on main page

2010-08-03 19:10:37 +05:30

display_create_database.lib.php

Ajaxified Create Database action. Have to append newly created db to table yet though

2010-07-31 02:25:29 +05:30

display_create_table.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

display_export.lib.php

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

display_import_ajax.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

display_import.lib.php

Merge conflict resolved for Lori's tree merge to main

2010-08-22 12:42:54 +05:30

display_select_lang.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

display_tbl_links.lib.php

Added documentation to PHP files

2010-08-15 01:50:47 +05:30

display_tbl.lib.php

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

Error_Handler.class.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

Error.class.php

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

file_listing.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

File.class.php

Resolve merge conflicts for upstream merge

2010-07-29 19:17:25 +05:30

footer.inc.php

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

grab_globals.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

header_http.inc.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

header_meta_style.inc.php

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

header_printview.inc.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

header_scripts.inc.php

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

header.inc.php

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

iconv_wrapper.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

import.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

Index.class.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

information_schema_relations.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

ip_allow_deny.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

js_escape.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

kanji-encoding.lib.php

Merge conflict resolved for Lori's tree merge to main

2010-08-22 12:42:54 +05:30

List_Database.class.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

List.class.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

logging.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

Message.class.php

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

mime.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

mult_submits.inc.php

Resolve merge conflicts for upstream merge

2010-07-29 19:17:25 +05:30

mysql_charsets.lib.php

Resolve merge conflicts for upstream merge

2010-07-29 19:17:25 +05:30

navigation_header.inc.php

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

ob.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

opendocument.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

parse_analyze.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

Partition.class.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

plugin_interface.lib.php

Merge conflict resolved for Lori's tree merge to main

2010-08-22 12:42:54 +05:30

PMA.php

testing git setup - no major change made in code yet

2010-05-23 01:22:01 +05:30

relation_cleanup.lib.php

Resolve merge conflicts for upstream merge

2010-07-29 19:17:25 +05:30

relation.lib.php

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

replication_gui.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

replication.inc.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

sanitizing.lib.php

Merge conflict resolved for Lori's tree merge to main

2010-08-22 12:42:54 +05:30

select_lang.lib.php

Merge conflict resolved for Lori's tree merge to main

2010-08-22 12:42:54 +05:30

select_server.lib.php

Merge conflict resolved for Lori's tree merge to main

2010-08-22 12:42:54 +05:30

server_common.inc.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

server_links.inc.php

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

server_synchronize.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

session.inc.php

Merge conflict resolved for Lori's tree merge to main

2010-08-22 12:42:54 +05:30

sql_query_form.lib.php

Merge remote branch 'origin/master'

2010-08-10 00:55:22 +05:30

sqlparser.data.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

sqlparser.lib.php

Merge conflict resolved for Lori's tree merge to main

2010-08-22 12:42:54 +05:30

sqlvalidator.class.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

sqlvalidator.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

StorageEngine.class.php

Resolve merge conflicts for upstream merge

2010-07-29 19:17:25 +05:30

string_mb.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

string_native.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

string_type_ctype.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

string_type_native.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

string.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

Table.class.php

Resolve merge conflicts for upstream merge

2010-07-29 19:17:25 +05:30

tbl_common.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

tbl_info.inc.php

Resolve merge conflicts for upstream merge

2010-07-29 19:17:25 +05:30

tbl_links.inc.php

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

tbl_properties.inc.php

Merge conflict resolved for Lori's tree merge to main

2010-08-22 12:42:54 +05:30

tbl_replace_fields.inc.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

tbl_triggers.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

Theme_Manager.class.php

Resolve merge conflicts for upstream merge

2010-07-29 19:17:25 +05:30

Theme.class.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

Tracker.class.php

Resolve merge conflicts for upstream merge

2010-07-29 19:17:25 +05:30

transformations.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

url_generating.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

user_preferences.inc.php

comments

2010-08-06 15:17:53 +02:00

user_preferences.lib.php

comments

2010-08-06 15:17:53 +02:00

vendor_config.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

zip_extension.lib.php

testing git setup - no major change made in code yet

2010-05-23 01:22:01 +05:30

zip.lib.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30