Isaac Bennetch fc5992686e Fix merge conflicts ...

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>

2018-04-19 10:06:27 -04:00

..

codemirror/addon/lint

Change ESLint's eqeqeq to error

2017-09-25 21:30:14 -03:00

designer

Designer: "Add options" dialog doesn't reset when canceling: #14110 issue fixed (#14117)

2018-03-30 18:48:02 -03:00

jqplot/plugins

Automatic fixes by ESLint

2017-09-25 14:22:35 -03:00

transformations

Automatic fixes by ESLint

2017-09-25 14:22:35 -03:00

vendor

Upgrade JavaScript dependencies

2018-03-06 13:03:35 -03:00

ajax.js

Revert "Honor arg_separator in AJAX requests"

2018-03-05 15:46:32 +01:00

chart.js

Change ESLint's one-var to error

2017-09-25 22:46:20 -03:00

common.js

Revert "Honor arg_separator in AJAX requests"

2018-03-05 15:46:32 +01:00

config.js

Merge branch 'QA_4_7'

2018-01-08 14:04:50 +01:00

console.js

Set console max height, issue #14022

2018-02-18 04:38:43 +05:30

cross_framing_protection.js

Change ESLint's eqeqeq to error

2017-09-25 21:30:14 -03:00

db_central_columns.js

Enhancement: Button to add a central column from existing tables #14043

2018-03-30 20:43:22 +05:30

db_multi_table_query.js

Fixes #14047

2018-03-01 14:11:05 +05:30

db_operations.js

Fix phpmyadmin-security#240 Multiple CSRF vulnerabilities

2018-04-18 00:59:33 +10:00

db_qbe.js

Automatic fixes by ESLint

2017-09-25 14:22:35 -03:00

db_search.js

Revert "Honor arg_separator in AJAX requests"

2018-03-05 15:46:32 +01:00

db_structure.js

Share code for parsing data-post attribute

2018-02-22 16:01:00 -03:00

db_tracking.js

Revert "Honor arg_separator in AJAX requests"

2018-03-05 15:46:32 +01:00

doclinks.js

…

error_report.js

Fix error report button

2018-03-22 01:20:51 -03:00

export_output.js

Automatic fixes by ESLint

2017-09-25 14:22:35 -03:00

export.js

Change ESLint's eqeqeq to error

2017-09-25 21:30:14 -03:00

functions.js

Revert "Cannot read property sql_query of undefined: #14104 issue fix (#14105)"

2018-04-06 18:06:53 -03:00

gis_data_editor.js

Revert "Honor arg_separator in AJAX requests"

2018-03-05 15:46:32 +01:00

import.js

Change ESLint's eqeqeq to error

2017-09-25 21:30:14 -03:00

indexes.js

Revert "Honor arg_separator in AJAX requests"

2018-03-05 15:46:32 +01:00

keyhandler.js

Change ESLint's one-var to error

2017-09-25 22:46:20 -03:00

makegrid.js

Remove font size feature (#13925)

2018-04-14 07:21:13 -03:00

menu-resizer.js

Avoid using deprecated jQuery functions

2017-11-29 12:37:18 +01:00

messages.php

Designer: "Add options" dialog doesn't reset when canceling: #14110 issue fixed (#14117)

2018-03-30 18:48:02 -03:00

microhistory.js

Revert "Honor arg_separator in AJAX requests"

2018-03-05 15:46:32 +01:00

multi_column_sort.js

Revert "Honor arg_separator in AJAX requests"

2018-03-05 15:46:32 +01:00

navigation.js

Revert "Honor arg_separator in AJAX requests"

2018-03-05 15:46:32 +01:00

normalization.js

Revert "Honor arg_separator in AJAX requests"

2018-03-05 15:46:32 +01:00

page_settings.js

Automatic fixes by ESLint

2017-09-25 14:22:35 -03:00

replication.js

Change ESLint's eqeqeq to error

2017-09-25 21:30:14 -03:00

rte.js

Share code for parsing data-post attribute

2018-02-22 16:01:00 -03:00

server_databases.js

Revert "Honor arg_separator in AJAX requests"

2018-03-05 15:46:32 +01:00

server_plugins.js

Automatic fixes by ESLint

2017-09-25 14:22:35 -03:00

server_privileges.js

Revert "Honor arg_separator in AJAX requests"

2018-03-05 15:46:32 +01:00

server_status_advisor.js

Change ESLint's one-var to error

2017-09-25 22:46:20 -03:00

server_status_monitor.js

Remove extension from js images API

2017-11-27 13:58:17 +01:00

server_status_processes.js

Remove extension from js images API

2017-11-27 13:58:17 +01:00

server_status_queries.js

Simplify data parsing, it seems that JSON is automatically parsed

2017-01-21 11:05:44 +01:00

server_status_sorter.js

Change ESLint's one-var to error

2017-09-25 22:46:20 -03:00

server_status_variables.js

Change ESLint's eqeqeq to error

2017-09-25 21:30:14 -03:00

server_user_groups.js

Automatic fixes by ESLint

2017-09-25 14:22:35 -03:00

server_variables.js

Share code for row filtering

2017-10-30 11:25:51 +01:00

shortcuts_handler.js

Avoid using deprecated jQuery functions

2017-11-29 12:37:18 +01:00

sql.js

Revert "Merge pull request #14046 from shucon/login"

2018-04-06 18:07:17 -03:00

tbl_change.js

Prompt before reducing number of rows (#13987)

2018-02-14 19:35:22 -02:00

tbl_chart.js

Change ESLint's one-var to error

2017-09-25 22:46:20 -03:00

tbl_find_replace.js

Change ESLint's eqeqeq to error

2017-09-25 21:30:14 -03:00

tbl_gis_visualization.js

Automatic fixes by ESLint

2017-09-25 14:22:35 -03:00

tbl_operations.js

Fix phpmyadmin-security#240 Multiple CSRF vulnerabilities

2018-04-18 00:59:33 +10:00

tbl_relation.js

Revert "Honor arg_separator in AJAX requests"

2018-03-05 15:46:32 +01:00

tbl_select.js

Fix for issue #13778 (#13971)

2018-02-09 11:49:58 -02:00

tbl_structure.js

Revert "Honor arg_separator in AJAX requests"

2018-03-05 15:46:32 +01:00

tbl_tracking.js

Revert "Honor arg_separator in AJAX requests"

2018-03-05 15:46:32 +01:00

tbl_zoom_plot_jqplot.js

Fix for issue #13439

2018-03-29 15:30:39 -03:00

u2f.js

Use current u2f API

2017-11-23 15:01:17 +01:00

whitelist.php

Move classes to PhpMyAdmin namespace

2017-06-30 23:44:10 -03:00