Michal Čihař
8a7cf503a3
Merge branch 'QA_2_11' into QA_3_0
2012-04-11 11:06:59 +02:00
Michal Čihař
fa27f371f4
Merge branch 'QA_2_10' into QA_2_11
2012-04-11 11:06:45 +02:00
Michal Čihař
b09cad4342
Merge branch 'QA_2_9' into QA_2_10
2012-04-11 11:06:39 +02:00
Michal Čihař
d972e71e0a
Merge remote-tracking branches 'origin/MAINT_3_0_0' and 'origin/MAINT_3_0_1' into QA_3_0
2012-04-11 11:05:45 +02:00
Michal Čihař
62306d3e6a
Merge remote-tracking branches 'origin/MAINT_2_9_0', 'origin/MAINT_2_9_1' and 'origin/MAINT_2_9_2' into QA_2_9
2012-04-11 11:05:45 +02:00
Michal Čihař
828d01d203
Merge remote-tracking branches 'origin/MAINT_2_11_0', 'origin/MAINT_2_11_1', 'origin/MAINT_2_11_10', 'origin/MAINT_2_11_11', 'origin/MAINT_2_11_2', 'origin/MAINT_2_11_3', 'origin/MAINT_2_11_4', 'origin/MAINT_2_11_5', 'origin/MAINT_2_11_6', 'origin/MAINT_2_11_7', 'origin/MAINT_2_11_8' and 'origin/MAINT_2_11_9' into QA_2_11
2012-04-11 11:05:44 +02:00
Michal Čihař
977ec6f8e2
Merge remote-tracking branches 'origin/MAINT_2_10_0', 'origin/MAINT_2_10_2' and 'origin/MAINT_2_10_3' into QA_2_10
2012-04-11 11:05:43 +02:00
Michal Čihař
cd147951af
Merge branch 'MAINT_2_11_11' into QA_2_11
2011-02-14 10:44:03 +01:00
Marc Delisle
3b6d78aef0
Reference to minor security fixes
2011-02-12 13:39:26 -05:00
Marc Delisle
92ba791007
2.11.11.3 release
2011-02-11 12:46:09 -05:00
Marc Delisle
715ba42d94
2.11.11.3 ChangeLog
2011-02-11 12:44:05 -05:00
Marc Delisle
cc02c4a58b
2.11.11.3 ChangeLog
2011-02-11 12:37:55 -05:00
Michal Čihař
fffee916bb
Merge branch 'MAINT_2_11_11' into QA_2_11
2011-02-11 14:54:39 +01:00
Michal Čihař
dd60d67d23
Force bookmark ID to be integer
2011-02-11 14:54:21 +01:00
Michal Čihař
6488ee49ab
Merge branch 'MAINT_2_11_11' into QA_2_11
2011-02-11 14:23:09 +01:00
Michal Čihař
2fa4c8d97a
Avoid using all users query as default when browsing.
2011-02-11 14:22:59 +01:00
Michal Čihař
79a4e4b7fe
Merge remote branch 'origin/MAINT_2_11_11' into QA_2_11
2011-02-08 16:19:54 +01:00
Marc Delisle
d620aaf102
ChangeLog for 2.11.11.2
2011-02-08 08:13:01 -05:00
Herman van Rink
f0e8849034
PMASA-2011-1 fixes
2011-02-08 08:11:37 -05:00
Marc Delisle
448940b37b
2.11.11.2 release
2011-02-08 08:07:22 -05:00
Herman van Rink
87fad58965
PMASA-2011-1 fixes
2011-02-08 07:57:34 -05:00
Michal Čihař
373a6626ad
Do not load common with PMA_MINIMUM_COMMON
...
Defining PMA_MINIMUM_COMMON skips authentication, what should not be
done for this file.
2011-01-06 09:57:13 +01:00
Michal Čihař
60bdae6403
Add .gitignore from master.
2011-01-06 09:53:11 +01:00
Michal Čihař
3f9fd25940
Merge remote branch 'origin/MAINT_2_11_11' into QA_2_11
2011-01-06 09:50:50 +01:00
Michal Čihař
b01a58118f
Remove error.php
...
Redirecting to other script introduces possibility of inject custom
messages to it. Though there is no clear security issue in this, it
might confuse users and mistake them to go to external site as it allows
to include links.
Conflicts:
error.php
libraries/core.lib.php
2011-01-06 09:39:23 +01:00
Marc Delisle
61d9e56158
2.11.11.1 release date and PMASA ref
2010-11-29 12:11:59 -05:00
Marc Delisle
a6e79391b9
2.11.11.1 release
2010-11-26 09:17:30 -05:00
Marc Delisle
68213538d7
fix merge conflicts
2010-11-26 08:55:40 -05:00
Herman van Rink
3756112c7f
bug #3115519 : fixed XSS on search
2010-11-26 08:54:13 -05:00
Marc Delisle
21f624a265
ChangeLog for XSS search
2010-11-26 08:51:46 -05:00
Herman van Rink
e1f4901ffc
bug #3115519 : fixed XSS on search
2010-11-26 08:49:56 -05:00
Michal Čihař
80766a95ca
Polish update ( #3062617 ).
2010-09-16 16:45:34 +02:00
Michal Čihař
8b2f1bc55d
Merge branch 'MAINT_2_11_11' into QA_2_11
2010-09-08 10:11:00 +02:00
Marc Delisle
b073a5a10f
2.11.11 release
2010-09-07 12:19:49 -04:00
Marc Delisle
e6aeaf1925
2.11.11 release
2010-09-07 12:16:12 -04:00
Michal Čihař
134cbbd490
Update year.
2010-09-01 11:45:44 +02:00
Michal Čihař
5341872a91
Merge branch 'MAINT_2_11_11' into QA_2_11
2010-09-01 11:45:19 +02:00
Marc Delisle
510a5c0b69
2.11.12-dev
2010-08-31 12:18:02 -04:00
Marc Delisle
0e4369a8d2
2.11.11-rc1
2010-08-31 12:16:00 -04:00
Michal Čihař
20c8780437
bug #3054458 [core] Fixed displaying number of rows.
2010-08-30 14:15:23 +02:00
Michal Čihař
c1865ca7b8
Merge branch 'MAINT_2_11_10' into QA_2_11
...
Conflicts:
ChangeLog
Documentation.html
README
libraries/Config.class.php
translators.html
2010-08-20 13:32:34 +02:00
Michal Čihař
b1cb5590ee
Set version to 2.11.10.1.
2010-08-20 13:26:54 +02:00
Michal Čihař
437e00ef2e
Changelog.
2010-08-20 13:24:46 +02:00
Michal Čihař
a88dbaf305
Escape error message coming from MySQL to avoid XSS on bad parameters.
2010-08-20 11:36:05 +02:00
Michal Čihař
e7d10a6d53
Avoid information disclossure on error.
2010-08-20 11:35:56 +02:00
Michal Čihař
2051a861f8
Fix possible XSS on IIS redirect page.
2010-08-20 11:19:28 +02:00
Herman van Rink
0fd0512c9b
Fix XSS on error with very long query.
2010-08-20 10:42:53 +02:00
Michal Čihař
4a50055d52
Fix XSS with $cfg['SQP']['fmtType'] = 'text'.
2010-08-20 10:39:26 +02:00
Michal Čihař
30c83acddb
Properly escape key name when generating config file.
2010-08-19 09:55:25 +02:00
Michal Čihař
a7c004d8d4
Fix XSS on hostname.
2010-08-18 12:27:37 +02:00
