Smita Kumari fd6e7cf4e1 resolve merge conflict ...

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

2014-10-01 01:04:19 +05:30

..

canvg

Drop flashcanvas

2014-02-03 13:32:01 +01:00

codemirror

Update codemirror, because cursor in old version had a wrong position.

2014-06-14 12:52:02 +08:00

jqplot

…

jquery

removing trailing whitespace

2014-06-02 09:18:06 +05:30

openlayers

bug #4382 Missing source for OpenLayers library: retrieved source code from OpenLayers 2.10

2014-04-30 13:22:43 -04:00

pmd

Properly mark saved status for new pages

2014-08-24 08:58:13 +05:30

tracekit

Move tracekit library to separate folder

2013-09-30 09:17:03 +02:00

transformations

RFE-637: Custom field handlers (input transformations)

2014-07-12 01:52:32 +05:30

ajax.js

Fix bad line break in js (coding style)

2014-09-20 16:47:01 +05:30

big_ints.js

Improve validation on insert page

2014-08-04 02:19:25 +05:30

chart.js

Fix typo

2014-06-06 12:07:36 +05:30

common.js

Remove dead code

2014-09-15 11:34:32 -04:00

config.js

Fix 'function declaration in loop' scrutinizer errors.

2014-06-19 21:42:59 +02:00

console.js

Fix bad line breaks (coding style)

2014-09-20 16:59:18 +05:30

cross_framing_protection.js

Fix typo in attribute name

2014-03-14 08:53:55 +01:00

db_central_columns.js

add user defined column to central list

2014-06-17 22:45:23 +05:30

db_operations.js

bug #4350 Deleting the DB if it is renamed by the same name

2014-04-03 06:09:41 -04:00

db_qbe.js

Add new button to update a bookmarked search.

2014-03-10 21:07:00 +01:00

db_search.js

Fixed indentation

2014-05-06 19:48:59 +02:00

db_structure.js

Merge pull request #1211 from smita786/gsoc_central_columns_list

2014-06-09 12:27:40 -04:00

doclinks.js

…

error_report.js

Add another parameter to existing js error reporting code.

2014-06-16 11:50:52 +05:30

export.js

fix export with more than 1000 input fields (db/table/column alias)

2014-09-29 18:50:12 +05:30

functions.js

resolve merge conflict

2014-10-01 01:04:19 +05:30

get_image.js.php

…

get_scripts.js.php

Simplify file name validation

2013-10-03 15:54:50 +02:00

gis_data_editor.js

Document possible todo

2014-03-19 12:40:14 +01:00

import.js

Fix scrutinizer JS issues.

2014-05-18 13:57:41 +02:00

indexes.js

fix bug #4540 #4541

2014-09-24 19:34:53 +05:30

keyhandler.js

complete patch for #4279 ctrl +up/down final

2014-03-27 00:22:08 +05:30

makegrid.js

Out of scope variable

2014-09-22 12:40:49 -04:00

menu-resizer.js

Code style fixes

2014-05-24 16:48:53 +02:00

messages.php

Do not pretend that sprintf in javascript supports ordering

2014-09-29 11:19:35 +02:00

multi_column_sort.js

Fix coding style in JS files

2014-07-02 22:30:18 +02:00

navigation.js

resolve merge conflict

2014-10-01 01:04:19 +05:30

normalization.js

3NF complete

2014-08-05 17:05:31 +05:30

OpenStreetMap.js

…

replication.js

…

rte.js

Fix merge conflicts

2014-04-12 07:27:53 -04:00

server_databases.js

Code style fixes

2014-05-24 16:48:53 +02:00

server_plugins.js

…

server_privileges.js

Fix merge conflict

2014-08-29 09:13:41 -04:00

server_status_advisor.js

Fix typo

2013-10-03 11:25:09 -04:00

server_status_monitor.js

Fix merge conflict

2014-08-17 12:40:53 -04:00

server_status_processes.js

RFE-1490 Dynamic process list

2014-06-24 19:13:21 +05:30

server_status_queries.js

…

server_status_sorter.js

…

server_status_variables.js

Coding style: Bad line breaking before logical operators

2013-10-02 12:07:15 +02:00

server_user_groups.js

#4043 User group privs editor: Check all box not preselected

2013-10-01 18:31:37 +05:30

server_variables.js

…

sql.js

Merge branch 'QA_4_2'

2014-09-18 17:32:58 +05:30

tbl_change.js

Merge commit '41c0251'

2014-09-15 08:02:47 -04:00

tbl_chart.js

Merge branch 'QA_4_2'

2014-08-21 19:29:29 +05:30

tbl_find_replace.js

…

tbl_gis_visualization.js

Merge branch 'QA_4_0'

2013-09-26 14:47:04 -04:00

tbl_relation.js

Fix message.

2014-08-13 20:19:11 +05:30

tbl_select.js

Fix issues reported by Scrutinizer.

2014-08-17 02:20:05 +05:30

tbl_structure.js

Merge branch 'QA_4_2'

2014-09-17 09:16:12 -04:00

tbl_zoom_plot_jqplot.js

Avoid empty block notices

2014-08-03 08:01:32 -04:00

whitelist.php

bug #4530 [security] DOM based XSS that results to a CSRF that creates a ROOT account in certain conditions

2014-09-13 10:30:47 -04:00