Michal Čihař c0b5286562 Merge branch 'master' of git://github.com/thesocialgeek/phpmyadmin into thesocialgeek-master ...

Conflicts:
	js/navigation.js

2013-09-30 14:16:40 +02:00

..

canvg

…

codemirror

Update CodeMirror to 3.15

2013-08-06 13:27:09 +02:00

jqplot

Upgraded jqPlot to 1.0.4 r1121

2013-01-01 11:05:42 -05:00

jquery

Update jquery-ui-timepicker-addon to version 1.3.1

2013-08-05 17:28:41 +05:30

openlayers

Correctly set the openlayers path as scripts are loaded dynamically

2013-01-18 22:29:31 +05:30

pmd

Replace wiki info icon #1457

2013-09-28 18:57:53 +10:00

tracekit

Move tracekit library to separate folder

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

ajax.js

Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting

2013-09-21 00:49:01 +02:00

chart.js

Fix typos

2013-07-23 07:12:44 -04:00

common.js

Merge branch 'QA_4_0' into merge. Resolved conflicts.

2013-09-03 14:13:02 +05:30

config.js

Add wrapper function for formatting datetime

2013-07-08 14:46:08 +02:00

cross_framing_protection.js

Fixed spacing

2013-07-30 14:36:43 +02:00

db_operations.js

Reference javascript messages by dot notation instead of using ['strFoo']

2013-04-16 13:32:51 +02:00

db_search.js

Reference javascript messages by dot notation instead of using ['strFoo']

2013-04-16 13:32:51 +02:00

db_structure.js

Various js improvements

2013-04-26 09:31:51 +02:00

doclinks.js

Remove double keys

2013-08-07 10:34:55 +02:00

error_report.js

Coding style: fixed whitespace

2013-09-30 11:18:07 +02:00

export.js

Move function definitions to top

2013-07-30 14:36:43 +02:00

functions.js

Coding style: whitespace around operators

2013-09-30 11:25:23 +02:00

get_image.js.php

Wrap some long lines

2013-04-26 10:07:53 +02:00

get_scripts.js.php

Returned the cache setting to the get_scripts.js.php file

2013-09-05 20:02:16 +02:00

gis_data_editor.js

Merge branch 'QA_4_0'

2013-08-24 08:58:38 -04:00

import.js

Reference javascript messages by dot notation instead of using ['strFoo']

2013-04-16 13:32:51 +02:00

indexes.js

Hook SQL highlighter to more places

2013-05-24 09:59:38 +02:00

keyhandler.js

Whitespace cleanup

2013-07-30 14:36:43 +02:00

makegrid.js

Merge branch 'QA_4_0'

2013-09-19 15:31:03 +05:30

messages.php

Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting

2013-09-21 00:49:01 +02:00

navigation.js

Merge branch 'master' of git://github.com/thesocialgeek/phpmyadmin into thesocialgeek-master

2013-09-30 14:16:40 +02:00

OpenStreetMap.js

Various spacing and identation fixes

2013-04-15 15:13:14 +02:00

querywindow.js

…

replication.js

Various spacing and identation fixes

2013-04-15 15:13:14 +02:00

rte.js

Fix typo

2013-09-21 11:44:30 -04:00

server_databases.js

Add HTML5 required, placeholder attributes

2013-08-18 15:37:53 +02:00

server_plugins.js

Various javascript spacing fixes

2013-04-15 16:20:04 +02:00

server_privileges.js

Line wrapping for CodeMirror edit areas

2013-09-09 18:58:36 +05:30

server_status_advisor.js

Fix some forgotten messages conversions

2013-04-16 17:16:19 +02:00

server_status_monitor.js

Coding style: whitespace around operators

2013-09-30 11:24:11 +02:00

server_status_queries.js

Reference javascript messages by dot notation instead of using ['strFoo']

2013-04-16 13:32:51 +02:00

server_status_sorter.js

Reference javascript messages by dot notation instead of using ['strFoo']

2013-04-16 13:32:51 +02:00

server_status_variables.js

Reference javascript messages by dot notation instead of using ['strFoo']

2013-04-16 13:32:51 +02:00

server_user_groups.js

Add new JS file for server_user_groups

2013-07-31 22:09:46 +05:30

server_variables.js

Fixed newlines

2013-07-30 14:36:43 +02:00

sql.js

Merge branch 'QA_4_0' into merge. Resolved conflicts.

2013-09-03 14:13:02 +05:30

tbl_change.js

Merge pull request #582 from kasunchathuranga/fractionalSecs

2013-08-27 06:37:30 -07:00

tbl_chart.js

Various coding style improvements

2013-07-30 14:36:43 +02:00

tbl_find_replace.js

Missing spaces and semicolons

2013-07-30 14:36:43 +02:00

tbl_gis_visualization.js

Merge branch 'QA_4_0'

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

tbl_relation.js

Send server only if its available

2013-09-29 22:49:57 +05:30

tbl_select.js

Merge branch 'QA_4_0'

2013-06-02 09:17:20 -04:00

tbl_structure.js

Fix merge conflicts

2013-08-02 08:27:01 -04:00

tbl_zoom_plot_jqplot.js

Various coding style improvements

2013-07-30 14:36:43 +02:00