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

109103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
dbcbee5336 Remove composer.lock from maintenance branch 
It should be there only for releases.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 15:03:22 +02:00
Michal Čihař
61b9418f67 Add tests for Amazon RDS 
Issue #13258

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 15:02:13 +02:00
Michal Čihař
17599c3387 Simplify Amazon RDS detection 
Issue #13258

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 15:01:58 +02:00
Michal Čihař
fba8a51e3e Changelog entry for #13258 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 14:56:28 +02:00
Craig Duncan
ac3a35bc97 Correct the check for Amazon RDS 
Signed-off-by: Craig Duncan <git@duncanc.co.uk>
 2017-05-09 14:55:52 +02:00
Michal Čihař
0f0247f46b Remove author on request 
Fixes #13259

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 14:32:01 +02:00
Michal Čihař
1784f4a64e Changelog entry for #13252 and #13255 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 11:50:10 +02:00
Michal Čihař
c36d0001f9 Use htmlspecialchars instead of urlencode 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 11:49:52 +02:00
Michal Čihař
4193d20334 Merge pull request #13255 from udan11/fix_13252 
Fixed tooltip not showing up.
 2017-05-09 11:49:14 +02:00
Michal Čihař
915bcdab5b Changelog entry for #13256 and #13257 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-09 11:40:16 +02:00
Weblate
9988611a17 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-05-09 11:39:36 +02:00
Codrin
88e2610296 Translated using Weblate (Romanian) 
Currently translated at 54.0% (1724 of 3192 strings)

[CI skip]
 2017-05-09 11:39:35 +02:00
Michal Čihař
b723df0b86 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 94.0% (3001 of 3192 strings)

[CI skip]
 2017-05-09 11:39:35 +02:00
Michal Čihař
a3987b2654 Translated using Weblate (Lithuanian) 
Currently translated at 43.1% (1377 of 3192 strings)

[CI skip]
 2017-05-09 11:39:34 +02:00
Viktar Vauchkevich
5d3f1be1d4 Translated using Weblate (Belarusian) 
Currently translated at 38.5% (1229 of 3192 strings)

[CI skip]
 2017-05-09 11:39:32 +02:00
Michal Čihař
a70025eee2 Translated using Weblate (Arabic) 
Currently translated at 34.6% (1107 of 3192 strings)

[CI skip]
 2017-05-09 11:39:32 +02:00
Michal Čihař
cb717611e9 Merge pull request #13257 from udan11/fix_13256 
zxcvbn dependency was missing.
 2017-05-09 11:39:24 +02:00
Joelso Dias
35c6d9c66d Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 94.0% (3001 of 3192 strings)

[CI skip]
 2017-05-09 03:46:14 +02:00
Cindy Dallaire
97d2c07e24 Translated using Weblate (French) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-05-09 00:45:05 +02:00
Dan Ungureanu
41683f3553 zxcvbn dependency was missing. 
Fixes #13256.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2017-05-08 21:37:36 +03:00
Dan Ungureanu
c2761f6135 Fixed tooltip not showing up. 
Fixes #13252.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2017-05-08 19:45:39 +03:00
Justas Vilimas
d70e87b1b5 Translated using Weblate (Lithuanian) 
Currently translated at 43.1% (1377 of 3192 strings)

[CI skip]
 2017-05-08 10:32:11 +02:00
Viktar Vauchkevich
c9efa661e1 Translated using Weblate (Belarusian) 
Currently translated at 32.0% (1023 of 3192 strings)

[CI skip]
 2017-05-07 00:44:14 +02:00
Michal Čihař
0647138e7e Properly report not working sessions 
If saved session no longer contains variable we have just saved to it,
there is some problem. It's better to warn user right now than failing
later.

Fixes #13234

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-04 13:56:17 +02:00
Michal Čihař
436b68258d Changelog entries for #13216 and #13218 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-05-04 12:42:59 +02:00
Michal Čihař
c419aad2b9 Merge pull request #13224 from nijel/collations 
Rewite collation naming code
 2017-05-04 12:41:33 +02:00
Weblate
aa1171f24f Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-05-04 12:25:17 +02:00
Isuru Udana Palihawadana
2bef0598c7 Translated using Weblate (Sinhala) 
Currently translated at 59.8% (1912 of 3192 strings)

[CI skip]
 2017-05-04 12:25:16 +02:00
Muḥend Belqasem
bb2373e445 Translated using Weblate (Kabyle) 
Currently translated at 2.5% (80 of 3192 strings)

[CI skip]
 2017-05-04 12:25:15 +02:00
Viktar Vauchkevich
e8c67d3c09 Translated using Weblate (Belarusian) 
Currently translated at 28.7% (917 of 3192 strings)

[CI skip]
 2017-05-04 12:25:14 +02:00
Michal Čihař
cfb66a5b9f Merge pull request #13223 from nijel/logo 
Update logo images
 2017-05-04 12:25:07 +02:00
Viktar Vauchkevich
298b431b4b Translated using Weblate (Belarusian) 
Currently translated at 25.4% (812 of 3192 strings)

[CI skip]
 2017-05-01 00:44:18 +02:00
Michal Čihař
2227f33c74 Merge pull request #13191 from udan11/fix_designer 
Fix designer
 2017-04-28 16:27:31 +02:00
Michal Čihař
031d379bdc Rewite collation naming code 
Rewritten to use level based parser instead of hardcoding ordering. This
is necessary as MySQL charset naming got even more complex with MySQL
8.0.

Fixes #13216

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-28 16:04:27 +02:00
Michal Čihař
8d6b1dce57 Improved handling of logout with disabled LoginCookieDeleteAll 
- avoid removing session for cookie auth if LoginCookieDeleteAll is
  disabled
- redirect user to other server rather than to login page
- show message about partial logout
- adjust tests
- this is based on #13221

Fixes #12301

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-28 16:02:11 +02:00
Harro Verton
cde775bd2b Don't destroy the session if logins are still present. fixes #12301 
If you are logged-in into multiple database servers, logOut() logs you
out of all of them. This fix will prevent that, and will only destroy
the session when you log out of the last server.

Signed-off-by: Michal Čihař <michal@cihar.com>
Signed-off-by: Harro Verton <wanwizard@wanwizard.eu>
 2017-04-28 15:27:24 +02:00
Michal Čihař
6e27bc61ef Merge branch 'QA_4_7' of github.com:phpmyadmin/phpmyadmin into QA_4_7 2017-04-28 13:13:27 +02:00
Michal Čihař
dd7faf9ece Update logo images 
The old ones did not have proper transparency (due to lack of support
for that in some browsers by the time they were created).

As we don't seem to have sources for the original logo, I've used
slightly newer version which was used on t-shirts and stickers.

Fixes https://github.com/phpmyadmin/phpmyadmin/issues/13218

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-28 13:11:41 +02:00
Michal Čihař
bd526cf065 Add issue #13219 to changelog 
It was reported later than fix, but still worth mentioning.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-28 12:09:20 +02:00
Weblate
fe340a3faf Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-04-28 11:47:56 +02:00
Chien Wei Lin
65d6549d68 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-04-28 11:47:50 +02:00
Viktar Vauchkevich
ff3ae274cb Translated using Weblate (Belarusian) 
Currently translated at 24.3% (778 of 3192 strings)

[CI skip]
 2017-04-28 11:47:49 +02:00
Michal Čihař
0f1c011c28 Add token to form generated by Util::linkOrButton 
Fixes #13182

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-28 11:46:59 +02:00
Dadan Setia
d99fe15530 Translated using Weblate (Indonesian) 
Currently translated at 70.4% (2249 of 3192 strings)

[CI skip]
 2017-04-25 03:45:34 +02:00
Viktar Vauchkevich
e4fe584d43 Translated using Weblate (Belarusian) 
Currently translated at 24.2% (775 of 3192 strings)

[CI skip]
 2017-04-25 00:44:45 +02:00
Danilo D. de Godoy
8d61e5d06d Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.7% (2994 of 3192 strings)

[CI skip]
 2017-04-21 21:46:17 +02:00
Deven Bansod
6b9f40f516 ChangeLog for b3f6e5cdad 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-04-18 21:36:01 +05:30
Deven Bansod
b3f6e5cdad Fix Refresh of ProcessList 
Issue #13182
Specifically the error mentioned in the comment: https://github.com/phpmyadmin/phpmyadmin/issues/13182#issuecomment-294876981

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-04-18 21:32:34 +05:30
bhargavi sabbisetty
a40ef5995d Translated using Weblate (Telugu) 
Currently translated at 9.6% (308 of 3192 strings)

[CI skip]
 2017-04-14 18:46:52 +02:00
Dan Ungureanu
bd2543d1b6 Fixed query that is used in designer. 
Previously, it was using the htmlspecialchars(tbl_name) instead of the
real table name.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2017-04-14 17:23:35 +03:00