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

88404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michal Čihař
f5bf034154 Try running tests with HipHop VM 2013-12-17 15:26:43 +01:00
Marc Delisle
a83ca394b8 4.1.2-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-17 05:55:25 -05:00
Marc Delisle
94edb81552 Merge commit '60b0631' 2013-12-17 05:55:09 -05:00
Marc Delisle
60b063116a 4.1.2-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-17 05:52:54 -05:00
Weblate
664b9d9435 Merge remote-tracking branch 'origin/master' 2013-12-17 08:15:02 +01:00
Aputsiaq Niels Janussen
378cbe1ee7 Translated using Weblate (Danish) 
Currently translated at 99.7% (2744 of 2750)
 2013-12-17 08:15:00 +01:00
Michal Čihař
9030d27deb Translated using Weblate (Czech) 
Currently translated at 100.0% (2750 of 2750)
 2013-12-17 08:14:57 +01:00
Hugues Peccatte
155ef3e646 Add nested level rule. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-17 08:04:41 +01:00
Hugues Peccatte
f13feeb7f1 Revert "PHPCS update." 
This reverts commit 641863b747.
 2013-12-16 19:43:26 +01:00
Hugues Peccatte
4f5d2de848 Revert "PHPCS update." 
This reverts commit ba19e6efbe.
 2013-12-16 19:43:19 +01:00
Hugues Peccatte
0488eca37a Merge pull request #790 from Tithugues/phpcs 
PHPCS update.
 2013-12-16 10:08:45 -08:00
Marc Delisle
2588725b02 Merge branch 'QA_4_1' 2013-12-16 12:57:36 -05:00
Marc Delisle
9ca0b3516b ChangeLog entry for fix of bug #4185 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-16 12:56:28 -05:00
Archit Verma
f63a36fbf8 bug fix #4185; changed action to import.php 
Signed-off-by: Archit Verma <architv07@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-16 12:54:09 -05:00
Weblate
8f795c0128 Merge remote-tracking branch 'origin/master' 2013-12-16 18:47:36 +01:00
Burak Yavuz
d0c09e7748 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2750 of 2750)
 2013-12-16 18:47:32 +01:00
Chanaka Indrajith
eca8f22a05 Fixed some code violations in rte_words.lib.php 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2013-12-16 21:46:10 +05:30
Chanaka Indrajith
d4eba3d1d8 Fixed code violation in rte_triggers.lib.php 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2013-12-16 21:43:11 +05:30
Chanaka Indrajith
88b89239bc Fixed code violations in rte_events.lib.php 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2013-12-16 21:37:48 +05:30
Weblate
d7d55b7c7c Merge remote-tracking branch 'origin/master' 2013-12-15 21:39:54 +01:00
Balázs Úr
d2ee738cf3 Translated using Weblate (Hungarian) 
Currently translated at 98.1% (2700 of 2750)
 2013-12-15 21:39:51 +01:00
Domen
1e15e9ec8f Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2750 of 2750)
 2013-12-15 21:39:48 +01:00
Hugues Peccatte
ba19e6efbe PHPCS update. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-15 21:05:52 +01:00
Marc Delisle
6d101aa025 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-15 14:12:35 -05:00
Marc Delisle
93d4b37e34 Merge branch 'QA_4_1' 2013-12-15 13:43:35 -05:00