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

204 Commits

Author SHA1 Message Date
Marc Delisle
5fe99023d7 Add explanation for CSS load order 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-15 06:18:42 -04:00
Chirayu Chiripal
5bd8bb6db7 jquery-ui css should have low priority over phpmyadmin.css.php 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-11 23:30:09 +05:30
Michal Čihař
f1256f7dcc Simplify map tiles urls in CSP policy 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 15:00:41 +02:00
Michal Čihař
692140b98e Simplify code for generating CSP with Captcha 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 14:58:03 +02:00
Michal Čihař
bc8f797746 Remove CSP support for ancient Safari versions 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 14:55:43 +02:00
Michal Čihař
0b2e35da19 Execute headers code when we have runkit 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 14:53:14 +02:00
Michal Čihař
fed108dbe4 Move menu resizer to correct folder 
The jquery folder should contain third party libraryes what menu resizer
is not.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 15:00:19 +02:00
Michal Čihař
e82c1b2e09 Add CSPAllow to script-src as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-04-12 11:43:06 +02:00
Ashutosh Dhundhara
e9d59fd7e0 Implemented Favorite tables feature with Ajax. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Minor fixes in Settings->Features page and Navigation Header class.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed translation issues in RecentFavoriteTable class.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed error in RecentFavoriteTable class.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Another fix in structure.lib.php.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-03-29 00:06:14 +05:30
Marc Delisle
e4224bf18d Merge pull request #1095 from ashutoshdhundhara/favourite_tables_icon_only 
Feature request: #1476 Favorite tables select box.
 2014-03-26 17:01:18 -04:00
Ashutosh Dhundhara
8bc21b7876 Feature request: #1476 Favourite tables select box. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Changes in "create_tables.sql".

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Minor fix in structure.lib.php.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Ripped Trailing White spaces.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Removed irrelevant comments from "FavouriteTable.class.php".

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed Table Summary colspan.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Changed Favourite to Favorite

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed failing test.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Feature request: #1476 Favourite tables select box. (Icon only)

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Gray and Golden Icons.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Removed unwanted icon from "img".

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed error in PMA_buildActionTitles_test.php.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Re-positioned star icon and added tooltip to it.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Ripped trailing spaces from "structure.lib.php" and "db_structure.js".

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-03-26 23:37:19 +05:30
Madhura Jayaratne
3bea7c584a Add missing space 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-03-22 21:00:51 +05:30
Michal Čihař
82be0d51ca Merge remote-tracking branch 'origin/QA_4_1' 2014-03-20 10:18:59 +01:00
Michal Čihař
c56523bebd Allow styles from ourselves in CSP 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-20 10:18:42 +01:00
Michal Čihař
80e466a58d Merge remote-tracking branch 'origin/QA_4_1' 2014-03-19 21:39:34 +01:00
Michal Čihař
eab5d68b9d Fix typo in CSP 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 21:39:23 +01:00
Michal Čihař
a415e6c5c1 Merge remote-tracking branch 'origin/QA_4_1' 2014-03-19 21:37:15 +01:00
Michal Čihař
5cb584b963 Allow inline styles in CSP 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 21:36:53 +01:00
Michal Čihař
8316786c95 Merge remote-tracking branch 'origin/QA_4_1' 2014-03-19 12:19:40 +01:00
Michal Čihař
5199ad8dc2 Add Content-Security-Policy header 
This is standard and obsoletes X-Content-Security-Policy and
X-Webkit-CSP, but we still keep the old ones to provide headers for old
browsers.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 12:16:55 +01:00
Michal Čihař
786256469c Allow www.google.com only in case we are using reCAPTCHA 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 12:16:55 +01:00
Michal Čihař
e2238b38da Better way of CFP 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-14 08:50:32 +01:00
Michal Čihař
1d76d52baf Missing punctuation at the end of sentences 2014-01-29 15:21:02 +01:00
Madhura Jayaratne
de2f210fc9 Improve doc comments 2013-11-28 23:13:41 +05:30
Marc Delisle
ebc5e9a5c7 We do not need a separate ErrorReporting directive 2013-11-20 06:14:53 -05:00
Atul Pratap Singh
b2aa417793 Fix bug#3967 Footer not included in AJAX loaded pages 2013-11-14 19:05:54 +05:30
Hugues Peccatte
2fc0ca777d Update PHPDoc. 2013-11-10 10:28:05 +01:00
Marc Delisle
0f4ff4dd54 Bug #4139 reCAPTCHA causing CSP problems 2013-10-27 16:09:19 -04:00
Michal Čihař
addb363cdb Move tracekit library to separate folder 
This makes it somehow separated from our code
 2013-09-30 09:17:03 +02:00
Mohamed Ashraf
088166f0a3 Merge remote-tracking branch 'origin/master' into error_reporting 
Conflicts:
	ChangeLog
 2013-09-01 13:07:52 +02:00
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
Mohamed Ashraf
1bbb3816a8 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting 
Conflicts:
	ChangeLog
	libraries/Scripts.class.php
	libraries/config.default.php
 2013-08-07 01:05:48 +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
Mohamed Ashraf
b83f0eb463 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting 
Conflicts:
	ChangeLog
	doc/config.rst
	js/messages.php
	libraries/config/setup.forms.php
	version_check.php

changed 'libraries/Util.class.php' to accept the newly renamed proxy variables
 2013-07-29 18:12:04 +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
Mohamed Ashraf
74933318f3 Added Tracekit to help with stacktrace normalization 2013-06-27 18:43:08 +02:00
Mohamed Ashraf
b9bf9e0bcc Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting 2013-06-25 07:19:30 +02:00
Michal Čihař
09917e0dec Include minified versions JS in git of jQuery and jQuery-UI 2013-06-24 15:03:41 +02:00
Mohamed Ashraf
6ddb9458d0 Added error report form 
Errors are now being caught and an error report is shown
The error report is being sent to the server if the user
authorises it however the server currently doesnt do
anything with the report. No attempt to anonymize the data
is made at this time.
 2013-06-18 09:02:36 +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
Rouslan Placella
6446faa2d5 Show messages from incoming request parameters 2012-11-27 15:06:05 +00:00
Rouslan Placella
2e1bc1bd8d Refactored menuPrepare and menuResize into a jQuery plugin 
Also integrated this plugin with both the main menu and the resizable
menu on the table structure page
 2012-11-24 17:25:37 +00:00
Rouslan Placella
177b459822 Fixed bug #3583315 - Query doesn't load in the querywindow when clicking on edit 2012-11-19 23:36:05 +00:00
Rouslan Placella
9db53f4c02 Use jquery.debounce instead of custom code to speed up navigation scroll and resize handlers 2012-11-11 15:45:28 +00:00
Rouslan Placella
c573b0c566 Moved setUrlHash module into ajax.js 2012-11-06 15:20:53 +00:00
Michal Čihař
8f35f7c9d7 Theme mighe be not available in fatal error case 2012-11-01 09:12:54 +01:00
Rouslan Placella
6e51172183 Update libraries/Header.class.php 2012-10-31 11:33:17 +00:00
Rouslan Placella
f08d23c688 Fixed another undefined index error 2012-10-31 11:28:53 +00:00
Rouslan Placella
f740c0b09d No output when the header is disabled 2012-10-31 09:45:04 +00:00
Rouslan Placella
08efd1e7c8 Fixed invalid function call 2012-10-30 20:29:01 +00:00
Rouslan Placella
5b0b9e42fe Update new code to use PMA_Util 2012-10-30 20:24:01 +00:00
Rouslan Placella
483dab2feb phpcs fixes 2012-10-30 20:24:01 +00:00
Rouslan Placella
34a7d63e06 Force IE out of compatibility mode 2012-10-30 20:24:00 +00:00
Rouslan Placella
753e1f3648 Initial implementation of microhistory 2012-10-30 20:24:00 +00:00
Rouslan Placella
3d8cf0f716 Dropped dead code 2012-10-30 20:24:00 +00:00