Commit Graph

86769 Commits

Author SHA1 Message Date
Michal Čihař
ae8286cd1d Try to run with coverage reports in Travis
This is mostly for testing impact of coverage reports on CI speed.
2013-09-10 13:24:15 +02:00
Marc Delisle
7845a5ce6c Fix codestyle 2013-09-10 06:11:06 -04:00
Marc Delisle
4d76f931f0 Fix codestyle 2013-09-10 06:08:06 -04:00
Marc Delisle
1cc85d331b Merge pull request #680 from xmujay/Uts_server_privileges_bin
UTs for PMA_server_privileges
2013-09-10 02:41:04 -07:00
Michal Čihař
4488461469 Merge pull request #681 from adamgsoc2013/tbl_UTs
add UT for PMA_tbl_gis_visualization
2013-09-10 01:56:05 -07:00
adamgsoc2013
ea4f59f5ca Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into tbl_UTs 2013-09-10 16:32:45 +08:00
Michal Čihař
688ff7532a Document that ForceSSL might need PmaAbsoluteUri. 2013-09-10 08:25:28 +02:00
Michal Čihař
b8be92991a Merge pull request #667 from adamgsoc2013/UT_DBI_Drizzle
add Unit test case for DBIDrizzle
2013-09-09 23:20:37 -07:00
xmujay
752f0a67a6 UTs for PMA_server_privileges 2013-09-10 09:55:14 +08:00
Aputsiaq Niels Janussen
39ffeb0950 Translated using Weblate (Danish)
Currently translated at 100.0% (2720 of 2720)
2013-09-10 00:39:16 +02:00
Weblate
1e3997b919 Merge remote-tracking branch 'origin/master' 2013-09-09 20:55:09 +02:00
Dadan Setia
06cd155e1a Translated using Weblate (Indonesian)
Currently translated at 77.6% (2111 of 2720)
2013-09-09 20:55:05 +02:00
Dieter Adriaenssens
38cafcff23 Merge pull request #679 from scnakandala/browser_foreigners_error_correction
browse_foreigners error corrected
2013-09-09 11:54:58 -07:00
Spun Nakandala
1040b95c2f error corrected 2013-09-09 23:07:16 +05:30
Dieter Adriaenssens
a329ebee4e fix multiple parameter comment issues 2013-09-09 18:19:00 +02:00
Dieter Adriaenssens
92ab88b6fa fix indenting 2013-09-09 18:19:00 +02:00
Dieter Adriaenssens
eeadd6ae42 remove unused code 2013-09-09 18:19:00 +02:00
Dieter Adriaenssens
f8de83796d fix coding style : space between ) and { 2013-09-09 18:19:00 +02:00
Isaac Bennetch
ea0bc055dd Merge pull request #676 from kasunchathuranga/configurableMenus
Change the structure of `pma__usergroups` table
2013-09-09 09:03:21 -07:00
Madhura Jayaratne
e345d72a52 Line wrapping for CodeMirror edit areas 2013-09-09 18:58:36 +05:30
adamgsoc2013
8e80b7c4a2 remove some constant definition if they are already defined in drizzle extension 2013-09-09 20:20:03 +08:00
Marc Delisle
bebb8547c2 Fix codestyle 2013-09-09 06:14:57 -04:00
Marc Delisle
85c5464cec Fix codestyle 2013-09-09 06:08:26 -04:00
Marc Delisle
24e84b07df Fix codestyle 2013-09-09 05:55:04 -04:00
Marc Delisle
2c41695fe9 Fix codestyle 2013-09-09 05:49:07 -04:00
Marc Delisle
f30b6a6a5f Fix codestyle 2013-09-09 05:40:20 -04:00
Marc Delisle
7694dcf4fd Fix codestyle 2013-09-09 05:35:12 -04:00
Marc Delisle
d8a575210f Fix codestyle 2013-09-09 05:25:02 -04:00
Marc Delisle
89e4c0f1f9 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2013-09-09 05:16:34 -04:00
Marc Delisle
3bd9c515d3 Fix codestyle 2013-09-09 05:16:30 -04:00
Michal Čihař
d9724bfa67 Merge pull request #665 from adamgsoc2013/UT_table_pages
add Unit test cases for PMA_tbl_relation
2013-09-09 02:15:55 -07:00
Kasun Chathuranga
99e4afadcf Fix tests 2013-09-09 07:33:59 +05:30
Kasun Chathuranga
a9983882b9 Move user group related functions to a lib file of its own 2013-09-09 07:10:06 +05:30
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
Kasun Chathuranga
99257dea7c Fix failing tests 2013-09-08 23:34:22 +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
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