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

106214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
c70aed7a1d Merge branch 'QA_4_6' 2016-06-09 09:40:21 +02:00
Michal Čihař
763683b4fe Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-09 09:40:16 +02:00
Michal Čihař
62d417db9b Merge branch 'QA_4_6' 2016-06-09 09:20:26 +02:00
Michal Čihař
3f8ec9b1db Merge remote-tracking branch 'origin/QA_4_6' 2016-06-09 09:20:23 +02:00
Gergő Felföldi
d0770959ce Translated using Weblate (Hungarian) 
Currently translated at 95.4% (3063 of 3208 strings)

[CI skip]
 2016-06-09 09:20:12 +02:00
Michal Čihař
b261ecae25 Add test for possible rounding issues 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-09 09:19:55 +02:00
Michal Čihař
43fdcb67ee Include phpMyAdmin version in JSON dump 
This provides useful information, the 0.1 string was not really helpful.

Issue #12304

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-09 09:19:55 +02:00
Gergő Felföldi
99f17c107e Translated using Weblate (Hungarian) 
Currently translated at 95.8% (3075 of 3209 strings)

[CI skip]
 2016-06-09 09:19:47 +02:00
Michal Čihař
e6ff157dda The session_destroy is already called on logout 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-08 15:30:55 +02:00
Weblate
189c122413 Merge remote-tracking branch 'origin/master' 2016-06-08 14:00:43 +02:00
Satnam S Virdi
34c0bf1afd Translated using Weblate (Punjabi) 
Currently translated at 3.1% (101 of 3208 strings)

[CI skip]
 2016-06-08 14:00:42 +02:00
Michal Čihař
0b2b23f2ce Merge branch 'QA_4_6' 2016-06-08 14:00:26 +02:00
Michal Čihař
b7492d80c0 Merge remote-tracking branch 'origin/QA_4_6' 2016-06-08 14:00:22 +02:00
Michal Čihař
d7fcbab1cd Ensure we parse query for views as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-08 14:00:04 +02:00
Satnam S Virdi
f801914944 Translated using Weblate (Punjabi) 
Currently translated at 3.1% (101 of 3209 strings)

[CI skip]
 2016-06-08 13:02:32 +02:00
Madhura Jayaratne
d4932fbb88 Merge branch 'QA_4_6' 2016-06-06 23:59:21 +10:00
Madhura Jayaratne
c2322a637d Merge pull request #12296 from madhuracj/bug12281 
Fix #12281 Copying a user resets SSL to None
 2016-06-06 23:55:19 +10:00
Madhura Jayaratne
c4e7447a96 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into bug12281 
Conflicts:
	ChangeLog
 2016-06-06 23:23:07 +10:00
Madhura Jayaratne
1c77a4ef0d Fix #12281 Copying a user resets SSL to None 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-06-06 23:17:20 +10:00
Michal Čihař
7a66320753 Merge branch 'QA_4_6' 2016-06-06 13:54:53 +02:00
Michal Čihař
4fd2709650 Avoid rewriting PHP stack frames 
Surprisingly PHP stack frames are passed as references to the error
handling code, thus changing value there leads to changing value in the
executed code.

With MySQL issuing warning about incompatible version (different runtime
library than compile time), handling this warning rewrites current stack
frame and the mysql_real_connect later sees parameters as processed by
Error class for display.

We now create copy of the stacktrace to avoid this.

Fixes #12279

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-06 13:52:32 +02:00
Michal Čihař
5bc426742d Merge branch 'QA_4_6' 2016-06-06 11:47:37 +02:00
Michal Čihař
5e536ab5f9 Do not set key if not set in config 
Issue #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-06 11:47:16 +02:00
Michal Čihař
5f8e40941b Do not remove phpseclib's bootstrap file 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-06 09:38:42 +02:00
Michal Čihař
8ee70dfa08 Merge branch 'QA_4_6' 2016-06-06 09:33:22 +02:00
Michal Čihař
b211824dd6 Merge remote-tracking branch 'origin/QA_4_6' 2016-06-06 09:33:11 +02:00
Michal Čihař
171bcb9a85 Fix MySQL SSL connection with some PHP versions 
It seems that for some PHP versions this flag is needed even though it's
not documented like this. Anyway this flag doesn't cause any harm, so
lets keep it enabled.

Issue #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-06 09:32:47 +02:00
Guilherme Rocha
f4ac05762f Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.3% (2995 of 3209 strings)

[CI skip]
 2016-06-06 09:32:39 +02:00
Weblate
15155e3ff4 Merge remote-tracking branch 'origin/master' 2016-06-06 08:56:03 +02:00
Guilherme Rocha
89c868ec83 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.0% (2986 of 3208 strings)

[CI skip]
 2016-06-06 08:56:02 +02:00
Michal Čihař
00412f9dd4 Increase timeout and retries for linkcheck 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-06 08:55:49 +02:00
Deven Bansod
78062a4258 Merge branch 'QA_4_6' 2016-06-05 14:57:26 +05:30
Deven Bansod
7fb046e207 Merge pull request #12294 from devenbansod/fix_designer_save_state 
Fix error in Designer saved default state of all tables
 2016-06-05 14:48:57 +05:30
Deven Bansod
73ce508712 Fix error in Designer saved default state of all tables 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-06-05 13:56:01 +05:30
Isaac Bennetch
727aaa45b9 Slight langauge improvement and remove extra whitespace 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-06-04 22:57:18 -04:00
Madhura Jayaratne
dac90ecb03 Merge branch 'QA_4_6' 2016-06-05 11:13:34 +10:00
Madhura Jayaratne
aec1f4b3c5 Fix #12285 Designer JavaScript error: Show/Hide tables list 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-06-05 11:12:05 +10:00
Michal Čihař
f3925a8b7c Merge branch 'QA_4_6' 2016-06-03 15:22:29 +02:00
Michal Čihař
2ae8b9248e Simplify server port handling 
The intval function does return 0 for empty string, so we really do not
have to special case here.

Issue #12279

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-03 15:21:48 +02:00
Michal Čihař
8a494f26d2 Merge branch 'QA_4_6' 2016-06-03 14:42:07 +02:00
Michal Čihař
b49030528f Fixed export of tables without explicitly set engine 
Fixes #12290

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-03 14:41:55 +02:00
Michal Čihař
e9614da53a Merge branch 'QA_4_6' 2016-06-03 14:32:00 +02:00
Michal Čihař
76be1eaa45 Merge remote-tracking branch 'origin/QA_4_6' 2016-06-03 14:31:57 +02:00
Michal Čihař
d11185f5de Fixed error reporting on connect problems 
The mysqli_real_connect seems to return NULL on invalid parameters, so
we need to handle it as well. This doesn't seem to be documented
anywhere.

Issue #12279

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-03 14:24:45 +02:00
Michal Čihař
c0ab113d41 Update composer dependencies 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-03 14:10:55 +02:00
Michal Čihař
c993509486 Improve FAQ 
Fixes #12232

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-03 13:50:17 +02:00
Michal Čihař
f4f4901b3b Merge pull request #12284 from ibennetch/doc12232 
FAQ 3.21 document issue unable to log in with characters such as á
 2016-06-03 13:48:42 +02:00
Microgamer
2d0822d672 Translated using Weblate (German) 
Currently translated at 99.7% (3200 of 3208 strings)

[CI skip]
 2016-06-02 21:44:46 +02:00
Charles Kane
4822552604 Translated using Weblate (Chinese (China)) 
Currently translated at 88.0% (2824 of 3209 strings)

[CI skip]
 2016-06-02 18:44:17 +02:00
Charles Kane
24ac4b23b5 Translated using Weblate (Chinese (China)) 
Currently translated at 87.6% (2812 of 3208 strings)

[CI skip]
 2016-06-02 18:44:13 +02:00