Commit Graph

102927 Commits

Author SHA1 Message Date
Michal Čihař
8dedcc1a17 Use secure RNG if available
Recent browsers come with better RNG, so let's use it for generating
password instead of Math.random if available.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-25 12:43:03 +01:00
Michal Čihař
671d618304 Merge branch 'MAINT_4_5_4' into MAINT_4_5_4-security 2016-01-25 12:23:23 +01:00
Michal Čihař
316792bf4a Move databse check to correct location
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-25 12:18:37 +01:00
Michal Čihař
da62e19833 Correctly handle what parameter on export
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-22 15:27:15 +01:00
Michal Čihař
1431625d68 Fixes possible error when query is empty/not analyzed
Fixes #11873

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-19 11:45:52 +01:00
Michal Čihař
a5affed07a Validate database before starting designer
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-19 11:38:50 +01:00
Michal Čihař
5359d9a968 Check for parameter before using it
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-19 11:26:59 +01:00
Michal Čihař
a6ae24741e Validate parameters before use
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-19 11:23:36 +01:00
Michal Čihař
897a844581 Check for parameter before using it
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-19 11:23:36 +01:00
Michal Čihař
1523c4b364 Gracefully handle calling sql.php without SQL query
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-19 11:23:36 +01:00
Michal Čihař
0490d20408 Check for parameter before using it
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-19 10:48:32 +01:00
Michal Čihař
dcdeee28eb Gracefully handle errors in regex based javascript search
User can write any invalid regex and we should handle this gracefully.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-19 10:44:03 +01:00
Michal Čihař
59036e1562 Simplify test to avoid need fo multiline regexp
Cherry picked from master to avoid test suite failures on PHP 7.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-19 08:59:14 +01:00
Madhura Jayaratne
edffb52884 Fix XSS in zoom search
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-01-19 10:22:38 +11:00
Madhura Jayaratne
019c4f25d5 Fix XSS in normalization.php
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-01-19 10:22:34 +11:00
Madhura Jayaratne
5aee503564 Fix path disclosure, items 1.4.x, 1.5 and 1.6
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-01-19 10:22:30 +11:00
Madhura Jayaratne
75a5582401 Fix XSS in DB_search.php
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-01-19 10:22:26 +11:00
Erwin Bronkhorst
dbb267308d Translated using Weblate (Dutch)
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
2016-01-15 18:35:14 +01:00
Atul Pratap Singh
61e5d5f47b Fix #11860 : TypeError: e.handler.apply is not a function
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2016-01-15 10:04:23 +05:30
Weblate
609be25b5e Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-15 04:30:19 +01:00
Deven Bansod
d98f57bc5b Fix a typo in condition check
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2016-01-15 14:29:46 +05:30
kenan akgün
93e1461e33 Translated using Weblate (Turkish)
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
2016-01-15 04:30:18 +01:00
Madhura Jayaratne
516082c3c2 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2016-01-15 12:40:44 +11:00
Madhura Jayaratne
ff967d99b8 Fix #11814 SQL comment and variable stripped from bookmark on save
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-01-15 12:40:30 +11:00
Weblate
61c7c3018a Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-15 00:45:54 +01:00
Stefano Martinelli
4d955255da Translated using Weblate (Italian)
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
2016-01-15 00:45:52 +01:00
Madhura Jayaratne
4e05d3981a Fix #11854 Undefined property: stdClass::$releases at version check when disabled in config
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-01-15 10:45:31 +11:00
Παναγιώτης Παπάζογλου
23d4eb9078 Translated using Weblate (Greek)
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
2016-01-14 16:02:19 +01:00
Marc Delisle
0ea7d4a0be Translated using Weblate (French)
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
2016-01-14 13:00:01 +01:00
Kristjan Räts
f49536b798 Translated using Weblate (Estonian)
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
2016-01-14 12:53:27 +01:00
Michal Čihař
c63db9eed6 Update po files
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-14 09:17:35 +01:00
Michal Čihař
8ab8b55103 Changelog entry for #11752
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-01-14 09:14:28 +01:00
Weblate
78278c139e Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-14 08:58:57 +01:00
Michal Čihař
42c8d35cf0 Translated using Weblate (Vietnamese)
Currently translated at 85.9% (2759 of 3210 strings)

[CI skip]
2016-01-14 08:58:56 +01:00
Marc Delisle
a4883280a0 Translated using Weblate (French)
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
2016-01-14 08:58:55 +01:00
Erwin Bronkhorst
38c4dc72f2 Translated using Weblate (Dutch)
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
2016-01-14 08:58:54 +01:00
Michal Čihař
a478437e0e Merge pull request #11832 from devenbansod/fix_11752
Fix #11752
2016-01-14 08:58:51 +01:00
Thành Phạm
d7b3529b99 Translated using Weblate (Vietnamese)
Currently translated at 2.3% (77 of 3210 strings)

[CI skip]
2016-01-13 08:03:32 +01:00
Weblate
6b781d7fd7 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-12 14:04:30 +01:00
Xosé Calvo
5b577198bb Translated using Weblate (Galician)
Currently translated at 85.0% (2730 of 3210 strings)

[CI skip]
2016-01-12 14:04:28 +01:00
Marc Delisle
814ea29854 Translated using Weblate (French)
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
2016-01-12 14:04:28 +01:00
Kristjan Räts
5613c32029 Translated using Weblate (Estonian)
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
2016-01-12 14:04:28 +01:00
Atul Pratap Singh
0f23dd51d8 Add localStorage availability checks, update the error message
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2016-01-12 18:30:04 +05:30
Madhura Jayaratne
c8eeccf87b Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2016-01-11 17:50:29 +11:00
Madhura Jayaratne
7d261f45fe Fix #11840 Index comments not working properly
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-01-11 17:49:17 +11:00
Weblate
8b561a00bf Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-10 22:43:14 +01:00
Martin Lacina
355e36d55d Translated using Weblate (Slovak)
Currently translated at 83.9% (2694 of 3210 strings)

[CI skip]
2016-01-10 22:43:13 +01:00
Madhura Jayaratne
5a54fb1ee1 Fix #11772 Table pagination does nothing when session expired
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2016-01-11 08:42:55 +11:00
Weblate
658eedb405 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-10 12:37:33 +01:00
Martin Lacina
04cf33fcfe Translated using Weblate (Slovak)
Currently translated at 83.8% (2693 of 3210 strings)

[CI skip]
2016-01-10 12:37:32 +01:00