Commit Graph

80172 Commits

Author SHA1 Message Date
Marc Delisle
705fd0ff6e Fix merge conflicts 2012-11-13 12:56:18 -05:00
Marc Delisle
fb3c180910 Merge branch 'QA_3_5' 2012-11-13 12:53:31 -05:00
Marc Delisle
07f7ba239d bug #3585695 [CSS] Font size in inline query editor is way too big 2012-11-13 12:52:02 -05:00
Michal Čihař
922c62a881 Add some headers 2012-11-13 14:29:08 +01:00
Michal Čihař
503f5ad2aa This redirects anyway 2012-11-13 14:27:48 +01:00
Michal Čihař
ba5d1a782a Remove readme.rst when releasing 2012-11-13 14:27:32 +01:00
Michal Čihař
15b554c8b6 Use docs.phpmyadmin.net instead of phpmyadmin.readthedocs.org 2012-11-13 14:19:44 +01:00
Michal Čihař
0d2ed1cee1 Add README.rst to show on Github 2012-11-13 14:19:44 +01:00
Michal Čihař
ba6a55b7d9 Cleanup 2012-11-13 11:43:01 +01:00
Michal Čihař
4bbacc9102 Cleanup some extra new lines 2012-11-13 11:33:22 +01:00
Michal Čihař
66b8a59ecf Reorder config option description to be closer to what we have in setup (still not complete) 2012-11-13 11:24:10 +01:00
Michal Čihař
3fbad57855 Use standard domain for examples 2012-11-13 11:18:38 +01:00
Michal Čihař
09272b47f3 Merge remote-tracking branch 'origin/QA_3_5' 2012-11-13 08:52:03 +01:00
Michal Čihař
8b8f155d8b Ignore locale files 2012-11-13 08:51:53 +01:00
Burak Yavuz
69faa85abf Translated using Weblate. 2012-11-13 08:50:43 +01:00
Matías Bellone
fcfb6faf14 Translated using Weblate. 2012-11-13 08:50:42 +01:00
Burak Yavuz
485bcec50b Translated using Weblate. 2012-11-13 08:50:27 +01:00
Matías Bellone
90cf357ef6 Translated using Weblate. 2012-11-13 08:50:26 +01:00
Weblate
d1aea7d4a1 Merge remote-tracking branch 'origin/master' 2012-11-12 19:59:44 +01:00
Burak Yavuz
ff61a37851 Translated using Weblate. 2012-11-12 19:59:41 +01:00
Michal Čihař
879e7507bb Include util class for setup 2012-11-12 19:59:25 +01:00
Weblate
348c59a342 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-11-12 18:46:37 +01:00
Michal Čihař
5c2c4ca26d Translated using Weblate. 2012-11-12 18:46:21 +01:00
Marc Delisle
1518de6cdf Merge branch 'QA_3_5' 2012-11-12 12:44:15 -05:00
Marc Delisle
94fa51893a bug #3586389 [setup] Cannot switch language in /setup 2012-11-12 12:43:58 -05:00
Domen
4d784eb4f6 Translated using Weblate. 2012-11-12 18:28:50 +01:00
Chanaka Indrajith
ae6a1d6511 Remove issue with un expected string in table relation view 2012-11-12 21:59:18 +05:30
Weblate
e0fac143f3 Merge remote-tracking branch 'origin/master' 2012-11-12 15:01:59 +01:00
Michal Čihař
2fd3f7fcdf Merge pull request #109 from Slamdunk/phpunit-colors
Colorify PHPUnit
2012-11-12 06:01:47 -08:00
Weblate
473df103cf Merge remote-tracking branch 'origin/master' 2012-11-12 14:56:13 +01:00
Michal Čihař
12bde800ad Various improvements to docs 2012-11-12 14:55:22 +01:00
Filippo Tessarotto
802b88ea4c Colorify PHPUnit 2012-11-12 14:52:44 +01:00
Weblate
cf3dc20a72 Merge remote-tracking branch 'origin/master' 2012-11-12 14:41:53 +01:00
Michal Čihař
e076bb851f Improve markup 2012-11-12 14:40:53 +01:00
Michal Čihař
7a739845e9 Correctly show as raw string 2012-11-12 14:39:57 +01:00
Michal Čihař
061d53df35 Group cookie parameters to one section 2012-11-12 14:39:01 +01:00
Michal Čihař
46c295c4d9 Improve markup 2012-11-12 14:37:58 +01:00
Weblate
fc096914eb Merge remote-tracking branch 'origin/master' 2012-11-12 14:36:20 +01:00
Michal Čihař
c1be02da32 Move OBGzip documentation to server section 2012-11-12 14:34:41 +01:00
Weblate
1f53455ecb Merge remote-tracking branch 'origin/master' 2012-11-12 14:32:26 +01:00
Michal Čihař
17504d5132 Add some tips for securing phpMyAdmin 2012-11-12 14:32:00 +01:00
Weblate
f9cbd9995d Merge remote-tracking branch 'origin/master' 2012-11-12 14:27:58 +01:00
Michal Čihař
ae84e704b5 Add missing link to configuration 2012-11-12 14:27:35 +01:00
Weblate
084a66fc2f Merge remote-tracking branch 'origin/master' 2012-11-12 14:26:08 +01:00
Michal Čihař
fb6db32167 Add missing link to configuration 2012-11-12 14:24:52 +01:00
Weblate
1ef388cb0c Merge remote-tracking branch 'origin/master' 2012-11-12 14:21:21 +01:00
Marc Delisle
ffdd27b81f Translated using Weblate. 2012-11-12 14:21:16 +01:00
Michal Čihař
1a6c57a75e Update po files 2012-11-12 14:19:44 +01:00
Michal Čihař
fa2a891b3b Prevent scanning release directory 2012-11-12 14:19:14 +01:00
Michal Čihař
a6e5286467 Fix links to FAQ 2012-11-12 14:15:45 +01:00