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

106156 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isaac Bennetch
4d03c3403d Fix typo in function documentation; thanks Deven 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-05-28 10:36:39 -04:00
Isaac Bennetch
277e90f977 Merge pull request #12270 from Gregory-Buhler/ISSUE_#12233 
Error message improved when user tries to rename database to same name.
 2016-05-28 10:10:00 -04:00
Michal Čihař
eea1bca501 Merge pull request #12273 from slokhorst/doc-rm-mcrypt 
Remove mcrypt mention in setup documentation
 2016-05-27 16:57:12 +02:00
Michal Čihař
719729397f Ignore linkcheck output 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-27 16:42:44 +02:00
Michal Čihař
a3bc2fa22e Move other articles links from wiki 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-27 16:28:15 +02:00
Michal Čihař
c1b147d9fa Improve controluser docs based on suggestions from wiki 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-27 15:42:33 +02:00
Michal Čihař
c4a7ec4650 Merge pull request #12274 from sfobiwahn/master 
fixed checking of user rights to make it look for database privileges
 2016-05-27 15:32:14 +02:00
Michal Čihař
8678125b6a Merge pull request #12275 from andavies/issue-#12262 
Remove inline styles from elements with id='filterText' (partial fix …
 2016-05-27 15:31:39 +02:00
Michal Čihař
ab29ec9947 Merge branch 'QA_4_6' 2016-05-27 11:12:58 +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
Isaac Bennetch
ba20c9fc7e We no longer need to create MAINT branches for each release; we'll do this on demand from the RELEASE_x_y_z tag if needed. 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-05-26 16:22:37 -04:00
Andy Davies
786786d602 Remove inline styles from elements with id='filterText' (partial fix of issue #12262) 
Signed-off-by: Andy Davies <contact@andy-davies.me>
 2016-05-26 18:02:26 +01:00
Michal Čihař
c71e842349 Merge branch 'QA_4_6' 2016-05-26 18:06:14 +02:00
Michal Čihař
88f2279781 Merge remote-tracking branch 'origin/QA_4_6' 2016-05-26 18:06:11 +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
Gregory-Buhler
e1eed3ed43 Fixes #12233 Error message improved when user tries to rename database to 
same name. Added new functionality to PMA_ajaxShowMessage() allowing for
different notification types.

Signed-off-by: Gregory-Buhler <webmaster@gregorybuhler.com>
 2016-05-26 09:54:39 -06:00
sfobiwahn
df137f2410 fixed checking of user rights to make it look for database privileges 
Signed-off-by: Florian Steenblock <florian.steenblock@gmail.com>
 2016-05-26 17:10:57 +02:00
Michal Čihař
16d1464009 Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-26 16:38:08 +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
Madhura Jayaratne
865cdc39ce Add a new icon to represent non-primary key 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-05-26 09:52:33 +10:00
Sebastiaan Lokhorst
e7e17420f7 Remove mcrypt mention in setup documentation 
mcrypt is no longer mentioned in the 'require' section (removed in commit 692c555c3f), so this is confusing.

Signed-off-by: Sebastiaan Lokhorst <sebastiaanlokhorst@gmail.com>
 2016-05-25 22:15:43 +02:00
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