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

371 Commits

Author SHA1 Message Date
Michal Čihař
9180f71aa4 Simplify setting collation connection 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 15:46:34 +02:00
Marc Delisle
e98a9a7bdb Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-23 10:03:39 -04:00
Ann + J.M
9f186aae7d ini_set: Use string for param 2 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-21 20:19:17 +02:00
Marc Delisle
634307329e 4.2.3-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-20 08:28:42 -04:00
Ann + J.M
ec5292fb31 Config class: Drop dead initializations 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-19 22:06:52 +02:00
Marc Delisle
24720826cc Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-19 07:39:36 -04:00
Marc Delisle
6be855a6c6 4.2.2-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-12 08:03:14 -04:00
Michal Čihař
e984b2a609 The ini_set function takes string, not booleans or integers 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 11:57:10 +02:00
Michal Čihař
e47566f9fd Fix code docblocks 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 15:22:21 +02:00
Michal Čihař
e84e6c0305 Merge pull request #1165 from nijel/cleanup 
Various code cleanups
 2014-05-06 14:13:11 +02:00
Michal Čihař
d7a286c555 The return value here is inconsistent and not used 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 14:11:57 +02:00
Michal Čihař
fecfa65c82 This function does not return anything 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 14:11:46 +02:00
Michal Čihař
dbd3583d70 Simplify code for setting $is_https 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 13:14:48 +02:00
Michal Čihař
b20ba6a9c4 Remove commit status is always set 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 13:13:48 +02:00
Michal Čihař
fcf3341a5b No need to set start twice 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-06 13:13:10 +02:00
Marc Delisle
9e5602eb37 4.3.0-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-27 08:49:45 -04:00
Marc Delisle
fc2cd8f41b 4.2.1-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-27 08:46:30 -04:00
Marc Delisle
2f35b7f23e 4.2.0-beta1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-18 10:10:18 -04:00
Marc Delisle
cccddfe80b 4.2.0-alpha2 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-10 19:10:37 -04:00
Marc Delisle
4f4f6567db 4.2.0-alpha1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-09 14:18:17 -04:00
Marc Delisle
2cdcb4fdc4 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-30 09:04:10 -05:00
Atul Pratap Singh
9a9ab712bf Merge branch 'QA_4_1' 
Conflicts:
	libraries/Util.class.php
 2014-01-22 20:20:24 +05:30
Atul Pratap Singh
0cc9230bd3 fix headers already sent warnings when using session_start() 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-22 20:16:47 +05:30
Atul Pratap Singh
3a1031c262 Fix bug#4013 AJAX request waiting until version info is retrieved 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>

Conflicts:
	libraries/Util.class.php
 2014-01-21 16:57:35 +05:30
Atul Pratap Singh
2f978adba9 Fix bug#4013 AJAX request waiting until version info is retrieved 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-20 10:27:29 +05:30
Marc Delisle
a5b2314bf9 4.1.6-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-17 08:14:41 -05:00
Marc Delisle
a0ea21a481 Merge branch 'QA_4_1' 2014-01-14 12:45:37 -05:00
Marc Delisle
d36b3ac2ce bug #4226 Notice: Undefined index: pma_config_loading 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-14 12:44:39 -05:00
Marc Delisle
d9a9a9195d 4.1.5-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-07 10:08:05 -05:00
Marc Delisle
da292cbd06 4.1.4-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-31 05:44:36 -05:00
Marc Delisle
ccea1d456e 4.1.3-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-23 08:17:16 -05:00
Marc Delisle
60b063116a 4.1.2-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-17 05:52:54 -05:00
Marc Delisle
d31e966a43 4.1.1-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-08 06:25:11 -05:00
Marc Delisle
d67204c664 4.1.0-rc3 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-07 07:36:38 -05:00
Marc Delisle
35ab010a46 4.1.0-rc2 2013-11-30 08:12:31 -05:00
Marc Delisle
1c816616aa Fix coding style 2013-11-26 07:34:59 -05:00
Marc Delisle
54527b9634 4.2.0-dev starts 2013-11-23 06:32:35 -05:00
Marc Delisle
96417c4404 4.1.0-rc1 2013-11-23 06:29:04 -05:00
J.M
419d89f0cb Detect Internet Explorer 11 User Agent 2013-11-21 20:40:23 +01:00
Michal Čihař
b06e2e06ee Always define pma_config_loading (issue #760) 2013-11-20 10:28:32 +01:00
Marc Delisle
76a57d7611 Fix coding style 2013-11-19 07:22:26 -05:00
Marc Delisle
1955d5e8dc Merge branch 'QA_4_0' 2013-11-13 07:41:47 -05:00
Rob Spekschoor
c7f3d8368d Support A10 Networks load balancer 2013-11-13 07:35:04 -05:00
Marc Delisle
2f1176d27c Fix merge conflicts 2013-11-10 08:14:19 -05:00
Hugues Peccatte
2fc0ca777d Update PHPDoc. 2013-11-10 10:28:05 +01:00
Madhura Jayaratne
f4704c6c46 Coding style fixes 2013-11-10 07:22:59 +05:30
Marc Delisle
869c1847c2 4.1.0-beta2 2013-11-04 14:58:04 -05:00
Piotr Przybylski
a67e41a646 Refactored ConfigFile class so that it is no longer a singleton 
Fixes bug #4123 Double config including
 2013-11-03 12:54:20 +01:00
Marc Delisle
43b8d377d7 4.0.10-dev 2013-10-31 12:17:31 -04:00
Marc Delisle
8fc926dd64 Version 4.1 uses isHttps() 2013-10-27 06:47:35 -04:00