Commit Graph

275 Commits

Author SHA1 Message Date
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ř
d08a188ffe Consistent naming of privileges ending with comma 2014-02-02 10:36:38 +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
Marc Delisle
1cec103fed Merge branch 'QA_4_1' 2014-01-19 08:18:35 -05:00
Marc Delisle
1ce32d6e85 bug #4241 Confusing dialog when trying to create an already existing user
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-19 08:18:01 -05:00
Marc Delisle
54fc30d743 Merge branch 'QA_4_1' 2014-01-18 11:06:14 -05:00
Marc Delisle
1cdbbc617e bug #4232 User not found after creating the user
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-18 11:04:30 -05:00
Madhura Jayaratne
f9474075a2 Add missing sub menu name 2014-01-08 10:49:15 +05:30
Madhura Jayaratne
8594491b12 Coding style fixes 2014-01-08 10:34:31 +05:30
J.M
61bae3f227 [interface] Break "Edit privileges" with sub-menus
Signed-off-by: J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-01-06 21:22:31 +01:00
J.M
f864e0447e Correct typo in phpdoc comment
PMA_getHtmlToDisplayPrivilegesTable() function

Signed-off-by: J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-01-06 16:11:40 +01:00
J.M
a7b4aa5355 Add missing * in phpdoc comment
PMA_getTablePrivsQueriesForChangeOrCopyUser() function

Signed-off-by: J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-01-06 16:10:08 +01:00
Hugues Peccatte
8665639bb0 Review of modifications
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-01-05 11:05:32 +01:00
Hugues Peccatte
6b01f835cb Rename too short variables.
Remove useless initializations.
Rename too long variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-01-04 20:46:18 +01:00
Marc Delisle
071e7ea3a5 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-01-02 08:31:44 -05:00
Marc Delisle
a6926c4f43 Improve function names
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-02 08:31:37 -05:00
Madhura Jayaratne
d711af9035 Fix indentation
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-01-02 18:28:09 +05:30
J.M
55ad62a0ac Fix hidden initials_table when reloading filtered mode
Signed-off-by: J.M <me@mynetx.net>
2013-12-31 15:13:34 +01:00
J.M
2ed160bbe1 Remove typo < in table id=initials_table tag
Signed-off-by: J.M <me@mynetx.net>
2013-12-31 15:09:29 +01:00
J.M
ff7fdd0cfb Remove [] around Show all link in initials table
Signed-off-by: J.M <me@mynetx.net>
2013-12-31 15:08:11 +01:00
J.M
aa05823d92 Visually highlight active initial in privs table
Signed-off-by: J.M <me@mynetx.net>
2013-12-31 15:07:09 +01:00
J.M
480f663bd8 Fix #4205 Add user shows "edit user group" link
Signed-off-by: J.M <me@mynetx.net>
2013-12-27 16:50:19 +01:00
J.M
62cf9008b5 Fix server privileges Action colspan (usergroups)
Signed-off-by: J.M <me@mynetx.net>
2013-12-27 16:47:45 +01:00
J.M
f16f97830a Hide Edit user group link when no groups defined
Signed-off-by: J.M <me@mynetx.net>
2013-12-27 16:46:55 +01:00
J.M
6ce9951f6c Rename local variables in PMA_getTableBodyForUserRightsTable function
(no camel-case in variable names)

Signed-off-by: J.M <me@mynetx.net>
2013-12-27 16:44:37 +01:00
J.M
22bf28e9ce Extract PMA_getUserGroupCount helper function
Signed-off-by: J.M <me@mynetx.net>
2013-12-27 16:40:41 +01:00
Hugues Peccatte
f8b9f66a5e Remove unused local variables.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-21 23:09:43 +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
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
473d3cd4a2 PHPDoc update. 2013-11-11 18:12:46 +01:00
Hugues Peccatte
464ec23ad8 Huge PHPDoc update. 2013-11-10 23:04:58 +01:00
Marc Delisle
ca0ee1bd9d These are not real databases to set privileges on 2013-11-10 10:10:57 -05:00
Marc Delisle
95489dec4d Use the already fetched list of databases 2013-11-08 07:41:30 -05:00
Spun Nakandala
d0631be88d removed trailing white spaces. 2013-11-02 14:45:44 +05:30
Spun Nakandala
8860c81ab8 balanced html tags 2013-11-02 14:43:04 +05:30
Spun Nakandala
ba137a85f8 bug fix 4148 2013-11-02 02:32:18 +05:30
Marc Delisle
81bd6d4a02 Fix merge conflict 2013-09-20 06:09:36 -04:00
Marc Delisle
0134d5154f bug #4060 Browser tries to remember wrong password when creating new user 2013-09-20 06:03:44 -04:00
Marc Delisle
750d6b62c6 Merge commit '0356284' 2013-09-10 12:51:28 -04:00
Marc Delisle
0356284e8b bug #3929 Database-specific privileges are not copied when cloning user 2013-09-10 12:48:42 -04:00
Kasun Chathuranga
a9983882b9 Move user group related functions to a lib file of its own 2013-09-09 07:10:06 +05:30
Kasun Chathuranga
5c50f56b8b Merge branch 'master' into configurableMenus 2013-09-08 23:05:42 +05:30
Kasun Chathuranga
f7bf216e28 Change the structure of pma__usergroups table 2013-09-08 22:58:47 +05:30
Kasun Chathuranga
21b3dd1a6f Merge branch 'master' into UT
Conflicts:
	libraries/server_privileges.lib.php
2013-09-08 11:29:23 +05:30
Dieter Adriaenssens
055e1b4c85 wrap long lines 2013-09-07 23:15:38 +02:00
Dieter Adriaenssens
4a2a360f8c fix coding style 2013-09-07 23:08:02 +02:00
Kasun Chathuranga
df26e950e7 Handle sub tabs properly 2013-09-06 22:25:38 +05:30
Kasun Chathuranga
bf389c0730 Long line 2013-09-06 22:00:07 +05:30