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

105458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
0caecf5fc8 Correct error handling when editing variable fails 
Issue #12317

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-13 12:46:29 +02:00
Bruno Henrique
2d7d2d2e8b Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.3% (2996 of 3209 strings)

[CI skip]
 2016-06-13 00:45:21 +02:00
Xavier Navarro
c8823e24e7 Translated using Weblate (Catalan) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2016-06-13 00:44:14 +02:00
Jocelyn Flament
baaa6c63be Translated using Weblate (French) 
Currently translated at 99.8% (3203 of 3209 strings)

[CI skip]
 2016-06-12 18:44:35 +02:00
Michal Čihař
3c6675b3f9 Fix division by zero in case of misconfigured MySQL server 
Fixes #12308

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-09 09:49:13 +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ř
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ř
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
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ř
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ř
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ř
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
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
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ř
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ř
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ř
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
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
Microgamer
f9fed9ca2f Translated using Weblate (German) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2016-05-31 18:45:32 +02:00
Renan Souza do Nascimento
5cadea99fc Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.2% (2992 of 3209 strings)

[CI skip]
 2016-05-30 09:34:16 +02:00
João Carlos Barsan
8e146b35b5 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.0% (2987 of 3209 strings)

[CI skip]
 2016-05-28 22:48:51 +02:00
Michal Čihař
d78e173b34 Do not use dirname for calculating cookie path 
It is wrong for this purpose as on Windows this uses \ for both
separating parts and generating result. This fixed calculation of cookie
path on Windows.

Fixes #12249

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-27 11:11:56 +02:00
Michal Čihař
e72c1d4da9 Add more tests for getCookiePath (issue #12249) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-26 18:04:23 +02:00
Kristjan Räts
b56df99731 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2016-05-26 16:14:31 +02:00
Isaac Bennetch
5c6ec27eea Prepare for 4.6.3-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-05-25 14:36:58 -04:00
Isaac Bennetch
35e191d74b Changelog for PMASA-2016-14 and -16 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-05-25 13:00:26 -04:00
Isaac Bennetch
c1c75f8c35 4.6.2 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-05-25 12:16:14 -04:00
GIMMY
64af03298c Translated using Weblate (Malayalam) 
Currently translated at 1.6% (53 of 3209 strings)

[CI skip]
 2016-05-25 16:44:39 +02:00
Παναγιώτης Παπάζογλου
2470b442bc Translated using Weblate (Greek) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2016-05-25 16:44:38 +02:00
dingo thirteen
d3c1237463 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2016-05-25 16:44:38 +02:00
Yordan Nedelchev
97b3b80555 Translated using Weblate (Bulgarian) 
Currently translated at 62.7% (2015 of 3209 strings)

[CI skip]
 2016-05-25 16:44:37 +02:00
Domen
df9d0662a1 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2016-05-23 19:45:31 +02:00
Weblate
8390337711 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-05-23 17:53:40 +02:00
Burak Yavuz
453465d56b Translated using Weblate (Turkish) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2016-05-23 17:53:35 +02:00
Michal Čihař
e1f8c36c79 Fix class namespace 
Fixes loading of APC based upload progress bar

Fixes #12248

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 17:37:38 +02:00
Michal Čihař
66f774787f Do not fail on errors stored in session 
If there is user error stored in session, it would be treated as session
startup error, what is wrong.

Fixes #12229

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 17:15:23 +02:00
Stefano Martinelli
00d73663b5 Translated using Weblate (Italian) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2016-05-23 16:36:10 +02:00
Michal Čihař
ec11ed59be Add session reload for config authentication 
It is for free with new logout handling (since
11eb574242).

Fixes #11565

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 16:10:07 +02:00
Michal Čihař
3b374237d6 Fixed export of ARCHIVE tables with keys 
We can not rewrite the ARCHIVE table as it can not be altered.

Fixes #12082

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 15:54:26 +02:00
Michal Čihař
cb2ec8210d Avoid storing full error data in session 
The arguments of called functions can be huge or cause problems on session
restore. More importantly we never need them as they are, we only need
them to display them as text, so let's store only this representation in
the session.

Fixes #12192

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 15:25:22 +02:00
Michal Čihař
d88faaf42b Remove unused code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 15:25:22 +02:00
Giovanni Sora
bc430c98e6 Translated using Weblate (Interlingua) 
Currently translated at 73.3% (2355 of 3209 strings)

[CI skip]
 2016-05-23 15:25:15 +02:00
Michal Čihař
fe225ac49d Do not try to sync favorite tables without server 
Fixes #12209

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 15:10:19 +02:00