Commit Graph

358 Commits

Author SHA1 Message Date
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
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
Marc Delisle
68e9b7613f Merge branch 'QA_4_0' 2013-10-27 06:45:36 -04:00
Marc Delisle
70e3fc7415 bug #4120 SSL redirects to port 80 2013-10-27 06:44:44 -04:00
Marc Delisle
d8f7c1079e Merge branch 'QA_4_0' 2013-10-26 07:47:49 -04:00
Marc Delisle
2c485d7f02 - The SSLPort setting did not exist, no reason to try it
- The tests for this function always force port 443, no reason to
  use a port that would be in the original URL
2013-10-26 07:42:32 -04:00
Marc Delisle
d2b697ec02 Fix typo 2013-10-17 06:32:41 -04:00
Marc Delisle
58d2b68afe 4.1.0-beta1 2013-10-16 12:16:44 -04:00
Marc Delisle
850cfad723 4.1.0-alpha2 2013-10-04 05:36:44 -04:00
Michal Čihař
ad9c88b1a6 Do not try to handle collations with Drizzle 2013-10-03 16:20:38 +02:00
Marc Delisle
385e3274be 4.0.9-dev 2013-10-02 06:14:02 -04:00
Marc Delisle
c1f0afecdf 4.1.0-alpha1 2013-10-01 05:39:36 -04:00
Marc Delisle
5b023232db 4.0.8-dev 2013-09-18 07:57:12 -04:00
Marc Delisle
24dd2da1a6 Merge branch 'QA_4_0' 2013-08-30 08:27:00 -04:00
Marc Delisle
4a609d5b2e bug Handle the situation where PHP_SELF is not set 2013-08-30 08:25:48 -04:00