gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,429 Commits 12 Branches 481 Tags 2.4 GiB
220a67f6c3
Commit Graph

88429 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marc Delisle
a88e8fa460 bug #4178 Quick edit for BIT type does not work 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-18 06:34:25 -05:00
Marc Delisle
3459c38bf0 Fix redisplay of bit value after grid editing 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-18 06:33:02 -05:00
Abhishek Kandoi
ef7906b3e0 Fixes bug #4178: Quick edit for BIT type doesn't work 
Signed-off-by: Abhishek Kandoi <abhikandoi2000@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-18 06:31:37 -05:00
Madhura Jayaratne
7cf1a744a7 Fix coding style 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2013-12-18 11:22:58 +05:30
Madhura Jayaratne
108cb3cc1b Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-12-18 07:44:40 +05:30
Madhura Jayaratne
1f6480e632 Exclude third party libraries but tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2013-12-18 07:43:42 +05:30
Michal Čihař
5c0f090061 Skip test if curl extension is missing 2013-12-17 22:35:18 +01:00
Chanaka Indrajith
7c971c0409 Improved documentation and fixed code violations in stream.php 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2013-12-18 01:34:05 +05:30
Hugues Peccatte
ab42fd2ac9 PHPCS update. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-17 18:53:14 +01:00
Michal Čihař
5e1a803c9f Revert "Try running tests with HipHop VM" 
This reverts commit f5bf034154.
 2013-12-17 15:58:37 +01:00
Weblate
4149aacf32 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2013-12-17 15:38:04 +01:00
Balázs Úr
beb2a844a1 Translated using Weblate (Hungarian) 
Currently translated at 98.3% (2704 of 2749)
 2013-12-17 15:36:51 +01:00
Aputsiaq Niels Janussen
ae3c650f3e Translated using Weblate (Danish) 
Currently translated at 99.8% (2746 of 2749)
 2013-12-17 15:36:23 +01:00