webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Code Activity
106,400 Commits 12 Branches 481 Tags
d53db00a615000e94227ccded87f2f237daa4250
Commit Graph

4638 Commits

Author SHA1 Message Date
Michal Čihař
6ba52a72b4 Merge branch 'QA_4_6-security' into master-security 2016-06-22 13:11:13 +02:00
Michal Čihař
4d21b5c077 Fixed rendering of chart of columns with HTML inside 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 13:07:32 +02:00
Michal Čihař
57ae483bad Escape database name when showing dialog 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-22 11:14:57 +02:00
Michal Čihař
22b19b5d69 Merge branch 'QA_4_6-security' into master-security 2016-06-20 10:45:26 +02:00
Michal Čihař
364732e309 Escape error message from server 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 10:11:25 +02:00
Michal Čihař
895a131d2e Escape HTML when rendering AJAX error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 10:07:52 +02:00
Michal Čihař
79661610f6 Escape attributes when showing images in javascript 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 10:04:16 +02:00
Michal Čihař
791bdafcdd Merge branch 'QA_4_6-security' into master-security 2016-06-17 16:24:39 +02:00
Michal Čihař
4767f24ea4 Limit number of included scripts in get_scripts.js.php 
This avoids potential DOS, the limit is same as we use for generating
the URLs.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-15 18:07:12 +02:00
Michal Čihař
8a0e39228f Merge branch 'QA_4_6' 2016-06-13 12:55:08 +02:00
Michal Čihař
b5faeb3c27 Fixed editing of server variable 
We now store verbatim variable name in HTML to avoid need to do some
magical transformations when parsing it.

Fixes #12317

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-13 12:53:34 +02:00
Michal Čihař
0caecf5fc8 Correct error handling when editing variable fails 
Issue #12317

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-13 12:46:29 +02:00
Michal Čihař
b23dcfb456 Remove no longer used bigints javascript 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-09 14:33:48 +02:00
Deven Bansod
78062a4258 Merge branch 'QA_4_6' 2016-06-05 14:57:26 +05:30
Deven Bansod
73ce508712 Fix error in Designer saved default state of all tables 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-06-05 13:56:01 +05:30
Madhura Jayaratne
dac90ecb03 Merge branch 'QA_4_6' 2016-06-05 11:13:34 +10:00
Madhura Jayaratne
aec1f4b3c5 Fix #12285 Designer JavaScript error: Show/Hide tables list 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-06-05 11:12:05 +10:00
Isaac Bennetch
4d03c3403d Fix typo in function documentation; thanks Deven 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-05-28 10:36:39 -04:00
Gregory-Buhler
e1eed3ed43 Fixes #12233 Error message improved when user tries to rename database to 
same name. Added new functionality to PMA_ajaxShowMessage() allowing for
different notification types.

Signed-off-by: Gregory-Buhler <webmaster@gregorybuhler.com>
 2016-05-26 09:54:39 -06:00
Michal Čihař
b24347ca8f Merge branch 'QA_4_6' 2016-05-11 11:32:36 +02:00
Michal Čihař
b3132bf2c8 Fix schema export with too many tables 
We need to submit tables in POST parameters as there can be too many of
them to be included in GET.

Fixes #12234

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-11 11:31:55 +02:00
Michal Čihař
d88ebebc89 Define dataType so that jQuery do not have to guess 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-11 10:55:45 +02:00
Michal Čihař
d344a8f7ae Do not catch HTML requests in console 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-11 10:55:24 +02:00
Michal Čihař
7b08da151e Merge branch 'QA_4_6' 2016-04-26 12:50:59 +02:00
Michal Čihař
54b38e2999 Share js code for hostname input and fix it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-26 12:50:42 +02:00
Michal Čihař
0cd7caee71 Share js code for username input and fix it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-26 12:50:42 +02:00
Michal Čihař
6fdb046f9b Move javascript code for password to functions.js 
- This allows to share the code
- Also fixed bad references to fields

Fixes #12217

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-26 12:50:42 +02:00
Michal Čihař
387c094c94 Merge branch 'QA_4_6' 2016-04-26 10:31:04 +02:00
Michal Čihař
fc8486094c Fixed config tab persistence errors 
The URL hash can get appended php session ID breaking the hash lookup.

Fixes #12215

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-26 10:29:58 +02:00
Madhura Jayaratne
476d9a5746 Merge branch 'QA_4_6' 2016-03-31 21:39:21 +11:00
Madhura Jayaratne
413f66f4c2 Fix #12125 Cannot highlight a column if I scroll down from the top of the table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-31 21:34:43 +11:00
Deven Bansod
155f53c398 Merge branch 'QA_4_6' 
Conflicts:
	po/az.po
 2016-03-21 18:04:12 +05:30
Deven Bansod
d2ad23972b Fix #12105 : Multi-server drag-drop-import always fails 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-03-21 18:00:22 +05:30
Durgesh
d798809215 Filtering databases on databases listing, Issue #12047 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-03-03 16:21:15 +05:30
Michal Čihař
2c256da5e8 Merge commit '73fd0dc2a8f5471c717a887aae22bde97bc5498f' 2016-03-01 07:45:58 +01:00
Michal Čihař
a29f154f37 Merge branch 'MAINT_4_5_5-security' into QA_4_6-security 2016-02-29 10:35:47 +01:00
Madhura Jayaratne
bcd4ce8cba Fix XSS in normalization.js 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-27 09:56:12 +11:00
Madhura Jayaratne
37c34d089a Escape selectors 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-25 13:09:32 +01:00
Madhura Jayaratne
f33a42f1da Fix XSS in normalization.js 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-25 13:08:43 +01:00
Michal Čihař
7877a9c008 Escape SQL query for inline editing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-25 09:14:32 +01:00
Madhura Jayaratne
d1ac2a64a5 Fix #12017 Cannot easily select multiple tables when exporting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-23 19:58:18 +11:00
Michal Čihař
8b518460fb Merge pull request #11996 from 007durgesh219/Issue#11989 
Issue#11989, #11988, #11990
 2016-02-22 16:10:46 +01:00
Michal Čihař
889a291927 Merge pull request #11978 from zixtor/master 
Resolve #11643 : Maintain filter states for db/table navigation filters
 2016-02-22 14:44:12 +01:00
Michal Čihař
aa077eee78 Merge pull request #11963 from Achilles-96/Issue-11865 
Fixes #11865 partially
 2016-02-22 13:00:55 +01:00
Achilles-96
4073e4676f Fixes #11865 partially-Added support for shortcuts 
Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2016-02-22 17:06:23 +05:30
Durgesh
6650f7b07d Refactor text sanitization and javascript escaping, Issue #11989, #11988 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-22 14:45:19 +05:30
Atul Pratap Singh
2c073621eb Resolve #11643 : Maintain filter states for db/table navigation filters 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-02-21 18:41:38 +05:30
Michal Čihař
7a9a580290 Merge branch 'QA_4_6' 2016-02-19 13:34:13 +01:00
Michal Čihař
fbf756c7d6 Merge branch 'QA_4_5' into QA_4_6 2016-02-19 13:33:56 +01:00
Madhura Jayaratne
0226429e73 Merge branch 'QA_4_6' 2016-02-19 19:43:13 +11:00