Commit Graph

76137 Commits

Author SHA1 Message Date
Michal Čihař
d9019aeae4 Merge remote-tracking branch 'origin/QA_3_5' 2012-05-21 14:24:45 +02:00
ronniery borges
bc514a5c5a Translated using Weblate. 2012-05-21 14:21:31 +02:00
Yuichiro Takahashi
6452e8e780 Translated using Weblate. 2012-05-21 14:21:30 +02:00
Jukka Penttinen
391300a12d Translated using Weblate. 2012-05-21 14:21:28 +02:00
Michal Čihař
ba3326b76c Merge remote-tracking branch 'origin/master' 2012-05-21 10:13:47 +02:00
dilan kurdistani
a3cff75239 Translated using Weblate. 2012-05-21 10:13:36 +02:00
Jukka Penttinen
6766b7a970 Translated using Weblate. 2012-05-21 10:13:35 +02:00
Dieter Adriaenssens
2cbc66127c wrap long lines, improve coding style 2012-05-21 10:13:05 +02:00
ProUser
1b3259d876 Translated using Weblate. 2012-05-20 21:47:27 +02:00
renwar kurd
edca6dd0ee Translated using Weblate. 2012-05-19 23:57:38 +02:00
dilan kurdistani
2410b0c7fd Translated using Weblate. 2012-05-19 22:48:18 +02:00
Michal Čihař
b51c04818a Merge remote-tracking branch 'origin/master' 2012-05-19 19:18:16 +02:00
Rouslan Placella
abe49f0d60 Fixed conflict when loading CSS sprites 2012-05-19 18:17:54 +01:00
Rouslan Placella
fa9dbfcd30 Fixed wrong path when loading CSS files 2012-05-19 18:17:30 +01:00
Michal Čihař
0d831153a4 Merge remote-tracking branch 'origin/master' 2012-05-19 18:41:50 +02:00
Jukka Penttinen
61deaac932 Translated using Weblate. 2012-05-19 18:41:36 +02:00
Dieter Adriaenssens
291e2480d2 rename private variable, should start with underscore 2012-05-19 18:41:18 +02:00
Dieter Adriaenssens
5a3299f2c5 improve documentation, assign public directive to methods 2012-05-19 18:40:19 +02:00
Michal Čihař
fdf209c283 Merge remote-tracking branch 'origin/master' 2012-05-19 12:10:04 +02:00
ProUser
a32450c46e Translated using Weblate. 2012-05-19 12:09:59 +02:00
ronniery borges
f86ed131a5 Translated using Weblate. 2012-05-19 12:09:58 +02:00
Aso Naderi
db412fa6b2 Translated using Weblate. 2012-05-19 12:09:58 +02:00
Yuichiro Takahashi
2b35af8c61 Translated using Weblate. 2012-05-19 12:09:57 +02:00
Jukka Penttinen
9357ca3d51 Translated using Weblate. 2012-05-19 12:09:57 +02:00
Michal Čihař
041a9e065d Merge pull request #67 from roccivic/css
Over-ridable stylesheets
2012-05-19 03:09:53 -07:00
Rouslan Placella
343d3fbf71 Split CSS into overridable files 2012-05-18 22:47:36 +01:00
Rouslan Placella
e8ef26f7fb Created FALLBACK_THEME constant in Theme manager class and set it to pmahomme 2012-05-18 20:53:12 +01:00
Rouslan Placella
933ad71021 Merged CSS stylesheets 2012-05-18 19:14:09 +01:00
Victor Volkov
ed47a2ba66 Translated using Weblate. 2012-05-18 09:57:52 +02:00
Michal Čihař
1f2cae8e37 Merge remote-tracking branch 'origin/master' 2012-05-18 09:56:01 +02:00
Victor Volkov
895e49caf0 Translated using Weblate. 2012-05-18 09:55:59 +02:00
Michal Čihař
1536df7050 Merge remote-tracking branch 'origin/QA_3_5' 2012-05-18 09:55:49 +02:00
Victor Volkov
616f527da0 Translated using Weblate. 2012-05-18 09:55:09 +02:00
Victor Volkov
312d33613a Translated using Weblate. 2012-05-18 09:54:50 +02:00
Стоян Димитров
5f13d5bc7f Translated using Weblate. 2012-05-18 09:54:36 +02:00
Michal Čihař
f57f1381dd Merge remote-tracking branch 'origin/master' 2012-05-18 02:17:51 +02:00
ProUser
55be2ed8d4 Translated using Weblate. 2012-05-18 02:17:38 +02:00
Darya Said
8b13b710c0 Translated using Weblate. 2012-05-18 02:17:37 +02:00
Стоян Димитров
9c33a6ff03 Translated using Weblate. 2012-05-18 02:17:36 +02:00
Marc Delisle
45e0398d4c Merge pull request #61 from nicokaiser/TableStatusCache
Add StatsCache* config options for caching TABLE STATUS output in APC (if available)
2012-05-17 17:17:31 -07:00
LiivaneLord
64996d4a65 Translated using Weblate. 2012-05-17 23:33:29 +02:00
Domen
80d935e5d1 Translated using Weblate. 2012-05-17 19:01:36 +02:00
Matías Bellone
eb16216007 Translated using Weblate. 2012-05-17 16:58:51 +02:00
Marc Delisle
7d8c53ebb3 Merge pull request #65 from nijel/master
Use yui compressor for js
2012-05-17 07:06:39 -07:00
Michal Čihař
daaf6dff2d Merge branch 'setup-css' of https://github.com/mynetx/phpmyadmin into merge
Conflicts:
	setup/index.php
2012-05-17 15:56:11 +02:00
Michal Čihař
5c4dd565d5 Translated using Weblate. 2012-05-17 15:35:46 +02:00
Michal Čihař
2ef87dbe9e Merge remote-tracking branch 'origin/QA_3_5' 2012-05-17 15:29:41 +02:00
Michal Čihař
239c4abe24 Translated using Weblate. 2012-05-17 15:29:10 +02:00
Michal Čihař
0ff5046b84 Translated using Weblate. 2012-05-17 15:29:10 +02:00
Michal Čihař
fcb522053a Translated using Weblate. 2012-05-17 15:29:10 +02:00