gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,924 Commits 12 Branches 481 Tags 2.4 GiB
15bbe72ca2
Commit Graph

330 Commits

Author SHA1 Message Date
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
Marc Delisle
ceb09a82fa 4.0.7-dev 2013-08-27 12:38:57 -04:00
Michal Čihař
bb1df87584 Gettext is already loaded at this point 2013-08-07 15:12:57 +02:00
Michal Čihař
a89bb5dd92 Move assignment out of if 2013-08-07 15:12:09 +02:00
Michal Čihař
aa92d22931 Allow config loader to recover from fatal errors 
The config loader now registers shutdown function which can print out
error message in case of loading config file fails.

Fixes bug #3980
 2013-08-07 15:07:29 +02:00
Michal Čihař
0a3d1d5be8 Better names for URL generating functions 2013-08-07 10:58:17 +02:00
Michal Čihař
160457e25f Fix session path for javascript loader 2013-08-07 09:20:44 +02:00
Marc Delisle
e73bfee67c 4.0.6-dev 2013-07-28 09:34:39 -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
Marc Delisle
45d3f4326c Fix merge conflicts 2013-07-17 15:05:23 -04:00
Marc Delisle
e0c1ed02a1 4.0.4.1 release 2013-06-30 06:58:32 -04:00
Madhura Jayaratne
b34235328a Check whether file exists before reading 2013-06-19 14:00:49 +05:30
Marc Delisle
64c2b9a59c 4.0.4 release 2013-06-17 12:25:41 -04:00
Marc Delisle
18b7f4e4d0 4.0.5-dev 2013-06-13 13:41:49 -04:00
Marc Delisle
5778f641b3 4.0.4-rc1 2013-06-13 13:40:16 -04:00
Marc Delisle
961515d50b 4.0.4-dev 2013-05-31 12:30:06 -04:00
Marc Delisle
33507c3314 Merge branch 'QA_4_0' 2013-05-25 09:12:04 -04:00
Marc Delisle
0a11401219 Fix typo 2013-05-25 09:11:04 -04:00
Marc Delisle
e0c3c1d977 4.0.3-dev 2013-05-21 08:30:59 -04:00
Marc Delisle
a8e5a455f4 $HTTP_USER_AGENT no longer exists 2013-05-16 13:16:19 -04:00
Marc Delisle
35a423efdf Merge branch 'QA_4_0' 2013-05-16 13:17:06 -04:00
Marc Delisle
9fa18175fd 4.0.2-dev 2013-05-10 08:02:02 -04:00
Michal Čihař
c39886257d Use single variable for browser version 2013-05-02 15:29:41 +02:00
Michal Čihař
fb41888548 Use correct variable 2013-05-02 15:29:03 +02:00
Michal Čihař
446d06f275 Check for Mozilla browser just once 2013-05-02 15:23:13 +02:00
Michal Čihař
384f2cd79e Merge remote-tracking branch 'origin/QA_4_0' 
Conflicts:
	js/pmd/history.js
	libraries/Config.class.php
 2013-05-02 10:13:18 +02:00
J.M
d77826727a Fix notice in libraries/Config.class.php: Undefined index: fontsize 2013-05-01 20:55:12 +02:00
J.M
956cc18d39 bug #3899 Git commit links to Github missing, the Github API v3 is now enforcing User-Agent headers 2013-04-30 23:47:24 +02:00