gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,029 Commits 12 Branches 481 Tags 2.4 GiB
9f8615dfb4
Commit Graph

232 Commits

Author SHA1 Message Date
Marc Delisle
d20f0fee78 Merge branch 'QA_4_1' 2014-02-16 12:57:37 -05:00
Marc Delisle
06bd132d46 bug #4287 Printview - Always one column too much 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-16 12:57:01 -05:00
Marc Delisle
ae163e4d67 Merge commit '2453a15' 2014-02-03 12:30:23 -05:00
Michal Čihař
2caa9aac7b Merge remote-tracking branch 'origin/QA_4_1' 
Conflicts:
	libraries/DisplayResults.class.php
 2014-02-03 09:25:00 +01:00
Michal Čihař
f5b8267ed0 Remove string at the end of file 2014-02-03 09:24:10 +01:00
Viduranga Wijesooriya
2453a15174 #1498 Add timepicker for 'TIME' type 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-02-03 09:28:20 +05:30
Hugues Peccatte
ddf0b8d632 Minor PHPCS corrections. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-01-31 21:59:29 +01:00
Hugues Peccatte
e729237a2d Minor PHPCS corrections. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-01-31 21:45:05 +01:00
Marc Delisle
82a549714e Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-31 08:22:29 -05:00
Viduranga Wijesooriya
8cc01b38ae bug#4257 - fixed test failures 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-01-31 12:09:46 +05:30
Viduranga Wijesooriya
d483b9f03a fixed bug #4257 Hide fractional seconds 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-01-30 16:09:55 +05:30
Marc Delisle
3d72b1cc87 Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-24 08:24:14 -05:00
Michal Čihař
67242280e2 Avoid concatenating message, it can be hard to properly translate 
Signed-off-by: Michal Čihař <mcihar@suse.cz>
 2014-01-23 10:48:55 +01:00
Michal Čihař
479caffc14 End sentences with punctuation 
Signed-off-by: Michal Čihař <mcihar@suse.cz>
 2014-01-23 10:43:50 +01:00
Madhura Jayaratne
6335b10574 Fix coding style 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-08 14:35:15 +05:30
Marc Delisle
336d9decba Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-06 08:47:44 -05:00
Michal Čihař
04f98964ec End sentence with full stop 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-01-06 12:55:31 +01:00
Marc Delisle
870561686d Merge branch 'QA_4_1' 2014-01-03 13:02:14 -05:00
Marc Delisle
157154f20d bug #3885 Additional fix for this bug 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-03 13:00:02 -05:00
Hugues Peccatte
4f05a8abfa Merge pull request #808 from Tithugues/nestedLevels 
Nested levels
 2013-12-27 05:33:10 -08:00
Hugues Peccatte
f212321f88 Unset unused local variables. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-21 23:27:33 +01:00
Hugues Peccatte
24158361d3 Reduce nested levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-21 23:24:44 +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
Marc Delisle
63b1af983f Make the choices similar to other directives 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-05 13:27:54 -05:00
Chanaka Indrajith
30522c8d5f Rename the global variable from row_action_type to RowActionType 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2013-12-05 23:31:50 +05:30
Chanaka Indrajith
113f8f490e Feature 1455 - Display image,text or both in table row actions area 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2013-12-04 23:59:08 +05:30
Hugues Peccatte
3431c6be8e Fix sort on columns which uses function with column between back quotes. 2013-11-15 22:30:34 +01:00
Marc Delisle
1a0eff3a9c Fix typos 2013-11-12 07:16:20 -05:00
Marc Delisle
548d4f2b3c Fix coding style 2013-11-11 14:03:59 -05:00
Hugues Peccatte
927ba37a76 Minor fix for uninitialized vars. 2013-11-11 16:19:12 +01:00
Marc Delisle
e0d7c65ddd Fix coding style 2013-11-11 07:16:31 -05:00
Marc Delisle
d02c8b94f6 Fix coding style 2013-11-11 06:59:33 -05:00
Hugues Peccatte
464ec23ad8 Huge PHPDoc update. 2013-11-10 23:04:58 +01:00
Hugues Peccatte
661db9ec47 Update PHPDoc. 2013-11-08 19:28:20 +01:00
Hugues Peccatte
80210a489a Update PHPDoc. 2013-11-08 19:28:20 +01:00
Madhura Jayaratne
cb798bc5d2 Fix coding style 2013-10-22 07:05:44 +05:30
Madhura Jayaratne
17e4f9eb39 Fix syntax highlighting. Use PMA_Util::formatSql() for SQL formatting 2013-10-19 10:56:47 +05:30
Madhura Jayaratne
293a389560 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-10-18 17:41:53 +05:30
Madhura Jayaratne
8ea2ce5f23 Syntax highlighting for some system tables 2013-10-18 17:34:40 +05:30
Madhura Jayaratne
c164973f30 Check whether configuration storage tables are set and are not empty 2013-10-18 16:44:06 +05:30
Marc Delisle
cd1c3b6b28 Fix coding style 2013-10-18 05:48:33 -04:00
Marc Delisle
ab1a436169 Fix coding style 2013-10-18 05:42:59 -04:00
Marc Delisle
54b36d0c21 Fix coding style 2013-10-18 05:39:18 -04:00
Marc Delisle
4192d929d9 Undefined index 2013-10-17 06:21:05 -04:00
Marc Delisle
a0a88d8965 Fix coding style 2013-10-17 05:59:41 -04:00
Marc Delisle
88da7eeba0 Fixes many coding style "line too long" 2013-10-17 05:41:51 -04:00
Marc Delisle
d4a7e69250 Fix coding style 2013-10-15 05:58:32 -04:00
Marc Delisle
8691ff3c30 Fix coding style 2013-10-14 04:55:28 -04:00
Marc Delisle
0c35444cee Fix typos; improve comments 2013-10-13 07:20:47 -04:00
Marc Delisle
4bda95be50 Fix coding style 2013-10-13 07:16:40 -04:00