Commit Graph

88442 Commits

Author SHA1 Message Date
Hugues Peccatte
6104e9557e Fix wrong refactoring.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-21 22:10:06 +01:00
Hugues Peccatte
efd206f1dc Reduce nested levels.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-21 00:06:04 +01:00
Hugues Peccatte
c5839569f8 Reduce nested levels.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-20 23:35:54 +01:00
Hugues Peccatte
d428db6641 Reduce nested levels.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-20 23:35:53 +01:00
Hugues Peccatte
37f90df60d Fix PHPCS errors.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-20 23:34:52 +01:00
Hugues Peccatte
f7f5b48e40 Fix PHPCS errors.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-20 23:34:51 +01:00
Weblate
b6ef52029d Merge remote-tracking branch 'origin/master' 2013-12-20 23:21:59 +01:00
Tony Nascimento
c64311e8d4 Translated using Weblate (Portuguese)
Currently translated at 55.1% (1517 of 2751)
2013-12-20 23:21:04 +01:00
Hugues Peccatte
b6855fa70f Merge branch 'phpdoc' 2013-12-20 23:18:21 +01:00
Hugues Peccatte
f82579055b Update PHPDoc.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-20 23:11:03 +01:00
Domen
bc081c62bb Translated using Weblate (Slovenian)
Currently translated at 100.0% (2751 of 2751)
2013-12-20 22:54:43 +01:00
Kristjan Räts
e0718fce72 Translated using Weblate (Estonian)
Currently translated at 100.0% (2751 of 2751)
2013-12-20 20:40:28 +01:00
Chanaka Indrajith
1441e8864b Revert the commit 7c971c0
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2013-12-20 22:47:20 +05:30
Marc Delisle
220a67f6c3 Merge branch 'QA_4_1' 2013-12-20 06:27:35 -05:00
Marc Delisle
609f72600d Merge commit '00b4801' 2013-12-20 06:27:22 -05:00
Marc Delisle
33f8aa43ff Revert overflow scroll for original theme; add ChangeLog entry for fix of bug #4170
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-20 06:26:43 -05:00
Marc Delisle
bad4e440ec Merge pull request #798 from zixtor/QA_4_1
Revert 4096 and fix nav resize
2013-12-20 03:23:07 -08:00
Matías Bellone
9242825170 Translated using Weblate (Spanish)
Currently translated at 100.0% (2751 of 2751)
2013-12-19 21:21:01 +01:00
Atul Pratap Singh
4c1951a06e fix navigation resizing with window scroll
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2013-12-20 00:24:10 +05:30
Atul Pratap Singh
286d94d424 Revert previous fix for bug#4096
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2013-12-20 00:10:15 +05:30
Marc Delisle
5c59ec266a Translated using Weblate (French)
Currently translated at 100.0% (2751 of 2751)
2013-12-19 18:26:11 +01:00
Burak Yavuz
69b405f6e5 Translated using Weblate (Turkish)
Currently translated at 100.0% (2751 of 2751)
2013-12-19 18:19:02 +01:00
Dieter Adriaenssens
ec916fa1d5 Translated using Weblate (Dutch)
Currently translated at 99.9% (2751 of 2751)
2013-12-19 16:38:22 +01:00
Michal Čihař
2d76b3d958 Translated using Weblate (Czech)
Currently translated at 100.0% (2751 of 2751)
2013-12-19 16:12:13 +01:00
Dieter Adriaenssens
00b48015d6 Translated using Weblate (Dutch)
Currently translated at 100.0% (2749 of 2749)
2013-12-19 16:09:41 +01:00
Madhura Jayaratne
726e7045f6 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-12-19 20:39:25 +05:30
Madhura Jayaratne
158b9ce687 Specify the type of the array
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2013-12-19 20:34:55 +05:30
Madhura Jayaratne
cfcfbded37 Specify visibility
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2013-12-19 20:25:53 +05:30
Madhura Jayaratne
d2c617dd29 Wrap a long line
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2013-12-19 20:19:59 +05:30
Madhura Jayaratne
ef51d97b90 Move the constructor to the top
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2013-12-19 20:19:05 +05:30
Madhura Jayaratne
f9345791b8 Improve documentation comments
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2013-12-19 20:15:38 +05:30
Madhura Jayaratne
1f71554133 Specify visibility
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2013-12-19 20:04:23 +05:30
Panagiotis Papazoglou
5bdf9b563c Translated using Weblate (Greek)
Currently translated at 100.0% (2750 of 2750)
2013-12-19 15:29:03 +01:00
Panagiotis Papazoglou
3d7643f6eb Translated using Weblate (Greek)
Currently translated at 100.0% (2749 of 2749)
2013-12-19 15:24:31 +01:00
Madhura Jayaratne
beaafa4ae5 Merge branch 'QA_4_1'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2013-12-19 19:40:26 +05:30
Madhura Jayaratne
a7e316d799 bug #4190 Fractional seconds cause row update even if the value is not changed
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2013-12-19 19:35:55 +05:30
Marc Delisle
dd45656c20 Update po files 2013-12-19 06:31:41 -05:00
Marc Delisle
aad949191a Update po files 2013-12-19 06:30:54 -05:00
Marc Delisle
fd943ed1cd Merge branch 'QA_4_1' 2013-12-19 06:29:13 -05:00
Marc Delisle
7cfc60323d ChangeLog entry for fix of bug #2760
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-19 06:28:23 -05:00
Marc Delisle
d3fc017131 Code cleanup
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-19 06:26:18 -05:00
Marc Delisle
7ff18f07bc Merge pull request #795 from smita786/QA_4_1
bug fix #2760
2013-12-19 03:12:43 -08:00
Hugues Peccatte
207466d59c Don't use function in for loop test.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-18 22:18:02 +01:00
Hugues Peccatte
493f9c5a1a Don't use function in for loop test.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-18 21:29:34 +01:00
Marc Delisle
8381c6e0e8 Do not mix a call to the display method with an echo statement
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-18 12:54:26 -05:00
Marc Delisle
b2305dcefc Fix merge conflicts
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-18 12:45:03 -05:00
Marc Delisle
9876aeb550 Finish removing the gather suboption of the error handler
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-18 12:37:01 -05:00
Smita Kumari
675e457f50 bug fix #2760
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2013-12-18 19:17:59 +05:30
Marc Delisle
680e549724 Merge branch 'QA_4_1' 2013-12-18 06:35:56 -05:00
Marc Delisle
5220d6ed18 Merge commit '4149aac' 2013-12-18 06:35:38 -05:00