Commit Graph

72983 Commits

Author SHA1 Message Date
Michal Čihař
0787ce9587 Merge remote-tracking branch 'origin/QA_3_5' 2012-04-02 15:28:16 +02:00
Michal Čihař
49b0ce4472 Merge branch 'MAINT_3_5_0' into QA_3_5 2012-04-02 15:27:24 +02:00
Michal Čihař
53df6ad399 Merge remote-tracking branch 'origin/QA_3_4' into MAINT_3_5_0 2012-04-02 15:27:05 +02:00
Yuichiro Takahashi
6158a769ea Translated using Weblate. 2012-04-02 15:25:20 +02:00
Yuichiro Takahashi
6072fa8537 Translated using Weblate. 2012-04-02 15:25:18 +02:00
Michal Čihař
48c2f5906b Merge remote-tracking branch 'origin/master' 2012-04-02 14:49:26 +02:00
Yasitha Pandithawatta
1def2973ac PmaSeleniumPrivilegesTest and PmaSeleniumXssTest are fixed 2012-04-02 14:47:14 +02:00
Michal Čihař
d3cb706ff8 Merge remote-tracking branch 'origin/master' 2012-04-02 13:23:13 +02:00
Abdurahman Taskibaev
6504d1b227 Translated using Weblate. 2012-04-02 13:23:09 +02:00
Yuichiro Takahashi
6defae278e Translated using Weblate. 2012-04-02 13:23:09 +02:00
Michal Čihař
648ad3ebd2 Merge pull request #12 from alexukf/small_fixes
remove global.inc.php
2012-04-02 04:23:05 -07:00
jandos omirb3k
2ea08885e4 Translated using Weblate. 2012-04-02 11:31:54 +02:00
Michal Čihař
14ed639371 Merge remote-tracking branch 'origin/QA_3_5' 2012-04-02 09:55:58 +02:00
Michal Čihař
67f5ba5bf3 Merge branch 'MAINT_3_5_0' into QA_3_5 2012-04-02 09:55:05 +02:00
Michal Čihař
94eb2dd6c5 Merge remote-tracking branch 'origin/QA_3_4' into MAINT_3_5_0 2012-04-02 09:54:43 +02:00
Michal Čihař
4c7d3c0e28 Merge remote-tracking branch 'origin/master' 2012-04-02 09:53:01 +02:00
Michal Čihař
517aa61271 Coding style 2012-04-02 09:51:15 +02:00
Michal Čihař
7464f215aa Merge remote-tracking branch 'origin/QA_3_5' 2012-04-02 09:50:43 +02:00
Michal Čihař
2db8da2ef9 Merge remote-tracking branch 'origin/MAINT_3_5_0' into MAINT_3_5_0 2012-04-02 09:50:11 +02:00
Michal Čihař
1d70667bdb Merge branch 'MAINT_3_5_0' into QA_3_5 2012-04-02 09:49:48 +02:00
Michal Čihař
e7517ed268 Merge remote-tracking branch 'origin/QA_3_4' into MAINT_3_5_0 2012-04-02 09:49:01 +02:00
Abdurahman Taskibaev
9894b68e49 Translated using Weblate. 2012-04-02 09:48:20 +02:00
Michal Čihař
f9db7e790c Merge remote-tracking branch 'origin/QA_3_4' into QA_3_4 2012-04-02 09:48:03 +02:00
Michal Čihař
8972ac9c15 Verify we got string 2012-04-02 09:47:46 +02:00
Sabions slOve
f15e0399de Translated using Weblate. 2012-04-02 05:02:14 +02:00
Yuichiro Takahashi
5b07e6cd63 Translated using Weblate. 2012-04-02 05:02:12 +02:00
Yuichiro Takahashi
f475825f1f Translated using Weblate. 2012-04-02 05:01:06 +02:00
Marc Delisle
e654bb428b Translated using Weblate. 2012-04-02 05:01:04 +02:00
Yuichiro Takahashi
244a8c2c60 Translated using Weblate. 2012-04-02 05:00:35 +02:00
Marc Delisle
303a8c7770 Translated using Weblate. 2012-04-02 05:00:33 +02:00
Alex Marin
8e37333b76 modified Documentation regarding global.inc.php 2012-04-02 03:56:00 +03:00
Alex Marin
c5f9cafa97 deleted global.inc.php after moving its explanatory comments 2012-04-02 03:56:00 +03:00
Alex Marin
6a9eae6fb8 moved PMA_transformation_global_html_replace to another file and removed include paths 2012-04-02 03:56:00 +03:00
Michal Čihař
07e5c39772 Merge remote-tracking branch 'origin/master' 2012-04-01 20:20:10 +02:00
Jo Michael
5b09d0f066 Cleanup HTML5 validity issues 2012-04-01 20:14:50 +02:00
Jo Michael
00b897ba34 Allow js_includes wrapped in IE-conditional comments 2012-04-01 19:15:02 +02:00
Jo Michael
570e7cdae8 Fixed spacing for inline edit link 2012-04-01 16:28:43 +02:00
Michal Čihař
503c0dd720 Merge remote-tracking branch 'origin/master' 2012-04-01 16:20:19 +02:00
Jo Michael
844c0e5e79 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-04-01 16:19:13 +02:00
Jo Michael
4f0a8e961d Fixed wrong padding on errors and messages in RTL locales 2012-04-01 16:17:33 +02:00
Cédric Corazza
4066efe556 Translated using Weblate. 2012-04-01 15:15:43 +02:00
Cédric Corazza
1719f09e7d Translated using Weblate. 2012-04-01 15:15:35 +02:00
Cédric Corazza
79d9970a39 Translated using Weblate. 2012-04-01 15:15:23 +02:00
Michal Čihař
8265f15d49 Merge remote-tracking branch 'origin/master' 2012-04-01 15:15:11 +02:00
Yuichiro Takahashi
b72f894683 Translated using Weblate. 2012-04-01 15:15:09 +02:00
Marc Delisle
e6f04061ec Merge pull request #11 from alexukf/small_fixes
Small fixes in libraries/transformations/global.inc.php
2012-04-01 06:15:02 -07:00
Alex Marin
b7d615c8bf add comment to function 2012-04-01 14:41:50 +03:00
Alex Marin
74492de2ad remove unused argument from PMA_transformation_global_html_replace 2012-04-01 14:03:12 +03:00
Alex Marin
1c99e59eaf coding style improvements 2012-04-01 14:01:43 +03:00
Alex Marin
ce5ed096e6 remove unused functions PMA_transformation_global_plain and PMA_transformation_global_html 2012-04-01 13:25:02 +03:00