Commit Graph

76383 Commits

Author SHA1 Message Date
Michal Čihař
201d15e6d3 Merge remote-tracking branch 'origin/master' 2012-05-29 18:27:18 +02:00
Madhura Jayaratne
27e6c2ac1b Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Conflicts:
	libraries/common.lib.php
2012-05-29 21:54:23 +05:30
Madhura Jayaratne
15b60bd2d4 Revert to avoid notices on undefined variables 2012-05-29 21:43:04 +05:30
Michal Čihař
78eb8a8f98 Merge remote-tracking branch 'origin/master' 2012-05-29 17:34:17 +02:00
Michal Čihař
9945415ef2 Some coding style improvements 2012-05-29 17:33:43 +02:00
Michal Čihař
33bfd831ce Wrap some long lines 2012-05-29 17:31:06 +02:00
Michal Čihař
2cd51494d1 Add file level comment 2012-05-29 17:27:43 +02:00
Michal Čihař
4b8c7ba95e Merge remote-tracking branch 'origin/master' 2012-05-29 17:23:08 +02:00
Michal Čihař
cac03907ef Wrap long lines 2012-05-29 17:22:52 +02:00
Michal Čihař
d026770686 Wrap long line 2012-05-29 17:20:16 +02:00
Michal Čihař
f71adf5c9b Wrap long line 2012-05-29 17:20:06 +02:00
Michal Čihař
bae0dba5f4 Concatenate fallback path only once 2012-05-29 17:19:41 +02:00
Michal Čihař
cf40a064e9 Better naming for function 2012-05-29 17:17:53 +02:00
Michal Čihař
c79566ed60 Document new behaviour 2012-05-29 17:17:00 +02:00
Michal Čihař
c509c43fc7 pmahomme is now the fallback theme 2012-05-29 17:16:22 +02:00
Michal Čihař
ee10ee14eb Point to new fallback theme 2012-05-29 17:15:40 +02:00
Michal Čihař
47d42f95d8 Drop second set of PMD icons 2012-05-29 17:15:08 +02:00
Michal Čihař
84871f3056 Load remaining PMD images using new loader 2012-05-29 17:13:45 +02:00
Michal Čihař
6b6020c5e8 Fix typo 2012-05-29 17:10:25 +02:00
Michal Čihař
e4f3bfd404 Use new syntax for loading pmd images 2012-05-29 17:07:45 +02:00
Michal Čihař
4cf1d610cd Fallback to fallback theme for images not found in existing 2012-05-29 17:06:46 +02:00
Michal Čihař
39df7de25b Whitespace cleanup 2012-05-29 17:05:42 +02:00
Michal Čihař
37c289adca Allow to specify file name to getImgPath 2012-05-29 17:01:37 +02:00
Michal Čihař
70c5c825c6 Merge remote-tracking branch 'origin/master' 2012-05-29 16:52:10 +02:00
Michal Čihař
5139585b6c Wrap some function calls 2012-05-29 16:51:56 +02:00
Michal Čihař
234e432323 Reformat comments 2012-05-29 16:48:16 +02:00
Michal Čihař
d28ac79fc3 Coding style improvement 2012-05-29 16:47:29 +02:00
Michal Čihař
7736cad4ef Use count instead of sizeof 2012-05-29 16:47:01 +02:00
Michal Čihař
00e21a04d9 Wrap some more lines 2012-05-29 16:46:23 +02:00
Michal Čihař
624d0b2fc0 Wrap some long lines 2012-05-29 16:43:11 +02:00
Michal Čihař
cc79df9e8d Wrap some comments 2012-05-29 16:37:29 +02:00
Michal Čihař
ae0b9c84d1 Merge remote-tracking branch 'origin/master' 2012-05-29 16:29:43 +02:00
Matías Bellone
718815029c Translated using Weblate. 2012-05-29 16:29:40 +02:00
Michal Čihař
73e56724da Wrap some long lines 2012-05-29 16:29:25 +02:00
Michal Čihař
3dc6c93967 Document $display parameter 2012-05-29 16:21:37 +02:00
Michal Čihař
186515ed8e Saner function name 2012-05-29 16:16:59 +02:00
Michal Čihař
2260f89ecc Document no return values 2012-05-29 16:16:25 +02:00
Michal Čihař
6f136e4d2a Merge remote-tracking branch 'origin/master' 2012-05-29 15:46:07 +02:00
Matías Bellone
6d96cca0ff Translated using Weblate. 2012-05-29 15:46:05 +02:00
Michal Čihař
2a6368160c Move also colors for CodeMirror to separate CSS file 2012-05-29 15:45:38 +02:00
Michal Čihař
b79fe06b9c Move codemirror css to separate file 2012-05-29 15:44:59 +02:00
Michal Čihař
e16d803e78 Single place to process font size 2012-05-29 15:44:31 +02:00
Michal Čihař
ffff19675e Merge remote-tracking branch 'origin/master' 2012-05-29 15:33:23 +02:00
Michal Čihař
cff9d9d90e Wrap long lines 2012-05-29 15:32:44 +02:00
Michal Čihař
10e2d696c0 Merge remote-tracking branch 'origin/master' 2012-05-29 15:28:35 +02:00
Michal Čihař
fbd366ee38 Reduce indentation 2012-05-29 15:27:09 +02:00
Michal Čihař
2e8fb095be Various coding style fixes 2012-05-29 15:25:34 +02:00
Michal Čihař
ce889267c1 Merge remote-tracking branch 'origin/master' 2012-05-29 15:20:46 +02:00
Thales Carpi
e96e330495 Translated using Weblate. 2012-05-29 15:20:43 +02:00
Michal Čihař
f6621b31e2 Coding style improvements 2012-05-29 15:20:31 +02:00