gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,634 Commits 12 Branches 481 Tags 2.4 GiB
55dccb6138
Commit Graph

176 Commits

Author SHA1 Message Date
Marc Delisle
d95356e1dd bug #4655 Undefined index: collation_connection (second patch) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-02 09:32:19 -05:00
Madhura Jayaratne
88089a76a7 Merge branch 'master' into Performance 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-03 05:06:49 +05:30
Atul Pratap Singh
d4cbccd78b Merge branch 'QA_4_2' 2014-11-02 14:09:09 +05:30
Atul Pratap Singh
e743305764 Fix bug#4574 Blank/white page when JavaScript disabled 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-11-02 13:57:48 +05:30
Hugues Peccatte
bdb5f333d7 Fix PHPCS issues. 
PHPDoc updates.
Minor coding style modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-01 22:07:18 +01:00
Hugues Peccatte
e17de11c74 Improve multibytes string manipulation performances. 
Review SQL import process.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-30 17:40:09 +01:00
Madhura Jayaratne
72b6d68d34 Do not check for the validity of all recent tables on initial loading. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-20 12:29:48 +05:30
Ann + J.M
a540e6ba87 More fixes to new PMA_URL_getCommon style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-18 19:42:39 +02:00
Ann + J.M
b1a7039ae3 Convert PMA_URL_getCommon calls to new style 
Rewritten tests need validation
Signed-Off-By: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-18 19:42:29 +02:00
Hugues Peccatte
70a21ec25c Merge from master. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-08 21:49:37 +02:00
Nisarg Jhaveri
bf63a462cc Basic autocomplete in SQL Query editor 
- Autocomplete SQL keywords using CodeMirror hint addon
- Inline, footer SQL editors are not included
- Table/Database names completion is not implemented
- Added autocompletion to console, inline SQL editor, create view dialogue
- Autocomplete on `inputRead` instead of `change` event.

Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
 2014-10-06 12:37:14 -04:00
Atul Pratap Singh
c70e109bd6 Feature#1546 Replace js sprintf library with a better one 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-10-03 17:08:25 +05:30
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls. 
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-28 20:53:01 +02:00
Marc Delisle
c85c9fd417 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-13 10:39:21 -04:00
Marc Delisle
33b39f9f1d bug #4530 [security] DOM based XSS that results to a CSRF that creates a ROOT account in certain conditions 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-13 10:30:47 -04:00
Smita Kumari
42223e1bf6 avoid session timeout when user is active FR#1529 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-09-13 03:10:40 +05:30
Hugues Peccatte
5985894160 Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-07 00:31:45 +02:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 10:44:03 +02:00
Ashutosh Dhundhara
35dab58bf5 RFE#1492: Remove the distinct query window. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-12 01:47:20 +05:30
Edward Cheng
fb14e92d62 PMA console, history and bookmarks. 
Modified: resizer of navigation bar: whole-time-bind events removed.

Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-06-25 21:22:33 +08:00
Chirayu Chiripal
b527dc74a1 bugfix-4415,4453,4452,4451: Complete makeover of rfe-1518 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-13 23:56:24 +05:30
Chirayu Chiripal
85390a7169 rfe-982: Support for editing binary fields in hexadecimal 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-21 21:42:21 +05:30
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