gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,947 Commits 12 Branches 481 Tags 2.4 GiB
bb1df87584
Commit Graph

119 Commits

Author SHA1 Message Date
Michal Čihař
e9da696911 Various coding style fixes 2013-08-07 11:59:01 +02:00
Michal Čihař
0a3d1d5be8 Better names for URL generating functions 2013-08-07 10:58:17 +02:00
Michal Čihař
b4dc0213e6 Add infrastructure for doc links in SQL highlighter 2013-08-07 09:28:19 +02:00
Michal Čihař
386217ebd1 Merge remote-tracking branch 'origin/QA_4_0' 2013-07-30 09:41:48 +02:00
Michal Čihař
da4042fb6c Display none only if protection is enabled 2013-07-30 09:40:56 +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ř
fad8d76f68 Include minified versions JS in git of jQuery and jQuery-UI 2013-07-08 13:00:16 +02:00
Michal Čihař
09917e0dec Include minified versions JS in git of jQuery and jQuery-UI 2013-06-24 15:03:41 +02:00
Michal Čihař
65a083f6d4 Merge branch 'RECAPTCHA2' of git://github.com/pbojan/phpmyadmin into pbojan-RECAPTCHA2 
Conflicts:
	libraries/Header.class.php
 2013-06-11 15:28:19 +02:00
Michal Čihař
a93592b076 Revert "Missing include" 
This reverts commit 73862412ee.
 2013-06-10 17:40:52 +02:00
Michal Čihař
73862412ee Missing include 2013-06-10 17:27:45 +02:00
Michal Čihař
b5dfa1c5c4 Merge branch 'QA_4_0' 2013-06-05 10:10:57 +02:00
Michal Čihař
77330abaef Allow CSP for images as well 2013-06-05 10:10:48 +02:00
Michal Čihař
bfa6282083 Merge branch 'QA_4_0' 2013-06-05 10:04:57 +02:00
Michal Čihař
eb29af585a Allow customization of CSP headers 
This is useful for inserting custom javascript in header/footer files.
 2013-06-05 10:04:06 +02:00
Marc Delisle
e6b1391af9 Fix merge conflicts 2013-05-28 08:49:37 -04:00
Marc Delisle
ec6a47d8a0 bug #3957 Cookies must be enabled past this point 2013-05-28 08:46:04 -04:00
Michal Čihař
2af13548da Drop not used colorize addon 2013-05-24 10:06:53 +02:00
Michal Čihař
e03449460a Highlight SQL using CodeMirror 2013-05-24 09:59:38 +02:00
Madhura Jayaratne
b6baa38dbd Merge branch 'QA_4_0' 2013-05-22 14:39:11 +05:30
Madhura Jayaratne
60d662be34 bug #3941 Recent tables list always empty 2013-05-22 14:36:01 +05:30
Michal Čihař
4fa3f06d23 Upgrade CodeMirror to 3.13 2013-05-21 09:41:04 +02:00
Bojan Petkovski
e9f5a30ae5 ReCaptcha https and CSP bug fixes 2013-05-11 17:53:34 +02:00
Bojan Petkovski
1832c8fa33 ReCaptcha feature 2013-05-11 17:53:32 +02:00
Michal Čihař
384f2cd79e Merge remote-tracking branch 'origin/QA_4_0' 
Conflicts:
	js/pmd/history.js
	libraries/Config.class.php
 2013-05-02 10:13:18 +02:00
J.M
1347575ee7 Fix bug #3900 CSP WARN in Firefox console 2013-05-01 17:56:04 +02:00
Madhura Jayaratne
b09b612579 Merge branch 'QA_4_0' 2013-04-14 23:39:48 +05:30
Madhura Jayaratne
f9859a013c Revert 0862f0a1ee. This was suppose to be a part of the pull request 247, however erroneously merged to master. Hence reverting. 2013-04-13 18:34:02 +05:30
Madhura Jayaratne
637be71f0c Allow loading map tiles when HTTPS is not used 2013-04-13 17:23:35 +05:30
Madhura Jayaratne
0862f0a1ee Allow loading map tiles when HTTPS is not used 2013-04-13 17:06:31 +05:30
J.M
0458afab28 Add HTML class for current browser and version 2013-04-08 13:00:21 +02:00
Marc Delisle
58a8e37de4 Comment about the best place to include CodeMirror 2013-04-01 07:44:03 -04:00
Kasun Chathuranga
71e96e7590 Fix bug #3835 Disabling CodeMirror in GUI settings does not actually disable it 2013-03-31 16:30:48 +05:30
Marc Delisle
7d2d883966 Fix merge conflicts 2013-03-25 19:57:27 -04:00
Michal Čihař
6c4aedbac2 Fix typo 2013-02-12 15:54:49 +01:00
Michal Čihař
5e7e416dab Merge remote-tracking branch 'origin/QA_3_5' 
Conflicts:
	libraries/header_http.inc.php
 2013-02-12 14:15:12 +01:00
Marc Delisle
bd3828754c Bug #3784 Disabling "Confirm DROP queries" in user preferences does not make the confirmations go away 2013-02-05 17:52:18 -05:00
Rouslan Placella
e486798850 Include keyhandler.js globally 2013-02-03 08:38:11 -05:00
Madhura Jayaratne
5b271e1ad8 Apply print.css to both print and print view 2013-01-25 19:45:37 +05:30
Marc Delisle
6aaafcad27 Final removal of qtip 2013-01-09 08:05:22 -05:00
Marc Delisle
3206db75e7 Continue converting to jQuery UI tooltip 2013-01-02 08:37:24 -05:00
Marc Delisle
5e8f6efd0b - port CSP policy changes done for Chrome in commit 
8c8099e2f7
- add 'unsafe-eval' due to the newer jQuery library
 2013-01-02 07:50:42 -05:00
Marc Delisle
431df615f2 Upgraded to jquery-ui-timepicker-addon 1.1.1 2013-01-01 11:50:04 -05:00
Rouslan Placella
45e181af33 Upgraded jquery drag library to v2.2 2012-12-20 18:10:56 +00:00
Rouslan Placella
501e3a9f2c Upgraded jquery and jquery-ui 2012-12-19 14:50:36 +00:00
Rouslan Placella
c9f05828f6 Fixed bug #3590624 - PHP error in Header class 2012-12-14 20:05:17 +00:00
Marc Delisle
e41e0f4a64 - use the previous idea of clicking anywhere on the bar 
- advertise this idea with the icon's link
 2012-12-09 07:08:48 -05:00
Rouslan Placella
5e33ec73d8 Use icon for scroll to top functionality 2012-12-05 20:52:55 +00:00