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

Conflicts:
	js/functions.js
	js/tooltip.js
	libraries/config.default.php
	libraries/config.values.php
	libraries/display_export.lib.php
	setup/lib/forms.inc.php
	setup/lib/messages.inc.php
	themes/darkblue_orange/css/theme_right.css.php
	themes/original/css/theme_right.css.php

2010-08-19 14:45:18 +02:00

..

colorpicker

forgot to add this

2010-03-25 17:03:18 -04:00

jquery

Support for translating time part of datetime editor.

2010-05-03 15:02:33 +02:00

common.js

clarify code behavior

2010-07-02 11:22:36 -04:00

config.js

keep selected tab after save

2010-07-27 22:12:53 +02:00

cross_framing_protection.js

remove one instance of inline js

2010-04-17 13:51:08 -04:00

dom-drag.js

3.3

2009-12-31 13:11:19 +00:00

export.js

If structure is not being exported, the comment options for structure should not be enabled

2010-08-11 13:39:35 -07:00

functions.js

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

2010-08-19 14:45:18 +02:00

import.js

Don't hardcode the formats

2010-08-16 17:23:11 -07:00

indexes.js

3.3

2009-12-31 13:11:19 +00:00

jquery.qtip-1.0.0.min.js

Replacing old tooltip with new jQuery plugin

2010-08-05 17:31:02 -07:00

keyhandler.js

3.3

2009-12-31 13:11:19 +00:00

main_custom_color.js

New main page design

2010-07-23 20:31:52 -07:00

messages.php

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

2010-08-19 14:45:18 +02:00

navigation.js

Added a prompt in the left frame fast filter that prompts the user on what to do, goes away when the field is focused on

2010-08-14 11:46:32 -07:00

password_generation.js

Generate password only available if JS is enabled

2010-07-19 10:03:17 -04:00

querywindow.js

3.3

2009-12-31 13:11:19 +00:00

replication.js

Rewrite generating master configuration.

2010-04-09 16:09:29 +02:00

server_privileges.js

3.3

2009-12-31 13:11:19 +00:00

server_synchronize.js

Use proper server selector.

2010-04-20 08:13:27 +02:00

tbl_change.js

Whitespace fixups.

2010-04-21 15:06:53 +02:00

tbl_relation.js

rfe #2988633 Improve ON DELETE/ON UPDATE drop-downs

2010-04-17 19:22:12 -04:00

update-location.js

jQuery -> $

2010-04-12 11:31:42 +02:00