Commit Graph

85620 Commits

Author SHA1 Message Date
Marc Delisle
903adf54fe Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2013-07-30 09:57:13 -04:00
Marc Delisle
e557eeb7f4 Fix merge conflicts 2013-07-30 09:56:52 -04:00
Michal Čihař
21e1b2c4c7 Add missing docs 2013-07-30 15:50:52 +02:00
Marc Delisle
cdd709617b Update po files 2013-07-30 09:37:52 -04:00
Henry Heinänen
293678b23f Translated using Weblate (Finnish)
Currently translated at 65.8% (1781 of 2708)
2013-07-30 15:37:39 +02:00
Henry Heinänen
0675cf5f8c Translated using Weblate (Finnish)
Currently translated at 65.8% (1781 of 2708)
2013-07-30 15:37:12 +02:00
Marc Delisle
87fe4698e7 Clarify this message, because user groups are not related to privileges 2013-07-30 09:37:04 -04:00
Kristjan Räts
63872106a6 Translated using Weblate (Estonian)
Currently translated at 100.0% (2714.0 of 2714)
2013-07-30 15:36:40 +02:00
Madhura Jayaratne
dd9441dd12 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-07-30 18:52:39 +05:30
Weblate
0c04ca449c Merge remote-tracking branch 'origin/master' 2013-07-30 15:21:12 +02:00
Madhura Jayaratne
e00f728959 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-07-30 18:50:24 +05:30
Michal Čihař
79fd455ce3 Merge remote-tracking branch 'origin/QA_4_0' 2013-07-30 15:20:08 +02:00
Henry Heinänen
25ad2b6723 Translated using Weblate (Finnish)
Currently translated at 65.5% (1774 of 2708)
2013-07-30 15:19:52 +02:00
Madhura Jayaratne
903c951bc0 Redo 28b669a1aa 2013-07-30 18:49:15 +05:30
Michal Čihař
c2f3cf3c8a Wrap some long lines 2013-07-30 15:18:58 +02:00
Weblate
222694f461 Merge remote-tracking branch 'origin/master' 2013-07-30 15:15:06 +02:00
Michal Čihař
062035b86f This test sometimes takes longer 2013-07-30 15:14:48 +02:00
Michal Čihař
decf20bdf4 Define validator before use 2013-07-30 15:12:07 +02:00
Weblate
3c2746356f Merge remote-tracking branch 'origin/master' 2013-07-30 15:11:32 +02:00
Michal Čihař
df898ba031 Missing ) 2013-07-30 15:10:11 +02:00
Weblate
a0cf0970c6 Merge remote-tracking branch 'origin/master' 2013-07-30 15:08:42 +02:00
Michal Čihař
a5f572e132 Factor out text showing detection as well 2013-07-30 15:07:44 +02:00
Weblate
f23b761a9b Merge remote-tracking branch 'origin/master' 2013-07-30 15:04:22 +02:00
Michal Čihař
c48568afd6 Extract FAQ url 2013-07-30 15:03:36 +02:00
Michal Čihař
a63c0ed00a Add class comment 2013-07-30 15:02:22 +02:00
Henry Heinänen
06550f0d75 Translated using Weblate (Finnish)
Currently translated at 65.4% (1772 of 2708)
2013-07-30 15:02:07 +02:00
Michal Čihař
4c12a6ad16 Fixed indentation 2013-07-30 15:01:31 +02:00
Weblate
e2e3d9be36 Merge remote-tracking branch 'origin/master' 2013-07-30 14:59:03 +02:00
Michal Čihař
be7ad383c8 Fix typo 2013-07-30 14:57:20 +02:00
Weblate
09d6a1d09b Merge remote-tracking branch 'origin/master' 2013-07-30 14:56:44 +02:00
Michal Čihař
e9f3e1c624 Various coding style improvements 2013-07-30 14:56:41 +02:00
Henry Heinänen
9f1998b1ce Translated using Weblate (Finnish)
Currently translated at 65.3% (1769 of 2708)
2013-07-30 14:56:01 +02:00
G. S
261375a0fb Translated using Weblate (Hungarian)
Currently translated at 99.2% (2686 of 2708)
2013-07-30 14:55:32 +02:00
Henry Heinänen
3d150bbb0a Translated using Weblate (Finnish)
Currently translated at 69.8% (1820 of 2609)
2013-07-30 14:55:10 +02:00
Henry Heinänen
2093f4830d Translated using Weblate (Finnish)
Currently translated at 65.3% (1769 of 2708)
2013-07-30 14:55:08 +02:00
Michal Čihař
7a97781c23 Share code for checking whether to show icons 2013-07-30 14:54:21 +02:00
Michal Čihař
94cc3813dc No parenthesis around include 2013-07-30 14:54:21 +02:00
Marc Delisle
7ee30619c9 Update po files 2013-07-30 08:39:08 -04:00
G. S
e0ab70b51f Translated using Weblate (Hungarian)
Currently translated at 99.2% (2685 of 2708)
2013-07-30 14:39:34 +02:00
Weblate
d21ae3e7a9 Merge remote-tracking branch 'origin/master' 2013-07-30 14:39:23 +02:00
Marc Delisle
ad1136e908 Merge pull request #550 from nijel/demoserver
Demo server support
2013-07-30 05:39:11 -07:00
Michal Čihař
d6affebdbe Whitespace cleanup 2013-07-30 14:36:43 +02:00
Michal Čihař
82a6cc59bb Include setup script JS in jshint as well 2013-07-30 14:36:43 +02:00
Michal Čihař
5263a05169 Correct spacing of functions 2013-07-30 14:36:43 +02:00
Michal Čihař
c1da6e51f7 More readable debug statements 2013-07-30 14:36:43 +02:00
Michal Čihař
1bb39b0eff Various coding style improvements 2013-07-30 14:36:43 +02:00
Michal Čihař
43988b3201 Various coding style improvements 2013-07-30 14:36:43 +02:00
Michal Čihař
16e2f21620 Move function to its docs 2013-07-30 14:36:43 +02:00
Michal Čihař
49c0bdb54b Various coding style improvements 2013-07-30 14:36:43 +02:00
Michal Čihař
61cf2c4cc9 Various coding style improvements 2013-07-30 14:36:43 +02:00