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

9417 Commits

Author SHA1 Message Date
Marc Delisle
cd34ffab02 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-05 05:57:33 -04:00
Marc Delisle
ff358717e4 Fix invalid argument supplied for foreach() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-05 05:43:21 -04:00
Marc Delisle
ec4a023b49 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-04 07:53:44 -04:00
Marc Delisle
84a60be19c ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-04 07:46:14 -04:00
Marc Delisle
a21d6f7d0c Merge branch 'QA_4_4' into QA_4_5 2015-09-03 09:42:59 -04:00
Marc Delisle
040ecb777b ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-03 09:41:53 -04:00
Madhura Jayaratne
9c0a2b2837 Merge branch 'QA_4_4' into QA_4_5 2015-09-02 19:27:47 +10:00
Madhura Jayaratne
aa858ae736 #11451 Designer-Bug in move.js on multiple server configuration 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-02 19:25:12 +10:00
Marc Delisle
5127ab9ad6 Merge branch 'QA_4_4' into QA_4_5 2015-09-01 10:52:58 -04:00
Marc Delisle
32e155ab66 Fixes #11452 Semantics of export and import icons are mixed up 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-01 10:52:25 -04:00
Marc Delisle
f3eb388854 Fixes #11448 Clarify doc about the MemoryLimit directive 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-31 16:55:03 -04:00
Marc Delisle
c7342b7ffd Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-31 08:37:58 -04:00
Marc Delisle
9642af4ed5 Fixes #11447 MySQL 5.5 and the language system variable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-31 08:32:50 -04:00
Madhura Jayaratne
d3e8dac98c Fix #11445 MySQL 5.7 and Status page for an unprivileged user 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-31 21:23:51 +10:00
Madhura Jayaratne
788c96e8c7 Fix #11442 MySQL 5.7 and SHOW VARIABLES 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-31 17:10:32 +10:00
Madhura Jayaratne
6362e031c9 ChangeLog entry for issue #11436 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-29 17:03:20 +10:00
Madhura Jayaratne
2c4ef3888d Fix bug - Do not export sys database when exporting server 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-28 19:44:33 +10:00
Marc Delisle
adc67f1fd7 Merge branch 'QA_4_4' into QA_4_5 2015-08-26 10:11:40 -04:00
Marc Delisle
6ea2053df3 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-26 10:11:08 -04:00
Madhura Jayaratne
104b257ec5 Merge branch 'QA_4_4' 2015-08-26 17:26:48 +10:00
Madhura Jayaratne
623aec44e1 Fix bug - missing name for configuration read_as_multibytes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-26 17:21:00 +10:00
Madhura Jayaratne
35e0992619 Clarify ChangeLog entry 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-26 16:28:40 +10:00
Madhura Jayaratne
014e9bfe5b Merge branch 'QA_4_4' 
Conflicts:
	libraries/rte/rte_routines.lib.php
 2015-08-25 08:06:14 +10:00
Madhura Jayaratne
8923d579ba Fix #11421 Stored-proc / routine - broken parameter parsing 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-25 08:03:10 +10:00
Marc Delisle
68767c0ce6 Merge branch 'QA_4_4' 2015-08-23 15:16:13 -04:00
Marc Delisle
73261814fd ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-23 15:15:37 -04:00
Marc Delisle
c3702e8d93 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-22 07:41:11 -04:00
Marc Delisle
6a9d80eb89 Minimum supported PHP version is now 5.5 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-21 07:55:16 -04:00
Marc Delisle
8a20928516 4.4.14 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-20 08:51:15 -04:00
Marc Delisle
8085010441 4.4.15-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-20 08:45:53 -04:00
Madhura Jayaratne
769a8aa15f Fix #11414 Unclear export options / organization / hierarchy 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:06:38 +05:30
Madhura Jayaratne
f6e64a1ddc Merge branch 'QA_4_4' 
Conflicts:
	libraries/structure.lib.php
 2015-08-20 07:11:30 +05:30
Madhura Jayaratne
a6c1ef840b ChangeLog entry for #11410 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 06:51:07 +05:30
Marc Delisle
da05ed6316 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-19 08:32:45 -04:00
Marc Delisle
85dc44b557 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-19 08:29:51 -04:00
Marc Delisle
269dbd1867 Merge branch 'QA_4_4' 2015-08-17 10:27:04 -04:00
Marc Delisle
9b2b09e12e Fixes #11406 Missing quotes after calling "distinct values" 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-17 10:26:13 -04:00
Madhura Jayaratne
11d289b6b0 Merge branch 'QA_4_4' 2015-08-17 17:57:20 +05:30
Madhura Jayaratne
af75d2c825 Backport fix #11404 "Switch to copied table" doesn't work 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-17 17:52:24 +05:30
Marc Delisle
7496ef17eb ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-15 07:04:02 -04:00
Madhura Jayaratne
9cf71d9169 Fix #11394 Export/import Designer view 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-13 10:17:24 +05:30
Marc Delisle
2bfe605384 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-12 15:41:16 -04:00
Marc Delisle
7c63935d72 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-12 15:38:56 -04:00
Marc Delisle
a0dabdf52d Merge branch 'QA_4_4' 2015-08-12 15:26:58 -04:00
Marc Delisle
de7a8a06d0 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-12 15:24:30 -04:00
Michal Čihař
6aa5afce53 Do not try to set port 80 for https requests 
This is usually just a bug in our detection, so let's silently discard
port in this situation.

Fixes #10726

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-11 15:43:29 +02:00
Marc Delisle
429a20d0dc Merge branch 'QA_4_4' 2015-08-10 18:15:02 -04:00
Marc Delisle
12fa1e6481 Incorrect scalar type declaration (reported under PHP 7) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-10 18:14:38 -04:00
Marc Delisle
86136cbc49 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-10 09:15:57 -04:00
Marc Delisle
a6fedd3415 Merge branch 'QA_4_4' 2015-08-10 08:42:23 -04:00