Commit Graph

398 Commits

Author SHA1 Message Date
Madhura Jayaratne
45a971a561 Merge branch 'QA_4_3'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-20 21:48:50 +05:30
Madhura Jayaratne
93366c8c24 Merge branch 'QA_4_2' into QA_4_3
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-20 21:44:53 +05:30
Marc Delisle
3443cc1ca4 4.2.13-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-20 10:35:46 -05:00
Marc Delisle
5ac08bde49 4.3.0-beta1
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-20 08:18:11 -05:00
Madhura Jayaratne
2ffdbf2d7d bug #4597 [security] XSS through pma_fontsize cookie
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-20 06:40:39 +05:30
Marc Delisle
3d038ced19 4.3.0-alpha1
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-14 11:23:46 -05:00
Marc Delisle
88432424e8 4.4.0-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-14 10:58:01 -05:00
Marc Delisle
036549a8de 4.2.12-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-31 12:29:34 -04:00
Hugues Peccatte
80ced5fe8f Fix PHPCS issues.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-30 18:37:49 +01:00
Hugues Peccatte
80869ba0ec Merge branch 'master' into stringFunctions_useStandardFunctions_master 2014-10-25 17:08:48 +02:00
Hugues Peccatte
a4546feda1 Fix #4559: don't use multibytes to read hash.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-20 19:24:00 +02:00
Marc Delisle
4fb60125fb 4.2.11-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-11 07:49:52 -04:00
Hugues Peccatte
f9cd1a1a22 Replace mb functions by standard string functions.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-05 11:31:50 +02:00
Hugues Peccatte
49ababac08 Replace mb functions by standard string functions.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-04 10:09:06 +02:00
Hugues Peccatte
e20510de39 Replace mb functions by standard string functions.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-03 23:08:43 +02:00
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls.
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-28 20:53:01 +02:00
Marc Delisle
1347aa60e3 Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-21 09:16:50 -04:00
Marc Delisle
ea2dd3c171 bug #4361 Can't change font size (when config.inc.php not present)
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-21 09:13:18 -04:00
Marc Delisle
ab9036fa60 4.2.10-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-09-20 06:48:10 -04:00
Hugues Peccatte
5985894160 Fix typos.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-07 00:31:45 +02:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-06 10:44:03 +02:00
Marc Delisle
b0d3056de9 4.2.9-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-31 10:49:12 -04:00
Marc Delisle
2d8860f9a9 4.2.8-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-31 06:55:23 -04:00
Marc Delisle
be0d0f642f 4.2.7-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-07-17 18:08:17 -04:00
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