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

11028 Commits

Author SHA1 Message Date
Marc Delisle
ae163e4d67 Merge commit '2453a15' 2014-02-03 12:30:23 -05:00
Marc Delisle
f5ba57c290 Revert "Avoid using hard-coded argument separator, see https://sourceforge.net/p/phpmyadmin/bugs/3733" 
This reverts commit 36e544ce9e.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-03 10:11:44 -05:00
Marc Delisle
464616c26b Merge commit '36e544c' 2014-02-03 08:44:37 -05:00
Marc Delisle
36e544ce9e Avoid using hard-coded argument separator, see https://sourceforge.net/p/phpmyadmin/bugs/3733 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-03 08:42:39 -05:00
Dieter Adriaenssens
1c582e4cb9 improve users/user groups table description 2014-02-03 13:32:57 +01: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
Michal Čihař
396991a194 Merge remote-tracking branch 'origin/QA_4_1' 2014-02-03 09:01:55 +01:00
Michal Čihař
c6969bfb9e Properly encode & in URL 
Signed-off-by: Michal Čihař <mcihar@suse.cz>
 2014-02-03 09:00:05 +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
Madhura Jayaratne
a5c6f555f9 Merge branch 'QA_4_1' 2014-02-02 22:56:55 +05:30
Madhura Jayaratne
22c851d1b8 bug #4259 reCaptcha sound session expired problem 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-02-02 22:53:11 +05:30
Madhura Jayaratne
fc34716720 reCaptcha theme 'while' matches better with PMA themes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-02-02 22:22:53 +05:30
Madhura Jayaratne
d1af87b7e6 Merge branch 'QA_4_1' 2014-02-02 22:18:49 +05:30
Madhura Jayaratne
6a7d3f9ed7 bug #4260 reCaptcha is ignoring language settings 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-02-02 22:15:56 +05:30
Michal Čihař
619dc110d0 Use official name for configuration storage in a message 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-02 12:13:38 +01:00
Michal Čihař
085b51dba8 Correct punctuation for sentences 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-02 11:44:58 +01:00
Michal Čihař
767fc8c997 Correct punctuation for sentences 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-02 11:38:49 +01:00
Michal Čihař
9d17a602f5 Better messasge after creating a bookmark 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-02 11:32:15 +01:00
Michal Čihař
b4d03dc9f5 Correct punctuation for sentences 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-02 11:30:39 +01:00
Michal Čihař
77caf6151b Correct punctuation for sentences 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-02 11:19:15 +01:00
Michal Čihař
8971706c15 Correct punctuation for sentences 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-02 11:19:15 +01:00
Michal Čihař
c5cc523b6d Correct punctuation for sentences 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-02 11:19:15 +01:00
Michal Čihař
0b008c44fa Correct punctuation for error messages 2014-02-02 11:19:15 +01:00
Michal Čihař
45c11eae77 Add missing full stops at the end of a sentence 2014-02-02 11:19:15 +01:00
Michal Čihař
e3e880f1fc Punctuation at the end of validation error messages 2014-02-02 11:19:15 +01:00
Michal Čihař
a7f01ca40d Better and more compact message for opening ENUM/SET editor 2014-02-02 11:19:15 +01:00
Michal Čihař
d08a188ffe Consistent naming of privileges ending with comma 2014-02-02 10:36:38 +01:00
Michal Čihař
47b1b31f49 Need to encode whole string here 2014-02-02 10:13:31 +01:00
Michal Čihař
8eaaad4826 Do not use HTML entities for quotes inside translatable messages 
First of all there is no reason to HTML encode them, if the string
should be encoded, it has to be done after getting the translation from
gettext as they can contain something to quote as well.

Also using HTML entities is sometimes confusing for translators.
 2014-02-02 10:06:23 +01:00
Michal Čihař
f13bd95c12 Add missing full stop 2014-02-02 09:59:10 +01:00
Hugues Peccatte
9d059ee7a8 Minor PHPCS corrections. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-02-01 17:30:13 +01:00
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
c60ad1145b Merge branch 'QA_4_1' 2014-01-31 11:50:52 -05:00
Marc Delisle
9a77d256e0 Fix incorrect patch 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-31 11:50:25 -05:00
Marc Delisle
2463fb01e6 Merge branch 'QA_4_1' 2014-01-31 11:38:46 -05:00
Marc Delisle
482232a4c6 Fractional seconds incorrect in displayed default value 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-31 11:38:02 -05:00
Marc Delisle
82a549714e Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-31 08:22:29 -05:00
Marc Delisle
2bca34d2f8 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-31 08:10:08 -05:00
Viduranga Wijesooriya
4616eb093e bug#4257 - readded something missed 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-01-31 12:17:24 +05:30
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
b93e426998 bug#4257 - fixed datetimepicker view of record edit page 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-01-31 01:52:52 +05:30
Marc Delisle
1b639952d6 Merge commit '8ee7fc8' 2014-01-30 13:24:56 -05:00
Marc Delisle
8ee7fc8a9c bug #4265 Missing datepicker icon for DATETIME(length) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-30 13:23:31 -05:00
Marc Delisle
2cdcb4fdc4 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-30 09:04:10 -05:00
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
c4ec983995 Merge branch 'QA_4_1' 2014-01-29 13:42:02 -05:00
Marc Delisle
ae81ad4527 bug #4262 Cannot define a column with fractional seconds 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-29 13:41:02 -05:00
Madhura Jayaratne
510b3fd7be Wrap a long line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-29 23:56:42 +05:30