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

106263 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deven Bansod
deeb3e62df Avoid use of improper parameters in escapeString 
Fix #12735

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-25 17:56:31 +05:30
Weblate
6497f5ab77 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-25 07:16:53 +01:00
ratajs
2c4ffca9e2 Translated using Weblate (Czech) 
Currently translated at 93.2% (3006 of 3222 strings)

[CI skip]
 2016-11-25 07:16:51 +01:00
Isaac Bennetch
b1136b88b1 Prepare for 4.6.6-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-11-25 01:16:37 -05:00
Isaac Bennetch
253894e299 Resolve merge conflicts with ChangeLog 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-11-24 11:03:58 -05:00
Isaac Bennetch
5daee71272 4.6.5 release and ChangeLog 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-11-24 11:02:33 -05:00
Carlos Ferreira
637d55bb44 Translated using Weblate (French) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-11-24 14:18:05 +01:00
Marc Delisle
1a27a8eeff Translated using Weblate (French) 
Currently translated at 99.6% (3210 of 3222 strings)

[CI skip]
 2016-11-24 14:11:17 +01:00
Marc Delisle
80087a0215 Translated using Weblate (French) 
Currently translated at 99.5% (3207 of 3222 strings)

[CI skip]
 2016-11-21 15:44:44 +01:00
Weblate
5008241941 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-18 13:56:35 +01:00
Michal Čihař
e75e67cf34 Translated using Weblate (Swedish) 
Currently translated at 97.6% (3147 of 3222 strings)

[CI skip]
 2016-11-18 13:56:35 +01:00
Deven Bansod
2e3416b2bf Remove unnecessary debug statements 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-18 18:24:19 +05:30
Weblate
002240af4e Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-18 11:01:27 +01:00
Nebojsa Tausanov
32755b40ce Translated using Weblate (Macedonian) 
Currently translated at 17.3% (559 of 3222 strings)

[CI skip]
 2016-11-18 11:01:26 +01:00
Liška
aca19c4396 Translated using Weblate (Czech) 
Currently translated at 93.2% (3003 of 3222 strings)

[CI skip]
 2016-11-18 11:01:25 +01:00
Boussaid Mustafa
a747af078d Translated using Weblate (Arabic) 
Currently translated at 34.0% (1096 of 3222 strings)

[CI skip]
 2016-11-18 11:01:24 +01:00
Michal Čihař
53f07e7179 Remove protection against < in HTTP Authorization header 
It really doesn't make sense here as the username can potentionally
contain < anyway and we need to deal with it later (and we do).

Fixes #12710

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-18 11:00:11 +01:00
Michal Čihař
cc961340d9 Remove check for < in Accept-Language header 
It is no longer needed since we do match language against existing ones.

Issue #12710

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-18 10:52:57 +01:00
Deven Bansod
3bced0d02f ChangeLog for #12712 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-17 09:33:43 +05:30
Michal Čihař
fab13653a8 Add link to release notes and download on new version notification 
Fixes #12698

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-16 18:15:23 +01:00
Weblate
e7b19f2a2c Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-16 17:48:21 +01:00
Marc Delisle
050e9ebf61 Translated using Weblate (French) 
Currently translated at 99.4% (3205 of 3222 strings)

[CI skip]
 2016-11-16 17:48:19 +01:00
Michal Čihař
80d1bc7c2b Merge pull request #12711 from devenbansod/fix_12361 
Fix #12361 : Fix self SQL injection in table-specific privileges
 2016-11-16 17:48:14 +01:00
Deven Bansod
88b284816c ChangeLog for #12361 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	ChangeLog
 2016-11-16 11:12:05 +05:30
Deven Bansod
b69311e460 Fix self-injection in Table specific privileges 
Don't manually add backticks (`) rather use the Util function,
since escaping of backticks inside the column_name has to be handled too.

Fix #12361

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-16 11:11:41 +05:30
Deven Bansod
0c36e5fd85 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-11-16 09:23:56 +05:30
Deven Bansod
74fd7986eb Remove debugging calls 
Fix #12706

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-16 09:23:06 +05:30
Deven Bansod
f4f4917230 Remove debugging calls 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-16 09:22:42 +05:30
Michal Čihař
59b2c5a63a Fix markup and tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-15 17:41:38 +01:00
Michal Čihař
51c7739526 Changelog entry for #12696 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-15 17:27:16 +01:00
Michal Čihař
aef7f9288a Merge pull request #12696 from devenbansod/fix_12299 
Fix #12299: Change to POST request to avoid possibly very long URIs
 2016-11-15 17:26:06 +01:00
Deven Bansod
21093b22e4 Escape tablenames, dbnames and properly render html-specific elements/chars 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-15 21:47:32 +05:30
Michal Čihař
abe50c6129 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-11-15 17:05:58 +01:00
Michal Čihař
8d4ea7bad2 Update SQL parser to 3.4.13 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-15 17:05:28 +01:00
Deven Bansod
89dfff7868 Change to using HTML5 data-* attributes to allow easy access in JQuery 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-15 21:14:07 +05:30
Weblate
f3ab8cd00b Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-15 15:23:10 +01:00
Hendrik Michaelsen
0b638d735c Translated using Weblate (German) 
Currently translated at 99.4% (3203 of 3222 strings)

[CI skip]
 2016-11-15 15:23:08 +01:00
Marc Delisle
5e354b9439 Translated using Weblate (French) 
Currently translated at 99.4% (3204 of 3222 strings)

[CI skip]
 2016-11-15 15:23:08 +01:00
Michal Čihař
46eaa53ddd Check parameter type before processing 
Fixes #12443

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-15 15:22:32 +01:00
Deven Bansod
3b8f9a55f6 Fix tests related to DBSearch 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-14 10:55:30 +05:30
Deven Bansod
a3f52751bd Change get ajax request to post to avoid long request URIs 
Also, move HTML-embedded JS function calls into JQuery event handlers

Fix #12299

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-14 10:45:49 +05:30
Deven Bansod
ea1e3e3a6f Remove old sqlAddslashes call 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-14 10:45:10 +05:30
Deven Bansod
1aeb705b3f ChangeLog for #12691 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-13 11:40:47 +05:30
Deven Bansod
9b76fccb27 Remove unnecessary call to ksort on empty list 
Fix #12691

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-13 11:37:50 +05:30
Deven Bansod
81fe5fe9bf Fix incorrect calls to escapeString 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-11 19:20:57 +05:30
Weblate
a9048b0b5c Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-11 14:38:34 +01:00
Deven Bansod
d580bb3b51 ChangeLog for #12542 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-11 19:09:44 +05:30
Deven Bansod
d4377e40d8 Merge branch 'rpv-tomsk-fix-HtmlHeaderForUserProperties' into QA_4_6 2016-11-11 19:08:59 +05:30
Burak Yavuz
48650f9403 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-11-11 14:38:33 +01:00
Domen
fcc4537d93 Translated using Weblate (Slovenian) 
Currently translated at 99.9% (3220 of 3222 strings)

[CI skip]
 2016-11-11 14:38:33 +01:00