Commit Graph

85601 Commits

Author SHA1 Message Date
adamgsoc2013
2d136251e3 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into UT_plu_table 2013-07-30 21:26:56 +08:00
Michal Čihař
79fd455ce3 Merge remote-tracking branch 'origin/QA_4_0' 2013-07-30 15:20:08 +02:00
Michal Čihař
c2f3cf3c8a Wrap some long lines 2013-07-30 15:18:58 +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
Michal Čihař
df898ba031 Missing ) 2013-07-30 15:10:11 +02:00
Michal Čihař
a5f572e132 Factor out text showing detection as well 2013-07-30 15:07:44 +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
Michal Čihař
4c12a6ad16 Fixed indentation 2013-07-30 15:01:31 +02:00
adamgsoc2013
33cf40e6cc Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into UT_plu_table 2013-07-30 21:00:20 +08:00
Michal Čihař
be7ad383c8 Fix typo 2013-07-30 14:57:20 +02:00
Michal Čihař
e9f3e1c624 Various coding style improvements 2013-07-30 14:56:41 +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
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
Michal Čihař
425d9f466e Various coding style improvements 2013-07-30 14:36:43 +02:00
Michal Čihař
3fc2ab9cf9 Move function declaration to top 2013-07-30 14:36:43 +02:00
Michal Čihař
dc201c3a7a Fixed spacing 2013-07-30 14:36:43 +02:00
Michal Čihař
cbe04c44fd Missing spaces and semicolons 2013-07-30 14:36:43 +02:00
Michal Čihař
ea5d365877 Move function definitions to top 2013-07-30 14:36:43 +02:00
Michal Čihař
93d283633b Fixed newlines 2013-07-30 14:36:43 +02:00
Weblate
fbf9c6fd37 Merge remote-tracking branch 'origin/master' 2013-07-30 14:35:21 +02:00
Madhura Jayaratne
fa59114e92 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-07-30 18:04:21 +05:30
G. S
06deba0f6d Translated using Weblate (Hungarian)
Currently translated at 99.1% (2683 of 2708)
2013-07-30 14:33:16 +02:00
Madhura Jayaratne
d645017d11 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-07-30 18:02:07 +05:30
Madhura Jayaratne
309dcb8e38 Revert 28b669a1aa 2013-07-30 18:01:22 +05:30
Marc Delisle
917d8033eb Fix merge conflicts 2013-07-30 08:30:32 -04:00
Weblate
3c112edaf3 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-07-30 14:30:17 +02:00
Tony Chen
0cfbab1528 Translated using Weblate (Traditional Chinese)
Currently translated at 100.0% (2609 of 2609)
2013-07-30 14:29:47 +02:00
Marc Delisle
11f0c81d5e Merge commit 'a46c38c' 2013-07-30 08:28:20 -04:00
Marc Delisle
baf3dd9b6a Bug #4036 Call to undefined function mb_detect_encoding (clarify the doc) 2013-07-30 08:27:12 -04:00
Weblate
4100b52359 Merge remote-tracking branch 'origin/master' 2013-07-30 14:20:31 +02:00
G. S
1b04c858f6 Translated using Weblate (Hungarian)
Currently translated at 99.0% (2680 of 2708)
2013-07-30 14:19:05 +02:00
Madhura Jayaratne
04658827ec Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-07-30 17:47:10 +05:30
Madhura Jayaratne
4f93739fc5 Fix typo 2013-07-30 17:46:35 +05:30
Madhura Jayaratne
28b669a1aa Remove redundant checks 2013-07-30 17:46:15 +05:30