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

424 Commits

Author SHA1 Message Date
Marc Delisle
d8b3f9a766 4.2.6-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-26 10:01:48 -04:00
Marc Delisle
aebfcfdc9f 4.2.5-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-20 08:47:51 -04:00
Marc Delisle
199982f0d0 4.2.4-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-08 18:35:23 -04:00
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
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
Marc Delisle
5a383c5be1 4.0.1-dev 2013-04-25 06:45:50 -04:00
Marc Delisle
b50aabb0e3 4.0.0-rc3 release 2013-04-24 09:02:39 -04:00
Marc Delisle
f105e8fcba 4.0.0-rc2 2013-04-15 16:32:21 -04:00
Michal Čihař
a7b1e909fd Merge pull request #241 from ayushchd/issue_https 
Fixed config tests and static variable issue
 2013-04-15 02:38:57 -07:00
Madhura Jayaratne
2007eb7ff7 Space after exclamation mark 2013-04-12 22:09:26 +05:30
ayushchd
563c1f86a4 Added type checking before setting a config value 
Previously, 'auto' and true were being considered as equal in the
checkOutputCompression method and 'null' and false were being
considered as equal in the isHttps method which is wrong. This commit
fixes that
 2013-04-12 21:10:36 +05:30