Commit Graph

86728 Commits

Author SHA1 Message Date
Marc Delisle
b040fab515 Merge pull request #673 from scnakandala/refac_browse_foreigners
Refactoring browse_foreigners.php
2013-09-08 14:28:23 -07:00
Spun Nakandala
8ff74d0b0d error corrected 2013-09-08 23:51:54 +05:30
Isaac Bennetch
d2107f35d3 Merge pull request #674 from kasunchathuranga/UT
Bug fixes and improvements related to table specific privilege tab
2013-09-08 07:31:58 -07:00
Marc Delisle
6d1faa7300 Merge commit '5e0a314' 2013-09-08 07:26:30 -04:00
Marc Delisle
193f06b0af Fix merge conflicts 2013-09-08 07:26:13 -04:00
Marc Delisle
b211ad69db Merge commit 'afb3938' 2013-09-08 07:23:52 -04:00
Weblate
5e0a314d70 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-09-08 13:17:41 +02:00
João Rodrigues
97b44acfcc Translated using Weblate (Portuguese)
Currently translated at 51.9% (1354 of 2609)
2013-09-08 13:17:37 +02:00
Marc Delisle
afb393816d bug #4080 Overwrite existing file not obeyed 2013-09-08 07:16:59 -04:00
Marc Delisle
5e70597251 Fix codestyle 2013-09-08 06:51:58 -04:00
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
Dieter Adriaenssens
e853e65077 fix coding style : closing brace should be on a new line 2013-09-07 23:01:06 +02:00
Weblate
35374edf97 Merge remote-tracking branch 'origin/master' 2013-09-07 14:21:07 +02:00
João Rodrigues
620fc383a6 Translated using Weblate (Portuguese)
Currently translated at 50.1% (1364 of 2720)
2013-09-07 14:21:02 +02:00
Marc Delisle
830de1ff03 Fix codestyle 2013-09-07 08:20:26 -04:00
Jonadabe PT
e9056cf5f7 Translated using Weblate (Portuguese)
Currently translated at 50.0% (1359 of 2720)
2013-09-07 12:02:44 +02:00
João Rodrigues
24791835a5 Translated using Weblate (Portuguese)
Currently translated at 49.9% (1358 of 2720)
2013-09-07 12:02:29 +02:00
Jonadabe PT
9ff821f469 Translated using Weblate (Portuguese)
Currently translated at 49.8% (1355 of 2720)
2013-09-07 12:01:01 +02:00
João Rodrigues
35f82918b2 Translated using Weblate (Portuguese)
Currently translated at 49.7% (1353 of 2720)
2013-09-07 12:00:07 +02:00
Jonadabe PT
3531ad3c17 Translated using Weblate (Portuguese)
Currently translated at 49.0% (1334 of 2720)
2013-09-07 11:49:50 +02:00
João Rodrigues
6b6a9bd3da Translated using Weblate (Portuguese)
Currently translated at 49.0% (1333 of 2720)
2013-09-07 11:49:19 +02:00
Filipe Batista
09bbac3816 Translated using Weblate (Portuguese)
Currently translated at 48.6% (1323 of 2720)
2013-09-07 11:44:04 +02:00
João Rodrigues
5abd3a0438 Translated using Weblate (Portuguese)
Currently translated at 48.5% (1320 of 2720)

-
2013-09-07 11:42:49 +02:00
Jose Machado
d9f29f7211 Translated using Weblate (Portuguese)
Currently translated at 47.1% (1282 of 2720)
2013-09-07 11:21:10 +02:00
João Rodrigues
bad43d7706 Translated using Weblate (Portuguese)
Currently translated at 47.1% (1281 of 2720)
2013-09-07 11:20:10 +02:00
Spun Nakandala
fd32385236 added method PMA_getHtmlForColumnElement 2013-09-06 23:14:15 +05:30
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
Kasun Chathuranga
959ddfa2ea Merge branch 'master' of github.com:phpmyadmin/phpmyadmin into UT 2013-09-06 21:53:28 +05:30
Kasun Chathuranga
7ace92a786 Grant is considered separately 2013-09-06 21:48:59 +05:30
Kasun Chathuranga
07444b4708 Properly identify grant type 2013-09-06 21:46:53 +05:30
Spun Nakandala
aca7522b53 error corrected 2013-09-06 21:43:55 +05:30
Dieter Adriaenssens
4b43310d6f fix coding style : use lowercase null 2013-09-06 17:53:54 +02:00
Dieter Adriaenssens
a6ca1f05b6 fix coding style : opening brace should be on a new line 2013-09-06 17:50:32 +02:00
Dieter Adriaenssens
58f9338178 cleanup whitespace 2013-09-06 17:48:06 +02:00
Dieter Adriaenssens
a9c04994a6 fix coding style : add spaces between function arguments, wrap long lines 2013-09-06 17:45:01 +02:00
Dieter Adriaenssens
2b4de460b3 fix coding style, spacing 2013-09-06 17:38:45 +02:00
Dieter Adriaenssens
c6c3883ff4 fix coding style : indentation 2013-09-06 17:37:52 +02:00
Spun Nakandala
c38da98d4a added browse_foreigners.lib.php and extracted methods from browse_foreigners to it. 2013-09-06 21:00:16 +05:30
Marc Delisle
1fbc4d0cb3 Merge pull request #672 from xmujay/UT_database_and_privileges
Ut for server database, privileges and other server pages
2013-09-06 04:49:35 -07:00
xmujay
33b9ebc16a remove unneeded constant which have defined in common files 2013-09-06 14:50:32 +08:00
Kasun Chathuranga
17de8a6a49 Shorten a lines exceeding 85 characters 2013-09-06 07:35:09 +05:30
Kasun Chathuranga
0c28430659 Wildcards are not applicable to table privileges 2013-09-06 07:29:44 +05:30
Kasun Chathuranga
c9268f80ad Adhere to coding style 2013-09-06 07:22:00 +05:30
Atul Pratap Singh
f0585a2693 Fix reload flag on database change 2013-09-06 02:55:34 +05:30
Isaac Bennetch
cfdc45c037 ChangeLog for 2666ee5023 2013-09-05 12:54:20 -04:00
Isaac Bennetch
495406d85b Merge pull request #669 from kasunchathuranga/UT
Unit tests for some of the developments done in second half
2013-09-05 09:51:10 -07:00
Marc Delisle
3ac97c59ef Merge branch 'QA_4_0' 2013-09-05 12:32:59 -04:00