Commit Graph

78618 Commits

Author SHA1 Message Date
Madhura Jayaratne
3577f7fb3b Adjust spaces between labels 2012-09-04 21:33:17 +05:30
Madhura Jayaratne
7b12b12aee Avoid PHP, HTML mix. Improve doc comments 2012-09-04 21:32:11 +05:30
Weblate
61831e2061 Merge remote-tracking branch 'origin/master' 2012-09-03 18:06:30 +02:00
مترجم حرّ
96ac9da632 Translated using Weblate. 2012-09-03 18:06:25 +02:00
Dieter Adriaenssens
1f86e2fb50 improve coding style 2012-09-03 18:06:02 +02:00
Dieter Adriaenssens
4e7383d21c simplify code, wrap long lines 2012-09-03 18:05:50 +02:00
Dieter Adriaenssens
b947fd63c3 improve message 2012-09-03 18:05:01 +02:00
Dieter Adriaenssens
1136a46c74 improve coding style, fix indentation 2012-09-03 18:05:01 +02:00
Michal Čihař
2d8dea9702 Merge remote-tracking branch 'origin/QA_3_5' 2012-09-03 15:04:04 +02:00
Michal Čihař
a547f3d3e2 Escape json reply received from server 2012-09-03 15:03:34 +02:00
Michal Čihař
50edafc088 Load JSON rather than javascript from phpmyadmin.net
Conflicts:
	js/functions.js
	libraries/Header.class.php
2012-09-03 15:03:22 +02:00
Michal Čihař
05a7630c09 Escape json reply received from server 2012-09-03 14:57:59 +02:00
Michal Čihař
8b3756a8d9 Various coding style improvements 2012-09-03 14:51:13 +02:00
Michal Čihař
5917daad9c Various improvements to docblocks 2012-09-03 14:38:09 +02:00
Michal Čihař
a1efa8021d Wrap some long lines 2012-09-03 14:34:30 +02:00
Michal Čihař
cb2a6e448f Merge remote-tracking branch 'origin/QA_3_5' 2012-09-03 09:05:40 +02:00
Michal Čihař
7c9129fa4f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-09-03 09:05:16 +02:00
Michal Čihař
ceaee4471b Fix format strings 2012-09-03 09:05:02 +02:00
Michal Čihař
572735471b Merge remote-tracking branch 'origin/QA_3_5' 2012-09-03 09:03:54 +02:00
Michal Čihař
de617792c9 Fix format strings 2012-09-03 09:03:45 +02:00
مترجم حرّ
0515899085 Translated using Weblate. 2012-09-03 09:02:06 +02:00
Vitor Barbosa
6994532d6b Translated using Weblate. 2012-09-03 09:01:48 +02:00
Rouslan Placella
b2140eaf55 Translated using Weblate. 2012-09-03 09:01:47 +02:00
مترجم حرّ
6a5986aab4 Translated using Weblate. 2012-09-03 09:01:44 +02:00
Dieter Adriaenssens
dfb51338ea fix coding style, wrap long lines 2012-09-02 21:34:24 +02:00
Weblate
fbb076aa78 Merge remote-tracking branch 'origin/master' 2012-09-02 21:03:31 +02:00
Vitor Barbosa
361518d730 Translated using Weblate. 2012-09-02 21:03:28 +02:00
Dieter Adriaenssens
163dba1143 fix coding style 2012-09-02 21:02:51 +02:00
Dieter Adriaenssens
d9bef96b99 simplify code : remove mixed php and html 2012-09-02 20:26:42 +02:00
Dieter Adriaenssens
1174ca3b4f fix coding style 2012-09-02 20:00:40 +02:00
Weblate
663b1bccd6 Merge remote-tracking branch 'origin/master' 2012-09-02 16:57:30 +02:00
ProUser
87e6d51d6a Translated using Weblate. 2012-09-02 16:57:26 +02:00
gurjit dhillon
49832a1046 Translated using Weblate. 2012-09-02 16:57:23 +02:00
Rouslan Placella
cfaefc6188 Translated using Weblate. 2012-09-02 16:57:19 +02:00
مترجم حرّ
7e8770472b Translated using Weblate. 2012-09-02 16:57:15 +02:00
Madhura Jayaratne
5fbb056280 Fix coding style. Remove trailing white spaces 2012-09-02 20:25:44 +05:30
Madhura Jayaratne
2800659eaa Improve documentation 2012-09-02 20:21:15 +05:30
Madhura Jayaratne
72bf04249b Fix indentation 2012-09-02 19:45:01 +05:30
Madhura Jayaratne
46545dea98 Various coding style improvements 2012-09-02 19:43:26 +05:30
Madhura Jayaratne
8bfecfa1e7 Fix multi line condition 2012-09-02 19:36:57 +05:30
Madhura Jayaratne
bc58685d96 Wrap a long line 2012-09-02 19:36:33 +05:30
Madhura Jayaratne
6dbdb95d9a Fix doc comments 2012-09-02 19:36:07 +05:30
Madhura Jayaratne
dec582c93c Do not prefix protected methods with underscore 2012-09-02 19:25:00 +05:30
Madhura Jayaratne
032c239e17 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-09-02 19:13:49 +05:30
ProUser
02d93c239e Translated using Weblate. 2012-09-01 18:25:11 +02:00
Rafael Ferreira
f11c3a50ff Translated using Weblate. 2012-09-01 07:05:03 +02:00
Rafael Ferreira
d42d931929 Translated using Weblate. 2012-09-01 07:04:12 +02:00
Madhura Jayaratne
3711b57df6 Fix coding style 2012-09-01 07:29:48 +05:30
Madhura Jayaratne
458dfeb9bf Add missing package names 2012-08-31 20:45:53 +05:30
Michal Čihař
0a21c865e2 Load JSON rather than javascript from phpmyadmin.net 2012-08-31 15:47:05 +02:00