Commit Graph

83935 Commits

Author SHA1 Message Date
Weblate
a484a7310a Merge remote-tracking branch 'origin/master' 2013-06-06 14:49:20 +02:00
Yungu Kim
748a711d10 Translated using Weblate (Korean)
Currently translated at 65.0% (1732 of 2665)
2013-06-06 14:49:16 +02:00
Dadan Setia
2557c92da4 Translated using Weblate (Indonesian)
Currently translated at 70.8% (1886 of 2665)
2013-06-06 14:49:13 +02:00
Dieter Adriaenssens
e56d2e1ae3 Translated using Weblate (Dutch)
Currently translated at 100.0% (2665 of 2665)
2013-06-06 14:49:06 +02:00
Marc Delisle
3d611c386d Merge branch 'QA_4_0' 2013-06-06 08:48:41 -04:00
Marc Delisle
a9fffa4ce4 Merge commit 'ae976ff' 2013-06-06 08:48:33 -04:00
Marc Delisle
eb12fe41a7 bug #3960 NavigationBarIconic config not honored 2013-06-06 08:47:59 -04:00
Domen
282b8def56 Translated using Weblate (Slovenian)
Currently translated at 100.0% (2665 of 2665)
2013-06-05 21:28:33 +02:00
Marc Delisle
7ebeeb8fca Translated using Weblate (French)
Currently translated at 100.0% (2665 of 2665)
2013-06-05 13:51:15 +02:00
Dieter Adriaenssens
67a1cd7c58 Translated using Weblate (Dutch)
Currently translated at 100.0% (2665 of 2665)
2013-06-05 13:40:52 +02:00
Dieter Adriaenssens
ae976ff6c0 Translated using Weblate (Dutch)
Currently translated at 100.0% (2603 of 2603)
2013-06-05 13:39:16 +02:00
Marc Delisle
cbacb2dcaf Merge branch 'QA_4_0' 2013-06-05 06:43:35 -04:00
Marc Delisle
773c5312d9 Fix merge conflict 2013-06-05 06:42:57 -04:00
Marc Delisle
bad0352e03 Merge branch 'MAINT_4_0_3' into QA_4_0 2013-06-05 06:42:20 -04:00
Marc Delisle
3c96596f7d 4.0.3 release 2013-06-05 06:41:53 -04:00
Michal Čihař
8002be2ad8 Highlight PHP without starting <?php tag in docs 2013-06-05 10:29:37 +02:00
Michal Čihař
e63b20e391 Add example for CSP rules adjusting 2013-06-05 10:19:56 +02:00
Michal Čihař
b07177bbac Now it allows images as well 2013-06-05 10:18:36 +02:00
Michal Čihař
56addefcb1 Document when this option was made available 2013-06-05 10:18:11 +02:00
Michal Čihař
b5dfa1c5c4 Merge branch 'QA_4_0' 2013-06-05 10:10:57 +02:00
Michal Čihař
77330abaef Allow CSP for images as well 2013-06-05 10:10:48 +02:00
Weblate
dcee3fa76f Merge remote-tracking branch 'origin/master' 2013-06-05 10:05:32 +02:00
Michal Čihař
4b085c444e Translated using Weblate (Indonesian)
Currently translated at 70.7% (1883 of 2665)
2013-06-05 10:05:27 +02:00
Michal Čihař
bfa6282083 Merge branch 'QA_4_0' 2013-06-05 10:04:57 +02:00
Michal Čihař
eb29af585a Allow customization of CSP headers
This is useful for inserting custom javascript in header/footer files.
2013-06-05 10:04:06 +02:00
Michal Čihař
bc0bd0281c Translated using Weblate (Czech)
Currently translated at 100.0% (2665 of 2665)
2013-06-05 09:02:06 +02:00
Kristjan Räts
8754c98522 Translated using Weblate (Estonian)
Currently translated at 100.0% (2665 of 2665)
2013-06-05 08:34:27 +02:00
Panagiotis Papazoglou
585010ee38 Translated using Weblate (Greek)
Currently translated at 100.0% (2665 of 2665)
2013-06-05 08:16:28 +02:00
Marc Delisle
1c60c2ba3b Merge pull request #403 from xmujay/0602
refactor server_status.php: 1. using better function name 2. split long lines
2013-06-04 09:58:42 -07:00
Matías Bellone
f9582a2cda Translated using Weblate (Spanish)
Currently translated at 100.0% (2665 of 2665)
2013-06-04 17:59:19 +02:00
Burak Yavuz
d7bf937fcd Translated using Weblate (Turkish)
Currently translated at 100.0% (2665 of 2665)
2013-06-04 17:56:27 +02:00
xmujay
c51e6d66a1 split long lines 2013-06-04 23:51:36 +08:00
xmujay
e7a2845690 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into 0602 2013-06-04 23:25:44 +08:00
Dieter Adriaenssens
42685f8a00 Update po files 2013-06-04 17:19:46 +02:00
Dieter Adriaenssens
738caedafb RFE 1432, add table name to message 2013-06-04 17:18:21 +02:00
Michal Čihař
d8ef86fa40 Translated using Weblate (Czech)
Currently translated at 100.0% (2665 of 2665)
2013-06-04 15:26:01 +02:00
Michal Čihař
ff5991656d Translated using Weblate (Kannada)
Currently translated at 0.0% (1 of 2665)
2013-06-04 15:25:21 +02:00
Weblate
73af3fc52e Merge remote-tracking branch 'origin/master' 2013-06-04 15:11:06 +02:00
Michal Čihař
e4939fd3d5 Merge remote-tracking branch 'origin/QA_4_0' 2013-06-04 15:03:50 +02:00
Weblate
34da3eb671 Merge remote-tracking branch 'origin/master' 2013-06-04 15:02:44 +02:00
Dadan Setia
f7e0876444 Translated using Weblate (Indonesian)
Currently translated at 70.7% (1883 of 2665)
2013-06-04 15:02:37 +02:00
Michal Čihař
a034965517 Add Kannada language 2013-06-04 15:02:16 +02:00
Domen
0ed704c7b8 Translated using Weblate (Slovenian)
Currently translated at 100.0% (2603 of 2603)
2013-06-04 11:10:59 +02:00
Domen
a9a3591270 Translated using Weblate (Slovenian)
Currently translated at 100.0% (2665 of 2665)
2013-06-04 11:10:48 +02:00
Weblate
692c8dfd59 Merge remote-tracking branch 'origin/master' 2013-06-04 11:00:48 +02:00
Dadan Setia
cd24398bcf Translated using Weblate (Indonesian)
Currently translated at 70.6% (1882 of 2665)
2013-06-04 11:00:38 +02:00
Dieter Adriaenssens
cf0a7b6cac Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-06-04 11:00:07 +02:00
Dieter Adriaenssens
c6fd32f85d Merge branch 'QA_4_0'
Conflicts:
	sql.php
2013-06-04 10:54:04 +02:00
Kristjan Räts
77e4884496 Translated using Weblate (Estonian)
Currently translated at 100.0% (2665 of 2665)
2013-06-04 10:53:45 +02:00
Kristjan Räts
e12ee0519e Translated using Weblate (Estonian)
Currently translated at 100.0% (2603 of 2603)
2013-06-04 10:53:32 +02:00