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

106287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deven Bansod
1ee52c8e4c ChangeLog for #12760 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-29 09:06:14 +05:30
Deven Bansod
6baa646c74 Check if the cfgrelation tables are actually set before using them 
Fix #12760

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-29 09:04:32 +05:30
Deven Bansod
17e4e9e5c0 ChangeLog for #12759 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-29 08:54:44 +05:30
Deven Bansod
1b1d68293b Use proper check to verify if index is set in the Request 
Fix #12759

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-29 08:53:00 +05:30
Michal Čihař
09f56abed6 Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 14:24:39 +01:00
Michal Čihař
068eae7e67 Add missing end of tags 
Fixes #12746

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 13:53:34 +01:00
Jees K Denny
48ebdf1852 Add missing end of meta tags in header 
Issue #12746

Signed-off-by: Jees K Denny <jees.jees5@gmail.com>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 13:51:41 +01:00
Michal Čihař
ad55a6eba8 Avoid listing demo.phpmyadmin.net twice 
Fixes #12744

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 11:39:21 +01:00
Michal Čihař
826a885a90 Fix comment for sql-parser vendor config 
Fixes #12745

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 11:37:09 +01:00
Michal Čihař
10caf5bcae Check if variables are set prior to use 
Issue #12713

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 11:30:14 +01:00
Weblate
9c52bd0724 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-28 10:26:20 +01:00
Marc Delisle
09bfa5fa9d Translated using Weblate (French) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-11-28 10:26:18 +01:00
ncwgf
4d0d648728 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 99.0% (3192 of 3222 strings)

[CI skip]
 2016-11-28 10:26:17 +01:00
Michal Čihař
4d26bec55a Adjust docs to latest Docker image changes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 10:25:05 +01:00
Isaac Bennetch
c1acb3a212 Prepare for 4.6.6-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-11-26 08:01:00 -05:00
Isaac Bennetch
88bbbcf27d Merge remote-tracking branch 'upstream/QA_4_6' into QA_4_6 2016-11-25 23:30:07 -05:00
Deven Bansod
5fb3539cf2 ChangeLog for #12736 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-26 09:50:10 +05:30
Deven Bansod
a2e9a6cbde Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-11-26 09:48:37 +05:30
Deven Bansod
f8db83c630 Using zero value in input's value makes JS block it even if partitions are not being created 
Use blank value in HTML instead

Fix #12736

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-26 09:14:35 +05:30
Isaac Bennetch
9970d9d32e Release 4.6.5.1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-11-25 22:36:14 -05:00
Michal Čihař
1ec3150e48 Fix parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-25 15:46:13 +01:00
Michal Čihař
12f596ceb2 Fix PHP error when mbstring is not installed 
It is still dependency for us, but we should be able to tell user nicely
that it is missing.

Fixes #12734

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-25 15:41:40 +01:00
Deven Bansod
b9ee59500f ChangeLog for #12735 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-25 18:05:01 +05:30
Deven Bansod
a600ff34ff Fix some more instances of wrong arguments 
Issue #12735

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-25 18:03:30 +05:30
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