Weblate
|
145f77eb6b
|
Merge remote-tracking branch 'origin/master'
|
2012-09-05 07:11:56 +02:00 |
|
Gabor Droszler
|
3b66458f0c
|
Translated using Weblate.
|
2012-09-05 07:11:53 +02:00 |
|
Agron Selimaj
|
4361b419d0
|
Translated using Weblate.
|
2012-09-05 07:11:45 +02:00 |
|
Michal Čihař
|
e9ba7339a7
|
Coding style improvements
|
2012-09-05 07:11:18 +02:00 |
|
Michal Čihař
|
0791b6b5ae
|
Fix unresolved merge conflict
|
2012-09-05 07:10:50 +02:00 |
|
Weblate
|
a0a04a561c
|
Merge remote-tracking branch 'origin/master'
|
2012-09-05 02:57:19 +02:00 |
|
Vojislav Pavić
|
4c601eecf8
|
Translated using Weblate.
|
2012-09-05 02:57:13 +02:00 |
|
Madhura Jayaratne
|
8e8d9a8704
|
Opening braces of function should be in a new line
|
2012-09-05 06:26:15 +05:30 |
|
Madhura Jayaratne
|
60d1d1f486
|
Spaces for clarity
|
2012-09-05 06:23:43 +05:30 |
|
Madhura Jayaratne
|
c29ee86fbe
|
Wrap some long lines
|
2012-09-05 06:16:52 +05:30 |
|
Madhura Jayaratne
|
1d6a054b3c
|
Inline control structures are discouraged
|
2012-09-05 06:12:39 +05:30 |
|
Weblate
|
5c89b93629
|
Merge remote-tracking branch 'origin/master'
|
2012-09-04 22:44:42 +02:00 |
|
Vojislav Pavić
|
fb40264f47
|
Translated using Weblate.
|
2012-09-04 22:44:38 +02:00 |
|
J.M
|
78aad3b7f4
|
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
|
2012-09-04 22:44:14 +02:00 |
|
J.M
|
4cb1cfdbe2
|
Merge branch 'QA_3_5'
|
2012-09-04 22:42:55 +02:00 |
|
J.M
|
5f2b0549c4
|
Add SolOS bug id to changelog
|
2012-09-04 22:42:23 +02:00 |
|
Weblate
|
d15f64c42a
|
Merge remote-tracking branch 'origin/master'
|
2012-09-04 22:36:50 +02:00 |
|
Vojislav Pavić
|
8ad5e72fc8
|
Translated using Weblate.
|
2012-09-04 22:36:47 +02:00 |
|
J.M
|
80911671b1
|
Merge branch 'QA_3_5'
Conflicts:
server_status.php
|
2012-09-04 22:36:10 +02:00 |
|
J.M
|
2fce20d69f
|
Add SunOS to status_monitor.js
|
2012-09-04 22:31:20 +02:00 |
|
J.M
|
b136af3292
|
Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5
|
2012-09-04 22:22:05 +02:00 |
|
J.M
|
fed871cd6f
|
fix SunOS swap calculation
|
2012-09-04 22:19:38 +02:00 |
|
Weblate
|
ed950a6c1c
|
Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5
|
2012-09-04 22:16:07 +02:00 |
|
Vojislav Pavić
|
3c69bc07f0
|
Translated using Weblate.
|
2012-09-04 22:16:04 +02:00 |
|
مترجم حرّ
|
60de108cbd
|
Translated using Weblate.
|
2012-09-04 22:16:01 +02:00 |
|
J.M
|
bf5f51bee2
|
add support for Solaris and FreeBSD system load and memory display in server status
|
2012-09-04 22:15:32 +02:00 |
|
Weblate
|
0354ea06ad
|
Merge remote-tracking branch 'origin/master'
|
2012-09-04 18:16:03 +02:00 |
|
مترجم حرّ
|
6c6bbd9f3d
|
Translated using Weblate.
|
2012-09-04 18:15:59 +02:00 |
|
Madhura Jayaratne
|
ba2ebd43fd
|
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
|
2012-09-04 21:38:00 +05:30 |
|
Madhura Jayaratne
|
2491205393
|
Fix doc blocks
|
2012-09-04 21:35:06 +05:30 |
|
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 |
|
Michal Čihař
|
44d59e7636
|
Various coding style improvements
|
2012-09-04 15:51:02 +02:00 |
|
Michal Čihař
|
69fdc5d209
|
Various coding style improvements
|
2012-09-04 15:43:25 +02:00 |
|
Weblate
|
b47730c845
|
Merge remote-tracking branch 'origin/master'
|
2012-09-04 15:28:36 +02:00 |
|
Vojislav Pavić
|
306973569a
|
Translated using Weblate.
|
2012-09-04 15:28:33 +02:00 |
|
Michal Čihař
|
dff1f6afc3
|
Various coding style improvements
|
2012-09-04 15:28:21 +02:00 |
|
Michal Čihař
|
ff16e8bdd0
|
Use assertInstanceOf instead of manual testing
|
2012-09-04 15:18:30 +02:00 |
|
Michal Čihař
|
5ef6f6a98c
|
Pass correct parameters to _getSQLQuery
|
2012-09-04 15:10:46 +02:00 |
|
Michal Čihař
|
ff9b0d088c
|
Pass correct parameters to _getFromClause
|
2012-09-04 15:10:45 +02:00 |
|
Michal Čihař
|
d233182d3b
|
Pass correct parameters to _getInsDelAndOrCell
|
2012-09-04 15:10:45 +02:00 |
|
Burak Yavuz
|
d1078a19b2
|
Translated using Weblate.
|
2012-09-04 12:09:55 +02:00 |
|
Michal Čihař
|
7d5f433869
|
Translated using Weblate.
|
2012-09-04 10:46:51 +02:00 |
|
Panagiotis Papazoglou
|
ad9845c345
|
Translated using Weblate.
|
2012-09-04 10:33:02 +02:00 |
|
Michal Čihař
|
75e990dd45
|
Merge remote-tracking branch 'origin/QA_3_5'
|
2012-09-04 10:14:12 +02:00 |
|
Vojislav Pavić
|
ff1a14a7f1
|
Translated using Weblate.
|
2012-09-04 10:13:34 +02:00 |
|
Michal Čihař
|
a693d0cc3b
|
Merge remote-tracking branch 'weblate/master'
Conflicts:
po/sr@latin.po
|
2012-09-04 10:12:50 +02:00 |
|
Vojislav Pavić
|
2234feb86f
|
Translated using Weblate.
|
2012-09-04 10:09:04 +02:00 |
|
Vojislav Pavić
|
a20cee6587
|
Translated using Weblate.
|
2012-09-04 08:58:58 +02:00 |
|
Michal Čihař
|
14d7b599a9
|
Merge remote-tracking branch 'weblate/master'
Conflicts:
po/sr@latin.po
|
2012-09-04 08:58:40 +02:00 |
|
