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

106435 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isaac Bennetch
de030c88ce Fix merge conflicts from preparing for 4.6.3 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-05-25 14:43:07 -04: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
Michal Čihař
fb5da88128 Move server settings from wiki 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-25 18:20:45 +02:00
Isaac Bennetch
c1c75f8c35 4.6.2 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-05-25 12:16:14 -04:00
Michal Čihař
4dce15aac4 Incorporate upgrading instructions from wiki 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-25 18:06:47 +02:00
Michal Čihař
076f74d7e5 Add mbstring glossary term from wiki 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-25 17:49:16 +02:00
Michal Čihař
96e22abfff Move primary and unique key docs from wiki 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-25 17:43:20 +02:00
Michal Čihař
c39bf5a5e7 Improve storage engines description from wiki 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-25 17:36:14 +02:00
Michal Čihař
74e24450c7 Merge remote-tracking branch 'origin/QA_4_6' 2016-05-25 16:47:13 +02: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
Michal Čihař
23d703cf40 Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-25 11:35:41 +02:00
Michal Čihař
3fc1fa1c80 Do not try to generate coverage from phpunit tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-25 11:35:24 +02:00
Michal Čihař
efa75c871d Retry when checking for broken links 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-25 10:46:02 +02:00
Michal Čihař
4e7077b264 Run selenium tests more verbosely to see the progress 
The currently timeout od Travis due to no output.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-25 10:25:27 +02:00
Weblate
973e6b9e72 Merge remote-tracking branch 'origin/master' 2016-05-24 08:20:29 +02:00
Domen
84fcd14b60 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2016-05-24 08:20:28 +02:00
GIMMY
1e8f6b4efd Translated using Weblate (Malayalam) 
Currently translated at 1.6% (53 of 3208 strings)

[CI skip]
 2016-05-24 08:20:28 +02:00
Παναγιώτης Παπάζογλου
62c0955d8b Translated using Weblate (Greek) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2016-05-24 08:20:27 +02:00
dingo thirteen
a3607f8fb8 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2016-05-24 08:20:26 +02:00
Yordan Nedelchev
71e4fd3db6 Translated using Weblate (Bulgarian) 
Currently translated at 62.6% (2009 of 3208 strings)

[CI skip]
 2016-05-24 08:20:25 +02:00
Michal Čihař
5524f7b629 Merge branch 'QA_4_6' 2016-05-24 08:20:08 +02:00
Michal Čihař
0eb4828814 Merge remote-tracking branch 'origin/master' 2016-05-24 08:19:57 +02:00
Michal Čihař
9d5c5f0c86 Adjust tests to new error messages 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 21:27:41 +02:00
Valentin Mladenov
c438069de1 Translated using Weblate (Bulgarian) 
Currently translated at 57.8% (1855 of 3208 strings)

[CI skip]
 2016-05-23 19:52:18 +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
Yordan Nedelchev
26be6e9777 Translated using Weblate (Bulgarian) 
Currently translated at 57.8% (1855 of 3208 strings)

[CI skip]
 2016-05-23 19:44:43 +02:00
dingo thirteen
a6653cf052 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2016-05-23 19:27:53 +02:00
dingo thirteen
25e5224de2 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2016-05-23 19:25:12 +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ř
8ba932da58 Merge branch 'QA_4_6' 2016-05-23 17:38:00 +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ř
4cd8ab8a95 Better report errors while generating SQL exports 
The errors will include table and database name in the dump and the
error is also shown in the UI on next page.

Fixes #5555

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 17:21:58 +02:00
Michal Čihař
40b80d883d Merge branch 'QA_4_6' 2016-05-23 17:16:35 +02:00
Michal Čihař
a141aeb4c4 Merge remote-tracking branch 'origin/QA_4_6' 2016-05-23 17:16:31 +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
Michal Čihař
0816b47b3d Document cookie exipiry times 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 16:40:51 +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ř
a15a847ade Add support for export user settings as config.inc.php snippet 
Fixes #6274

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 16:35:03 +02:00
Stefano Martinelli
183259e9e9 Translated using Weblate (Italian) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2016-05-23 16:33:21 +02:00
Michal Čihař
d7d9925e11 Merge branch 'QA_4_6' 2016-05-23 16:10:34 +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ř
1d1e269144 Merge branch 'QA_4_6' 2016-05-23 15:54:33 +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ř
0be789c845 Merge branch 'QA_4_6' 2016-05-23 15:25:38 +02:00
Michal Čihař
07f4a407b7 Merge remote-tracking branch 'origin/QA_4_6' 2016-05-23 15:25:31 +02:00