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

147 Commits

Author SHA1 Message Date
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