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
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
ayushchd
be0c110591 Merged checkIsHttps() into isHttps() 2013-04-12 20:22:34 +05:30
Michal Čihař
6026442741 Merge commit '1a5793ca0a35ca504e0df45e7db93a3fee127988' 2013-04-11 08:41:28 +02:00
Kasun Chathuranga
57e751ff96 Add comments describing the changes 2013-04-11 06:50:16 +05:30
Kasun Chathuranga
2876b7014e Fix bug #3860 Displayed git revision info is not set 2013-04-10 23:59:33 +05:30
Madhura Jayaratne
db10ee2a9d Fix docs 2013-04-10 13:23:25 +05:30
J.M
0d88fe08d6 Detect Chrome browser version 2013-04-08 14:51:19 +02:00
J.M
b49cc41940 Detect Internet Explorer 10 and 11 2013-04-08 13:19:39 +02:00
J.M
1de35ef88b Detect Firefox browser 2013-04-08 13:08:58 +02:00
ayushchd
79c607df95 Fixed webOS detection for Darwin 2013-04-05 14:25:29 +05:30
Marc Delisle
434d4185d4 4.1-dev 2013-04-02 12:24:55 -04:00
Marc Delisle
b223446b19 4.0.0-rc1 2013-04-02 12:19:49 -04:00
Marc Delisle
786e569b4f 4.0.0-beta3 2013-03-27 07:42:21 -04:00
Marc Delisle
6ec9b8336b Fix merge conflicts 2013-03-26 07:49:12 -04:00
Marc Delisle
7d2d883966 Fix merge conflicts 2013-03-25 19:57:27 -04:00
Marc Delisle
9158580da5 4.0.0-beta2 2013-03-17 06:59:08 -04:00
J.M
eb7b59b609 Merge branch 'QA_3_5' 2013-02-12 19:34:36 +01:00
Marc Delisle
5aad30f760 Correct detection of the Chrome browser 2013-02-12 12:53:58 -05:00
Marc Delisle
ea2f0d01e2 4.0.0-beta1 2013-02-09 06:44:05 -05:00
Michal Čihař
57a97a7057 Use up to date links to bugs and feature requests 2013-02-04 11:52:47 +01:00
Marc Delisle
db77bc6ad2 4.0.0-alpha2 2013-01-28 07:59:35 -05:00
Marc Delisle
24b5294d85 Set 4.0.0-alpha1 for master; when we reach beta, the MAINT_4_0_0 and QA_4_0 branches will start 2013-01-21 12:23:47 -05:00
Marc Delisle
1fe30ed7db 3.5.7-dev 2013-01-20 13:26:21 -05:00
Marc Delisle
ebb89e8521 Fix merge conflicts 2013-01-19 11:29:45 -05:00
Marc Delisle
752083f4d8 bug #3776 [cookies] Login without auth on second server 2013-01-19 11:25:15 -05:00
Dieter Adriaenssens
86dfd2506c wrap long lines 2013-01-15 14:42:07 +01:00
Dieter Adriaenssens
c709dc9191 improve coding style : correct syntax with if-then-else statements 2013-01-15 14:42:07 +01:00
Michal Čihař
4d3fee8173 Support for parsing git packs (bug #3591143) 2012-12-17 11:47:54 +01:00
Michal Čihař
a71ffb2be1 Correctly parse packed refs (bug #3591143) 2012-12-17 10:39:54 +01:00
Michal Čihař
dfe3691909 Use single check for being git version 2012-12-17 10:09:56 +01:00
Marc Delisle
3bca12a607 3.5.6-dev 2012-12-13 07:53:12 -05:00
Rouslan Placella
e0f9fd9902 Submit forms that reload the page via GET to avoid browser notices 
The resubmission of forms should be harmless in these cases anyway
 2012-12-02 20:12:55 +00:00
J.M
51421dbdf7 Display Git revision: Allow branch names with slashes 2012-11-12 12:13:04 +01:00
Marc Delisle
aac68e0a25 3.5.5-dev 2012-11-08 11:38:12 -05:00
Rouslan Placella
9b6e2226c0 Force full page reload on font size change 2012-11-05 21:03:25 +00:00
Rouslan Placella
1b69d0bf55 Drop the target attrbute from links and forms 2012-10-30 20:10:20 +00:00
Rouslan Placella
9e3a9ee52f Dropped main.php 2012-10-30 20:10:20 +00:00
Rouslan Placella
c24010362f Dropped references to index.php 2012-10-30 20:07:02 +00:00
Madhura Jayaratne
1a177f10ae Coding style: Fix some methods names 2012-10-28 17:08:27 +05:30
Michal Čihař
0668b6d8bc Use same logic as master for testsuite 2012-10-18 10:39:35 +02:00
Michal Čihař
048d2de2ba Ooops the condition was reversed 2012-10-18 10:30:06 +02:00
Michal Čihař
473e3bf2e9 Do not manipulate cookie headers in testsuite 2012-10-18 10:23:06 +02:00
Marc Delisle
2caf953171 3.5.4-dev 2012-09-24 07:17:20 -04:00
Michal Čihař
3e050ff9d9 Various docblocks improvements 2012-09-19 15:05:26 +02:00
Madhura Jayaratne
dec582c93c Do not prefix protected methods with underscore 2012-09-02 19:25:00 +05:30
Madhura Jayaratne
c4a5af9182 Merge branch 'QA_3_5' 
Conflicts:
	js/tbl_select.js
	po/da.po
	tbl_select.php
 2012-08-06 22:04:02 +05:30
J.M
53f96bd760 bug #3546277 [core] Call to undefined function __() when config file has wrong permissions 2012-08-06 09:20:07 +02:00
Marc Delisle
ef15437ac4 3.5.3-dev 2012-06-26 07:33:55 -04:00
Michal Čihař
f010626290 Use require_once because of testsuite 2012-06-25 11:10:40 +02:00
Madhura Jayaratne
e1a4f227fd Fix function name: PMA_get_real_size -> PMA_getRealSize 2012-06-01 21:58:59 +05:30
Madhura Jayaratne
3849390b8b Fix function name: PMA_array_merge_recursive -> PMA_arrayMergeRecursive 2012-06-01 21:57:07 +05:30
Madhura Jayaratne
381ae7b85a Fix function name: PMA_array_read -> PMA_arrayRead 2012-06-01 21:46:31 +05:30
Madhura Jayaratne
0a595f1f54 Fix function name: PMA_array_write -> PMA_arrayWrite 2012-06-01 21:44:33 +05:30
Michal Čihař
bd8d3e0134 Remove never implemented save method and test for it 2012-05-14 15:40:20 +02:00
Michal Čihař
c5dda33bde Do not use caching when running testsuite 2012-05-14 15:30:24 +02:00
Michal Čihař
fdb2b41f25 Handle validity at single place 2012-05-11 14:40:39 +02:00
Michal Čihař
1ce390b346 Better name for a variable 2012-05-11 14:39:34 +02:00
Michal Čihař
5961c53cb2 Improve error message on writable config 
- use gettext only if available (we're quite early here)
- use PMA_fatalError instead of die
 2012-05-09 11:53:07 +02:00
Michal Čihař
48fde0ad49 Not used method (warning in main is used instead) 2012-05-09 11:49:57 +02:00
Madhura Jayaratne
e2e2bc47e6 Coding style improvements. Mostly wrapping long lines 2012-05-01 16:20:42 +05:30
Jo Michael
16bcdb108f Try to fix rare case that commit data can't be loaded from anywhere 2012-04-29 01:02:26 +02:00
Marc Delisle
060a16f448 bug #3521313 [core] Call to undefined function __() 
(backport part of fix from 6a2afedda0)
 2012-04-27 16:24:29 -04:00
Michal Čihař
c3afb50573 Add docs to some files and methods 2012-04-27 13:41:44 +02:00
Michal Čihař
0e26eeb56a Move comments out of if statement 2012-04-27 11:40:11 +02:00
Michal Čihař
397b6fd00e Cleanup spacing after @return 2012-04-27 11:33:26 +02:00
Michal Čihař
f1cf8d440a Emulate cookies for tests 2012-04-27 10:11:04 +02:00
Michal Čihař
b7bc51d058 Skip setcookie calls while running testsuite 2012-04-27 09:58:21 +02:00
Madhura Jayaratne
d6e05d74b5 Various coding style fixes 2012-04-25 23:12:09 +05:30
Madhura Jayaratne
50e6f3b387 Coding style improvements (ControlSignature) 2012-04-25 23:02:37 +05:30
Michal Čihař
d24ae82525 gd_info is present since PHP 4.3, so no need to provide workarouds when it does not exist 2012-04-25 15:55:47 +02:00
Marc Delisle
abf645b0a3 3.5.2-dev 2012-04-24 07:33:31 -04:00
Marc Delisle
404d826e4f 3.5.1-rc1 2012-04-24 07:29:06 -04:00
Madhura Jayaratne
4b8d52d937 Fix CheckStyle warnings, Type:CloseBracketNewLine (Closing parenthesis of a multi-line IF statement must be on a new line) 2012-04-22 21:28:41 +05:30
Jo Michael
e689a10079 Try to load commit details from Github if local Git object only exists packed (we won't bother unpacking it) 2012-04-21 16:00:48 +02:00
Jo Michael
6888be9ec3 Cache commit data once read 2012-04-15 01:21:44 +02:00
Jo Michael
d6c28d3923 Show Git revision asynchronously 2012-04-15 01:15:30 +02:00
Jo Michael
0a52239900 Add support for repos that are not on any branch 2012-04-15 00:22:17 +02:00
Jo Michael
cd3b41fd25 Suppress error messages when trying to read non-existant .git/refs/heads/master file 2012-04-14 23:54:53 +02:00
Jo Michael
06001a08e8 Use separate library file for displaying Git revision, minor fixes 2012-04-14 16:12:05 +02:00
Jo Michael
7ce27bb3d5 Show Git revision details in right main.php column (hover SHA1 to read commit message) 2012-04-14 00:02:06 +02:00
Jo Michael
6a2afedda0 Use PMA_fatalError in PMA_Config::checkConfigSource, allow auto extraction of localized error message 2012-04-11 19:44:38 +02:00
Jo Michael
359a36ee6a Fix PMA_Config::checkConfigSource, extend is_readable check for bug #3059806 2012-04-11 16:11:09 +02:00
Jo Michael
c79f6dfef2 - bug #3059806 Supporting running from CIFS/Samba shares 2012-04-11 01:04:13 +02:00
Rouslan Placella
f15d0fd1d8 Removed most <noscript> tags and made JS mandatory to login 2012-04-05 22:58:57 +01:00
Marc Delisle
6cf73f6bca 3.5.1-dev 2012-03-26 11:24:28 -04:00
Madhura Jayaratne
d5d3d2bba4 Use 'void' if nothing is returned 2012-03-18 10:04:39 +05:30
Marc Delisle
3db816c6ec 3.5.0-rc2 release 2012-03-17 11:12:31 -04:00
Madhura Jayaratne
ed219b5446 Coding style improvements 2012-03-17 01:13:00 +05:30
Marc Delisle
24e24b8c4e 3.5.0-rc1 release 2012-02-20 12:50:04 -05:00
Marc Delisle
0352af889e Switch to major version 4 which will require JavaScript-enabled browsers 2012-02-13 06:25:46 -05:00
Michal Čihař
ab888f63dc Merge remote-tracking branch 'origin/QA_3_5' 2012-02-08 16:10:37 +01:00
Michal Čihař
b0f4a09333 Use already detected scheme 2012-02-08 16:10:10 +01:00
Michal Čihař
431cf327fd Merge remote-tracking branch 'origin/QA_3_5' 2012-02-08 11:58:56 +01:00
Michal Čihař
e33c665dc6 bug #3423717 [core] Improved detection of SSL connection 2012-02-08 11:58:05 +01:00
Marc Delisle
693b0a59aa Put back 3.6.0-dev version info 2012-01-28 04:50:14 -05:00
Marc Delisle
52f60156cb Put back correct version in this branch (was lost during commit f196b4804d) 2012-01-28 04:06:37 -05:00
Marc Delisle
519024e05c Starting 3.6.0 2012-01-25 05:19:15 -05:00
Marc Delisle
8d5434fa98 going to 3.5.0-beta1-dev 2012-01-06 07:04:23 -05:00
Marc Delisle
1a98c838e6 3.5.0-alpha1 2012-01-06 05:53:16 -05:00
Madhura Jayaratne
35b18e57a2 Coding style improvements - Multiline assignments 2011-12-07 23:28:50 +05:30
Dieter Adriaenssens
b4b9b34ec5 clarify function descriptions 2011-11-29 21:40:42 +01:00