webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-31 10:54:46 +03:00
Code Activity
85,394 Commits 12 Branches 481 Tags
71fcb2fe2cf74cdafe804154eba3e713fbfcd2ee
Commit Graph

7501 Commits

Author SHA1 Message Date
Marc Delisle
fdb0ad1f69 Merge branch 'QA_4_0' 2013-07-28 06:26:12 -04:00
Marc Delisle
0e9e7f28a2 Fix merge conflicts 2013-07-28 06:25:48 -04:00
Marc Delisle
af5ca358d2 Fix merge conflicts 2013-07-28 06:23:57 -04:00
Marc Delisle
269d0c89fe Fix merge conflicts 2013-07-28 06:17:38 -04:00
Marc Delisle
836529be42 Fix merge conflicts 2013-07-28 05:55:40 -04:00
Dieter Adriaenssens
e0c8704f72 [security] Fix stored XSS in link transformation plugin, see PMASA-2013-13 2013-07-28 02:26:26 +02:00
Dieter Adriaenssens
b9c814ed6d [security] Fix unencoded json object, see PMASA-2013-11 2013-07-28 01:50:46 +02:00
Isaac Bennetch
1a41ce1f59 Merge branch 'hideTables' of git://github.com/kasunchathuranga/phpmyadmin into kasunchathuranga-hideTables 
Conflicts:
	ChangeLog
 2013-07-27 14:01:35 -04:00
Madhura Jayaratne
2a28436bdd #4035 Query "inline" link disappears when turning off "Explain SQL" option 2013-07-27 20:03:26 +05:30
Marc Delisle
ab7f0a143c Merge branch 'QA_4_0' 2013-07-27 06:33:34 -04:00
Marc Delisle
3fde4efd51 #3578 transformations for text/plain on a BLOB column 2013-07-27 06:32:58 -04:00
Marc Delisle
4e40875d02 Merge branch 'QA_4_0' 2013-07-26 09:06:15 -04:00
Marc Delisle
69c82e1380 Missing ChangeLog entry in master 2013-07-26 09:04:58 -04:00
Marc Delisle
4a6b6bda90 bug #3998 Non-permanent SQL history not working 2013-07-26 08:59:04 -04:00
Atul Pratap Singh
c598c59d8a changelog entry for bug#4009 2013-07-25 20:57:39 +05:30
Marc Delisle
93c5a23a72 bug #4024 Editing field a record is selected by makes pma load forever 2013-07-24 10:51:14 -04:00
Marc Delisle
1293e9b6e9 [security] Fix self-XSS in schema export, see PMASA-2013-14 2013-07-23 11:05:10 -04:00
Marc Delisle
8ef025ef3d [security] Fix control user SQL injection in schema_export.php, see PMASA-2015 2013-07-23 08:48:53 -04:00
Marc Delisle
974d0dedee [security] Fix control user SQL injection in pmd_pdf.php, see PMASA-2013-15 2013-07-23 08:35:07 -04:00
Kasun Chathuranga
4f0f77390b Add ChangeLog entry for rfe #1385 - Hide tables, functions, procedures, events and views in navigation tree 2013-07-23 10:00:27 +05:30
Marc Delisle
61731b8651 Merge branch 'QA_4_0' 2013-07-20 10:26:15 -04:00
Marc Delisle
6ac33adc15 ChangeLog entry for bug 4012 fix 
Fix another case of parameter incorrectly passed by reference
Adjust functions parameter doc
 2013-07-20 10:23:20 -04:00
Marc Delisle
dc92c72e8a Merge commit '77e67c3' 2013-07-19 09:13:51 -04:00
Marc Delisle
77e67c3f2c - bug #4019 Create database if not exists (export): add an option to the 
interface to enable generating CREATE DATABASE and USE (false by default)
 2013-07-19 09:09:24 -04:00
Marc Delisle
257bd7349c ChangeLog entry for full path disclosure fixes 2013-07-17 15:27:57 -04:00
Marc Delisle
13cd72a269 Fix merge conflict 2013-07-17 07:15:06 -04:00
Marc Delisle
5720fb3843 Incorrect Drizzle 7 detection (backport from 37781045) 2013-07-17 07:08:35 -04:00
Isaac Bennetch
77467421f3 ChangeLog for configurable menus 2013-07-14 00:26:45 -04:00
Isaac Bennetch
63694eb049 Merge pull request #496 from kasunchathuranga/EditView 
Edit a view
 2013-07-12 10:04:01 -07:00
Kasun Chathuranga
ecc0e3d5eb ChangeLog entry for rfe #1373 2013-07-12 21:07:01 +05:30
Marc Delisle
a8007e46d0 Merge branch 'QA_4_0' 2013-07-12 06:46:29 -04:00
Marc Delisle
3cede7cbac bug #4015 Forcing a storage engine for configuration storage 2013-07-12 06:45:00 -04:00
Marc Delisle
84c3ec5936 Merge branch 'QA_4_0' 2013-07-10 08:31:22 -04:00
Marc Delisle
07f9442caf bug #4007 Analyze option not shown for InnoDB tables 2013-07-10 08:29:09 -04:00
J.M
e0d8568ac6 [security] Fix self-XSS in setup, trusted proxies validation, see PMASA-2013-9 2013-07-07 17:11:16 +02:00
J.M
d096a0fc46 [security] Fix stored XSS in navigation panel logo link, see PMASA-2013-9 2013-07-07 16:52:20 +02:00
J.M
2005c4b7c1 [security] Fix stored XSS in Server status monitor, see PMASA-2013-9 2013-07-07 15:55:18 +02:00
Kasun Chathuranga
0a21088056 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin into findNreplace 
Conflicts:
	ChangeLog
 2013-07-02 23:23:55 +05:30
Michal Čihař
e7e183ef64 Changelog entry for no PHP 5.2 support 2013-07-01 22:16:52 +02:00
Marc Delisle
2d0fc58ced Fix merge conflict 2013-06-30 06:43:08 -04:00
Marc Delisle
fd111566c9 Fix merge conflict 2013-06-30 06:41:44 -04:00
Marc Delisle
42d6983d06 Fix merge conflict 2013-06-30 06:38:36 -04:00
Marc Delisle
43b75a7a4f 4.0.4.1 release date 2013-06-30 06:36:09 -04:00
Marc Delisle
0124642684 [security] Global variables scope injection vulnerability (see PMASA-2013-7) 2013-06-28 13:09:13 -04:00
Kasun Chathuranga
0402843d89 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin into findNreplace 
Conflicts:
	ChangeLog
 2013-06-26 21:44:45 +05:30
Isaac Bennetch
c979dffc17 ChangeLog entry for pull request #438; kasunchathuranga/relView 2013-06-26 12:06:26 -04:00
Kasun Chathuranga
cdca143ce8 Add ChangeLog entry for rfe #1405 2013-06-26 21:30:31 +05:30
Marc Delisle
4ea69f0536 Merge commit 'f0232c3' 2013-06-24 08:00:47 -04:00
Marc Delisle
f0232c3cda bug #3985 Call to undefined function mb_detect_encoding 2013-06-24 07:58:23 -04:00
Michal Čihař
bebba32337 Merge remote-tracking branch 'origin/QA_4_0' 
Conflicts:
	libraries/config.values.php
	libraries/sql_query_form.lib.php
	server_binlog.php
	server_databases.php
	tbl_structure.php
	test/classes/PMA_DisplayResults_test.php
 2013-06-24 10:41:54 +02:00