Michal Čihař
cb5e1cb966
Various coding style fixes
2013-08-07 13:21:59 +02:00
Michal Čihař
f685126cdd
Remove double keys
2013-08-07 10:34:55 +02:00
Michal Čihař
151d8566e8
Document functions
2013-08-07 10:28:56 +02:00
Michal Čihař
2e03f81633
Doc links only with CodeMirror enabled
2013-08-07 10:27:46 +02:00
Michal Čihař
dd5fd448d6
Properly set target for MySQL doc links
2013-08-07 10:26:55 +02:00
Michal Čihař
2822419f10
Show docs for multiword statements as well
2013-08-07 10:25:39 +02:00
Michal Čihař
5e2bf80e4e
Add more doc links
2013-08-07 09:45:43 +02:00
Michal Čihař
1102d68c39
Documentation for types
2013-08-07 09:35:22 +02:00
Michal Čihař
b4dc0213e6
Add infrastructure for doc links in SQL highlighter
2013-08-07 09:28:19 +02:00
Michal Čihař
160457e25f
Fix session path for javascript loader
2013-08-07 09:20:44 +02:00
Dirk-jan
97849db1e7
Fix javascript error when codemirror is disabled
2013-08-06 17:03:02 +02:00
Michal Čihař
94855c2137
Update CodeMirror to 3.15
2013-08-06 13:27:09 +02:00
Isaac Bennetch
066b753a5a
Merge pull request #554 from kasunchathuranga/configurableMenus
...
Improvements to configurable menus
2013-08-02 07:02:55 -07:00
Marc Delisle
d9fecc136d
Fix merge conflicts
2013-08-02 08:27:01 -04:00
Marc Delisle
4711126d12
Missing hints when changing a column's structure
2013-08-02 08:23:52 -04:00
Michal Čihař
12ae5d874d
Document third party licenses
2013-08-01 10:22:06 +02:00
Michal Čihař
1cc98445ca
Upgrade jQuery SVG plugin
2013-08-01 10:22:06 +02:00
Michal Čihař
599bce0a0c
Merge remote-tracking branch 'origin/QA_4_0'
2013-08-01 10:09:29 +02:00
Michal Čihař
a583a478cc
Add jQuery and jQuery UI source code.
2013-08-01 10:08:55 +02:00
Kasun Chathuranga
a28f43b288
Add new JS file for server_user_groups
2013-07-31 22:09:46 +05:30
Kasun Chathuranga
b5890b8a74
Escape html
2013-07-31 10:59:52 +05:30
Kasun Chathuranga
896c560b3f
Merge branch 'master' into configurableMenus
...
Conflicts:
libraries/server_privileges.lib.php
2013-07-31 10:44:06 +05:30
Kasun Chathuranga
25e9672f37
Ask for confirmation before deleting a user group
2013-07-31 10:04:27 +05:30
Michal Čihař
d6affebdbe
Whitespace cleanup
2013-07-30 14:36:43 +02:00
Michal Čihař
5263a05169
Correct spacing of functions
2013-07-30 14:36:43 +02:00
Michal Čihař
c1da6e51f7
More readable debug statements
2013-07-30 14:36:43 +02:00
Michal Čihař
1bb39b0eff
Various coding style improvements
2013-07-30 14:36:43 +02:00
Michal Čihař
43988b3201
Various coding style improvements
2013-07-30 14:36:43 +02:00
Michal Čihař
16e2f21620
Move function to its docs
2013-07-30 14:36:43 +02:00
Michal Čihař
49c0bdb54b
Various coding style improvements
2013-07-30 14:36:43 +02:00
Michal Čihař
61cf2c4cc9
Various coding style improvements
2013-07-30 14:36:43 +02:00
Michal Čihař
425d9f466e
Various coding style improvements
2013-07-30 14:36:43 +02:00
Michal Čihař
3fc2ab9cf9
Move function declaration to top
2013-07-30 14:36:43 +02:00
Michal Čihař
dc201c3a7a
Fixed spacing
2013-07-30 14:36:43 +02:00
Michal Čihař
cbe04c44fd
Missing spaces and semicolons
2013-07-30 14:36:43 +02:00
Michal Čihař
ea5d365877
Move function definitions to top
2013-07-30 14:36:43 +02:00
Michal Čihař
93d283633b
Fixed newlines
2013-07-30 14:36:43 +02:00
Michal Čihař
5c51f4fecb
Merge remote-tracking branch 'origin/QA_4_0'
...
Conflicts:
libraries/config/setup.forms.php
2013-07-29 15:00:53 +02:00
Michal Čihař
24d0eb5520
Improved protection against cross framing
...
We now include CSS to hide the page and display it conditionally after
checking we're in top frame. This adds extra protection for clients who
do not support X-Frame-Options.
See also http://en.wikipedia.org/wiki/Framekiller and
https://www.owasp.org/index.php/Clickjacking_Defense_Cheat_Sheet
2013-07-29 14:55:29 +02:00
Michal Čihař
240b8332db
Readd AllowThirdPartyFraming option
...
We want by default no framing of phpMyAdmin, but still some sites might
need to embed it, so configuration option (with appropriate security
warning) is there.
This basically reverts d7e0bed284 .
2013-07-29 14:55:22 +02:00
Michal Čihař
3e3620f22d
Use dot notation
2013-07-29 09:29:12 +02:00
Michal Čihař
aaca8fc4c9
Define variable before using it
2013-07-29 09:28:33 +02:00
Michal Čihař
da81549411
Better readable code
2013-07-29 09:26:09 +02:00
Michal Čihař
a3d247ea59
Fixed newlines around +
2013-07-29 09:24:53 +02:00
Michal Čihař
3ef4d4cb2e
Single declaration of a variable
2013-07-29 09:23:44 +02:00
Michal Čihař
22e018f998
Fixed newlines around ||
2013-07-29 09:22:51 +02:00
Michal Čihař
fdc2ac7be5
Fixed newlines around &&
2013-07-29 09:22:37 +02:00
Isaac Bennetch
1a41ce1f59
Merge branch 'hideTables' of git://github.com/kasunchathuranga/phpmyadmin into kasunchathuranga-hideTables
...
Conflicts:
ChangeLog
2013-07-27 14:01:35 -04:00
Atul Pratap Singh
4351cabc85
allow tooltip overflow, hide axis overflow explicitly
2013-07-25 21:33:38 +05:30
Atul Pratap Singh
e8d85ade30
allow tooltip overflow, hide axis overflow explicitly
2013-07-25 21:31:37 +05:30