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

106571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Giovanni Sora
886ef5d573 Translated using Weblate (Interlingua) 
Currently translated at 73.5% (2365 of 3217 strings)

[CI skip]
 2016-08-01 16:06:57 +02:00
dingo thirteen
207c63e432 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-08-01 15:30:53 +02:00
Domen
84490893cc Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-08-01 14:55:24 +02:00
Kristjan Räts
fd47e02a22 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-08-01 13:04:24 +02:00
Michal Čihař
b22288bd6a Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-01 11:06:19 +02:00
Michal Čihař
39cb4d045c Merge branch 'QA_4_6' 2016-08-01 11:05:44 +02:00
Michal Čihař
3bcd45f87f Merge commit '2ee0e4ed0e86572f15764fea6ef37bdaf546e6ee' 2016-08-01 11:05:39 +02:00
Michal Čihař
aecf9de8fa Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-01 11:04:28 +02:00
Deven Bansod
2ee0e4ed0e ChangeLog entries for #12425 and #12399 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-01 11:45:00 +05:30
Deven Bansod
2c5541a94b Fix #12399: Adding index to table shows wrong top navigation 
If the SQL query analyzing sets the $table value to '',
don't update the original value

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-01 11:41:44 +05:30
Deven Bansod
257a74e116 Merge branch 'QA_4_6' 
Conflicts:
	po/az.po
	po/fi.po
	po/ko.po
 2016-08-01 09:50:19 +05:30
Deven Bansod
9ee479b25a Merge branch 'QA_4_6' of http://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-08-01 09:43:36 +05:30
Deven Bansod
9f1f055177 Fix #12425 : Removed double usage of same var name; Fix typo introduced in 545db4a4 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-01 09:42:56 +05:30
Madhura Jayaratne
238713b452 Fix menu items and navigation panel links 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-08-01 08:55:02 +10:00
서준원
ed284f06a8 Translated using Weblate (Korean) 
Currently translated at 78.2% (2511 of 3209 strings)

[CI skip]
 2016-08-01 00:45:12 +02:00
Weblate
599effd165 Merge remote-tracking branch 'origin/master' 2016-07-31 23:50:45 +02:00
서준원
c061502285 Translated using Weblate (Korean) 
Currently translated at 77.9% (2500 of 3208 strings)

[CI skip]
 2016-07-31 23:50:44 +02:00
Madhura Jayaratne
7f43348e6b Merge pull request #12415 from nijel/remove-token-get 
Remove token from GET requests
 2016-08-01 07:50:37 +10:00
Sevdimali İsa
17a26ab55f Translated using Weblate (Azerbaijani) 
Currently translated at 52.5% (1685 of 3209 strings)

[CI skip]
 2016-07-31 21:44:15 +02:00
Sevdimali İsa
dc41f51bf4 Translated using Weblate (Azerbaijani) 
Currently translated at 52.3% (1679 of 3208 strings)

[CI skip]
 2016-07-31 21:44:09 +02:00
Juha Remes
bebca1139f Translated using Weblate (Finnish) 
Currently translated at 68.8% (2209 of 3209 strings)

[CI skip]
 2016-07-31 15:44:42 +02:00
Juha Remes
9a857ea45a Translated using Weblate (Finnish) 
Currently translated at 68.6% (2201 of 3208 strings)

[CI skip]
 2016-07-31 15:44:38 +02:00
Weblate
7d57024d95 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-07-29 14:05:14 +02:00
Michal Čihař
a98a65d92e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-07-29 14:05:12 +02:00
Juha
62ad40ef04 Translated using Weblate (Finnish) 
Currently translated at 67.7% (2173 of 3209 strings)

[CI skip]
 2016-07-29 14:05:12 +02:00
Michal Čihař
108b71c3f6 Merge branch 'QA_4_6' 2016-07-29 14:04:46 +02:00
Michal Čihař
b27020f108 Avoid typecasting to float when not needed 
Fixes #12303

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 14:03:13 +02:00
Weblate
513c6037e0 Merge remote-tracking branch 'origin/master' 2016-07-29 13:58:25 +02:00
Juha
7e6e4fdeff Translated using Weblate (Finnish) 
Currently translated at 67.5% (2166 of 3208 strings)

[CI skip]
 2016-07-29 13:58:22 +02:00
Michal Čihař
c328697e39 Do not use mb_strlen result for string indexes 
The string indexes are in bytes, while mb_strlen counts chars.

Issue #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 13:54:04 +02:00
Michal Čihař
43cfaeeade Add tests for control user connection fallbacks 
Issue #12218

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 13:25:58 +02:00
Michal Čihař
4054228e1b Always merge control user configuration 
Issue #12218

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 13:25:29 +02:00
Michal Čihař
9d0c745aa5 Add missing documentation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:48:57 +02:00
Michal Čihař
6b6040acbf Adjust tests to new parameters 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:40:45 +02:00
Michal Čihař
90498afe76 Allow to specify further parameters for control connection 
Fixes #12218

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:38:03 +02:00
Michal Čihař
d6e85cc48d Remove wrong parts of the docs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:29:47 +02:00
Michal Čihař
a36367bafb Always provide default for ssl and compress settings 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:27:06 +02:00
Michal Čihař
0fdc46eb55 Always set default connection params 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:24:39 +02:00
Michal Čihař
8a41fd3f63 Fix fallback value for MySQL port 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:24:28 +02:00
Michal Čihař
94ff41a97f Add safety check for invalid method call 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:22:01 +02:00
Michal Čihař
f2e179b750 Simplify DBI code as $server no longer can be null 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:21:06 +02:00
Michal Čihař
061c620723 Generate connection settings at one place 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:19:40 +02:00
Michal Čihař
9592f66bd5 Share socket/port/host sanitization in DatabaseInterface 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:09:26 +02:00
Michal Čihař
6fd55f968a Pass user link parameter in server array as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 12:04:25 +02:00
Michal Čihař
95064ed9fb Move control user connection calculation to DatabaseInterface 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 11:58:02 +02:00
Michal Čihař
2dce033943 Move configuration management in DBI to separate method 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 11:57:51 +02:00
Michal Čihař
25a38b2067 Determine correct user/password for connect in DatabaseInterface 
The API only specifies what kind of link we want and we will get it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 11:51:09 +02:00
Michal Čihař
f30f65c67a Indentify connection type by one flag 
Use integer values rather than set of boolean flags. This makes it
easier to make decision and makes the code more readable. Also removes
confusion what should happen in case both boolean flags are set.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 11:36:07 +02:00
Michal Čihař
f46fd34081 Remove is_controluser flag from DBI backends 
They no longer need it (it was used only for empty password fallback).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 11:34:55 +02:00
Michal Čihař
53f541af86 Removed MySQL connection retry without password 
This really does not make sense for any decent setup. It is useful only
with http authentication, but still no password is not something we
would want to automatically fall back to.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-29 11:30:32 +02:00