Marc Delisle da05ed6316 Fix merge conflict ...

Signed-off-by: Marc Delisle <marc@infomarc.info>

2015-08-19 08:32:45 -04:00

..

bfShapeFiles

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

config

Templating ul tag.

2015-08-09 14:24:44 +02:00

controllers

Allow using function that takes geometry data as the second parameter

2015-08-18 11:26:21 +05:30

dbi

Add missing dummy queries

2015-08-06 14:35:01 -04:00

di

Fixed more issues.

2015-07-25 19:39:33 +03:00

engines

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

gis

PHPDoc update.

2015-07-19 16:07:40 +02:00

navigation

Fixes #11396 Error when creating a new db

2015-08-13 14:06:00 -04:00

php-gettext

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

phpseclib

Fix #11387 phpseclib < 2.0 produces deprecated messages on PHP

2015-08-12 11:27:32 +05:30

plugins

Fix merge conflict

2015-08-19 08:32:45 -04:00

properties

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

rte

Refactor code of rte_routines.lib.php.

2015-08-11 22:42:05 +02:00

sql-parser

Fix #11408 Export breaks when field name is 0

2015-08-17 21:51:25 +05:30

tcpdf

Upgrade TCPDF to version 6.2.9

2015-07-27 18:05:14 +05:30

.gitignore

…

Advisor.class.php

bug #4886 Clicking on external links in advisor rules give JS error

2015-05-04 10:20:44 +05:30

advisory_rules.txt

Link to these websites

2015-05-04 12:17:04 +05:30

bookmark.lib.php

Best practice: remove PHP closing tag

2015-04-24 11:33:29 -04:00

browse_foreigners.lib.php

Fix coding style

2015-05-28 09:55:57 -04:00

build_html_for_db.lib.php

Make PHPcs happy.

2015-06-14 00:49:19 +02:00

central_columns.lib.php

Revert "Move column definitions related templates inside table folder" Column definitions are used in central column and normalization as well

2015-08-10 11:07:16 +05:30

charset_conversion.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

check_user_privileges.lib.php

Merge pull request #1796 from devenbansod/remove_some_errors_in_travis

2015-07-22 08:41:42 -07:00

cleanup.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

common.inc.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

Config.class.php

Do not try to set port 80 for https requests

2015-08-11 15:43:29 +02:00

config.default.php

Clarify doc for some directives

2015-08-05 15:46:57 -04:00

config.values.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

Console.class.php

Fixed more issues.

2015-07-25 19:39:33 +03:00

core.lib.php

Merge pull request #1794 from Tithugues/templatingHeaderLocation

2015-07-19 21:53:34 +02:00

create_addfield.lib.php

Strict check for create_addfield.lib.php

2015-08-04 12:13:03 +08:00

data_dictionary_relations.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

database_interface.inc.php

Introduce dependency injection container

2015-06-30 10:08:03 +08:00

DatabaseInterface.class.php

Fixed more issues.

2015-07-25 19:39:33 +03:00

db_common.inc.php

Add missing includes and update member variables

2015-08-12 09:41:54 +05:30

db_designer.lib.php

Move designer related templates into database folder

2015-08-10 10:56:39 +05:30

db_info.inc.php

Add missing includes and update member variables

2015-08-12 09:41:54 +05:30

db_table_exists.lib.php

Resolve conflicts from upstream

2015-07-23 11:29:53 +08:00

DBQbe.class.php

Fixed more issues.

2015-07-25 19:39:33 +03:00

DbSearch.class.php

Merge branch 'QA_4_4'

2015-05-01 12:34:30 +05:30

display_change_password.lib.php

Merge pull request #11330 from devenbansod/1396C

2015-08-05 22:42:00 -04:00

display_create_database.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

display_create_table.lib.php

create_table.phtml is more suited with database related templates

2015-08-10 11:02:31 +05:30

display_export.inc.php

This is an internal directive. Use without underscore to match other similar ones

2015-07-09 17:12:21 +05:30

display_export.lib.php

Resolve conflicts from upstream

2015-07-23 11:29:53 +08:00

display_git_revision.lib.php

Fix typo

2015-05-11 11:00:45 +02:00

display_import_ajax.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

display_import.lib.php

Fix coding style

2015-08-15 07:16:43 -04:00

display_select_lang.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

DisplayResults.class.php

Clarify doc

2015-08-17 10:38:18 -04:00

Error_Handler.class.php

Fix floating. Fix styles for reported errors. Move inputs inside the form

2015-07-22 11:36:19 +05:30

error_report.lib.php

Use HTTPS to submit error reports

2015-08-19 07:49:45 +02:00

Error.class.php

Fixed more issues.

2015-07-25 19:39:33 +03:00

error.inc.php

…

export.lib.php

Exporting metadata should be done last since it uses a USE statement

2015-08-13 07:20:12 +05:30

file_listing.lib.php

…

File.class.php

Simplify the message

2015-08-05 10:44:05 +02:00

Font.class.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

Footer.class.php

Fixed more issues.

2015-07-25 19:39:33 +03:00

Header.class.php

Avoid caching JS and CSS files across phpMyAdmin versions

2015-07-27 21:52:20 +05:30

iconv_wrapper.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

import.lib.php

Remove unnecessary code.

2015-08-13 00:10:00 +03:00

Index.class.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

index.lib.php

Show indexes in print view in table structure page when InitialSlidersState is 'disabled'

2015-06-08 15:50:45 +05:30

information_schema_relations.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

insert_edit.lib.php

Remove the hidden field having the same name as the enum select

2015-08-11 15:49:02 +05:30

ip_allow_deny.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

js_escape.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

kanji-encoding.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

Linter.class.php

Fix UTF strings in linter.

2015-08-05 19:01:51 +03:00

List_Database.class.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

List.class.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

logging.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

Menu.class.php

Resolve conflicts from upstream

2015-07-23 11:29:53 +08:00

Message.class.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

mime.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

mult_submits.inc.php

Split structure related templates to database and table

2015-08-10 12:00:58 +05:30

mult_submits.lib.php

Fix bulk actions on table=>structure: move related code out of mult_submits_inc toStructureController

2015-08-04 02:20:11 +05:30

mysql_charsets.inc.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

mysql_charsets.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

mysql_relations.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

normalization.lib.php

Revert "Move column definitions related templates inside table folder" Column definitions are used in central column and normalization as well

2015-08-10 11:07:16 +05:30

opendocument.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

operations.lib.php

Update PHPDoc.

2015-08-09 16:05:24 +02:00

OutputBuffering.class.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

parse_analyze.inc.php

Removed dead code.

2015-07-10 23:18:18 +03:00

Partition.class.php

Load comments at sub partition level is sub partitioning is used

2015-08-17 23:02:29 +05:30

PDF.class.php

Fixed more issues.

2015-07-25 19:39:33 +03:00

plugin_interface.lib.php

Fix spacing after opening brace

2015-04-28 11:05:08 +05:30

PMA.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

pmd_common.php

Fix return parameter

2015-08-13 08:08:32 -04:00

RecentFavoriteTable.class.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

relation_cleanup.lib.php

Update PHPDoc.

2015-07-19 13:41:13 +02:00

relation.lib.php

Templating ul tag.

2015-08-09 14:24:44 +02:00

replication_gui.lib.php

Improve a message

2015-07-31 07:06:31 -04:00

replication.inc.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

Response.class.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

sanitizing.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

SavedSearches.class.php

…

Scripts.class.php

Make scrutinizer happy

2015-08-03 16:04:58 -04:00

select_lang.lib.php

Make PHPCS happy.

2015-07-23 17:47:53 +02:00

select_server.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

server_bin_log.lib.php

Remove extraneous spaces around values. Remove deprecated cellpadding and cellspacing attributes

2015-07-28 15:12:52 +05:30

server_collations.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

server_common.inc.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

server_common.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

server_databases.lib.php

Templating ul tag.

2015-08-09 14:24:44 +02:00

server_engines.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

server_plugins.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

server_privileges.lib.php

Reduce nested level.

2015-08-09 16:10:10 +02:00

server_status_advisor.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

server_status_monitor.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

server_status_processes.lib.php

Make PHPCS happy.

2015-07-25 22:51:02 +02:00

server_status_queries.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

server_status_variables.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

server_status.lib.php

Refactor server_status.lib.php

2015-08-12 16:38:36 +05:30

server_user_groups.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

server_users.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

server_variables.lib.php

Make PHPCS happy.

2015-07-25 22:51:02 +02:00

ServerStatusData.class.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

session.inc.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

special_schema_links.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

sql_query_form.lib.php

Clarify verification

2015-08-01 08:39:39 -04:00

sql.lib.php

Add partition maintenance actions

2015-08-14 01:14:58 +05:30

StorageEngine.class.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

String.class.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

string.lib.php

…

StringAbstractType.class.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

StringByte.int.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

StringCType.class.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

stringMb.lib.php

…

stringNative.lib.php

…

StringNativeType.class.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

StringType.int.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

sysinfo.lib.php

Fix spacing after opening brace

2015-04-28 11:05:08 +05:30

SystemDatabase.class.php

Make scrutinizer happy

2015-08-03 16:04:58 -04:00

Table.class.php

Fix bug - Counting real number of rows always return zero

2015-08-10 15:12:32 +05:30

tbl_columns_definition_form.inc.php

Revert "Move column definitions related templates inside table folder" Column definitions are used in central column and normalization as well

2015-08-10 11:07:16 +05:30

tbl_common.inc.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

tbl_info.inc.php

Merge branch 'QA_4_4'

2015-07-26 08:42:34 -04:00

Template.class.php

Make PHPcs happy.

2015-05-23 00:43:18 +02:00

Theme_Manager.class.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

Theme.class.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

Tracker.class.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

tracking.lib.php

Continue refactoring db tracking

2015-08-18 08:44:28 -04:00

transformations.lib.php

Fixed coding style.

2015-07-19 00:18:49 +03:00

Types.class.php

Make PHPCS happy.

2015-07-19 17:51:34 +02:00

url_generating.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

user_preferences.inc.php

Templating ul tag.

2015-08-09 14:24:44 +02:00

user_preferences.lib.php

Templating user preferences form.

2015-07-25 13:14:43 +02:00

Util.class.php

Incorrect scalar type declaration (reported under PHP 7)

2015-08-10 18:14:38 -04:00

util.lib.php

Add missing file comment and security.

2015-07-19 13:59:47 +02:00

vendor_config.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

zip_extension.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00

zip.lib.php

Remove unneeded closing tags.

2015-07-19 00:18:38 +03:00