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
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
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
Isaac Bennetch
2dc895368f Enhance table_coord documentation 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-05-30 09:15:00 -04:00
Isaac Bennetch
1500e4aaac FAQ 3.21 document issue unable to log in with characters such as á 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-05-30 08:21:10 -04:00
Michal Čihař
4027603420 Merge branch 'QA_4_6' 2016-05-30 09:35:20 +02:00
Renan Souza do Nascimento
5f5f1d0f4e Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.9% (2983 of 3208 strings)

[CI skip]
 2016-05-30 09:34:37 +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
b042e90338 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.8% (2978 of 3208 strings)

[CI skip]
 2016-05-28 22:49:01 +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
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