gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,558 Commits 12 Branches 481 Tags 2.4 GiB
5d32405042
Commit Graph

14781 Commits

Author SHA1 Message Date
Marc Delisle
8ad850a820 Merge commit '4185868' 2015-09-14 10:51:40 -04:00
Remi Collet
41858689dd allow to use system udan11/sql-parser 
Signed-off-by: Remi Collet <fedora@famillecollet.com>
 2015-09-14 10:47:37 -04:00
Marc Delisle
50073470a7 Merge branch 'QA_4_5' 2015-09-14 08:17:20 -04:00
Marc Delisle
e6c7f66b0e Fixes #11480 Notice Undefined index: drop_database 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-14 08:16:38 -04:00
Michal Čihař
ead7b50cf6 Merge remote-tracking branch 'origin/QA_4_5' 2015-09-14 10:36:07 +02:00
Michal Čihař
9edddbf598 Avoid failure if allowdeny rules are not set 
Fixes #11478

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-09-14 10:34:58 +02:00
Madhura Jayaratne
53277f8b67 Merge branch 'ssl' 2015-09-14 14:07:42 +10:00
Madhura Jayaratne
2cbcf730fe Simplify require SSL 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-14 14:07:14 +10:00
Madhura Jayaratne
55d2593213 Merge branch 'drizzle' 2015-09-14 10:24:43 +10:00
Madhura Jayaratne
b7d48ad8e3 Fix #11475 Warnings linked to Drizzle 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-14 10:22:16 +10:00
Marc Delisle
c7cde580c8 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-13 09:45:44 -04:00
Marc Delisle
00482376a3 Merge branch 'QA_4_5' 2015-09-12 06:53:25 -04:00
Marc Delisle
efb71af6f4 Fix error report #14326 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-12 06:51:51 -04:00
Marc Delisle
77c0d66a1b Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-11 13:37:54 -04:00
Marc Delisle
27e54fb194 Refactor to remove display_export.inc.php 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-11 11:44:26 -04:00
Marc Delisle
a0927dcc47 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-11 08:19:02 -04:00
Madhura Jayaratne
a134c074cf Merge pull request #11430 from madhuracj/rfe6297 
Fix #6297 Use GET only for read only operations
 2015-09-10 20:01:23 +10:00
Madhura Jayaratne
80f5322fe2 Remove server plugin page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:07:00 +10:00
Madhura Jayaratne
93bfdbe371 Remove more references to Drizzle 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:06:58 +10:00
Madhura Jayaratne
e4fcf439f9 Remove references to data_dictionary 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:06:54 +10:00
Madhura Jayaratne
42d9d155e1 Remove Drizzle types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:06:52 +10:00
Madhura Jayaratne
9790a0bd47 Remove Drizzle support from DBI 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:06:50 +10:00
Madhura Jayaratne
6126c67e52 Remove Drizzle support from table class 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:02:47 +10:00
Madhura Jayaratne
d2e03853e8 Remove Drizzle support from operations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:02:45 +10:00
Madhura Jayaratne
c196b189af Remove Drizzle support from table related functionalities 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:02:44 +10:00
Madhura Jayaratne
902872a94b Remove Drizzle support from storage engines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:02:42 +10:00
Madhura Jayaratne
98372481bb Remove Drizzle from database level functions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:02:40 +10:00
Madhura Jayaratne
f3ff8403f2 Remove more Drizzle support 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:02:39 +10:00
Madhura Jayaratne
7fadb9e37f Remove Drizzle support from import and export 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:02:37 +10:00
Madhura Jayaratne
81b54ee423 Remove Drizzle support from navigation and menu 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:02:36 +10:00
Madhura Jayaratne
8dcb93c631 More server level Drizzle functions removed 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:02:35 +10:00
Madhura Jayaratne
d16bc93ff1 Remove Drizzle support from functionalities in server level 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:02:33 +10:00
Madhura Jayaratne
6401ad9b54 Merge branch 'QA_4_5' 2015-09-10 00:55:48 +10:00
Madhura Jayaratne
b333793375 Merge branch 'QA_4_4' into QA_4_5 2015-09-10 00:53:15 +10:00
Madhura Jayaratne
0bc6f30f5d Change value for lower_case_table_names 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 00:47:30 +10:00
Madhura Jayaratne
ef5177f555 Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 00:43:26 +10:00
Madhura Jayaratne
9131b59936 Fix #11461 Foreign key constraints for InnoDB tables with upper-case letters disabled 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 00:34:47 +10:00
Madhura Jayaratne
dbf9ff2723 Fix #11461 Foreign key constraints for InnoDB tables with upper-case letters disabled 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 00:31:52 +10:00
Marc Delisle
7ab576930b 4.5.0-rc1 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-09 06:03:45 -04:00
Marc Delisle
fe1d3ce9ba 4.5.1-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-09 05:08:59 -04:00
Marc Delisle
337658a927 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-08 11:38:50 -04:00
Marc Delisle
f447cd94b0 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-08 11:35:05 -04:00
Marc Delisle
f8739dc3e3 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-08 11:20:30 -04:00
Madhura Jayaratne
785f4e2711 Fix reCaptcha bypass 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-08 07:13:24 +10:00
Marc Delisle
9a20bdaf39 Merge branch 'QA_4_5' 2015-09-07 15:16:10 -04:00
Dan Ungureanu
4607c709ac Fixes #11465. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-09-07 19:50:07 +03:00
Marc Delisle
43d47b6c4a Merge branch 'QA_4_5' 2015-09-05 12:28:39 -04:00
Marc Delisle
c69cc95a6c Typo in variable name 
See 01e7c65f07

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-05 12:27:12 -04:00
Marc Delisle
93e4af9dd6 Merge branch 'QA_4_5' 2015-09-05 12:21:26 -04:00
Marc Delisle
a2898d760e Fixes #11463 Cannot redeclare class phpseclib\Crypt\AES 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-05 12:20:09 -04:00