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

86006 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xmujay
9e2639eca8 add test case for PMA_server_privileges 2013-08-11 16:40:15 +08:00
xmujay
d1a70dcf82 fix UT error and add UT for PMA_server_privileges 2013-08-09 18:31:12 +08:00
Marc Delisle
a766b7d1a3 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2013-08-08 17:53:41 -04:00
Marc Delisle
a83fb60ff7 Fix typo; remove extraneous spaces 2013-08-08 17:53:27 -04:00
Weblate
c3e6409917 Merge remote-tracking branch 'origin/master' 2013-08-08 23:51:41 +02:00
Jouni Kähkönen
e013ecd23b Translated using Weblate (Finnish) 
Currently translated at 72.2% (1963 of 2719)
 2013-08-08 23:51:35 +02:00
Marc Delisle
3514ba44e1 Merge pull request #577 from scnakandala/refac_tbl_columns_definitions 
Refactoring tbl_columns_definition_form.inc.php
 2013-08-08 14:51:23 -07:00
Spun Nakandala
06e8ff80ee added method PMA_getHtmlForColumnAtributes 2013-08-08 22:33:01 +05:30
Marc Delisle
47e314602e Coding style 2013-08-08 06:02:59 -04:00
Weblate
8848354c7d Merge remote-tracking branch 'origin/master' 2013-08-08 11:54:12 +02:00
Jouni Kähkönen
ebcc766f61 Translated using Weblate (Finnish) 
Currently translated at 72.2% (1963 of 2719)
 2013-08-08 11:54:07 +02:00
Marc Delisle
eec1426f3b Merge pull request #574 from scnakandala/refac_tbl_columns_definitions 
Refac tbl columns definitions
 2013-08-08 02:53:33 -07:00
Spun Nakandala
8e6d2f867c corrected undefined variable error 2013-08-08 14:04:21 +05:30
Spun Nakandala
ffab25619d removed redundant methods 2013-08-08 09:08:22 +05:30
Spun Nakandala
e7b4530cf0 phpcs errors corrected 2013-08-08 00:23:57 +05:30
Spun Nakandala
1c3d0febf4 typo corrected 2013-08-07 23:50:58 +05:30
Spun Nakandala
c2f50d4565 renamed $field_meta to $columnMeta in libraries/tbl_column_definition_form.lib.php 2013-08-07 23:50:34 +05:30
Spun Nakandala
632689f739 extracted more smaller methods 2013-08-07 23:45:48 +05:30
Michal Čihař
1dcd173555 No newlines inside query 2013-08-07 19:54:49 +02:00
Michal Čihař
40a0aec442 Fix typo 2013-08-07 19:53:52 +02:00
Michal Čihař
482b6a23b7 Another SQL fixup 2013-08-07 19:51:35 +02:00
Michal Čihař
2764e7b940 Fix expected SQL query 2013-08-07 19:44:41 +02:00
Michal Čihař
036c128c56 Merge pull request #573 from ayushchd/codestyle_fixes 
Testsuite code-compliance fixes
 2013-08-07 10:41:08 -07:00
Michal Čihař
309669820e Missing ; 2013-08-07 19:40:12 +02:00
ayushchd
b9a5bffaba Testsuite code-compliance fixes 2013-08-07 22:28:46 +05:30
Michal Čihař
b2e1f81c0c Use PMA_URL_getCommon for generating all params 2013-08-07 17:00:52 +02:00
Michal Čihař
ae14690b9c Wrap long line 2013-08-07 16:46:29 +02:00
Michal Čihař
686025b018 Missing space 2013-08-07 16:46:11 +02:00
Michal Čihař
54d0714c55 Prevent manual tweaking of url parameters 
PMA_URL_getCommon provides better inteface to constuct them
 2013-08-07 16:37:17 +02:00
Michal Čihař
657c3dfdc3 Various coding style fixes 2013-08-07 16:20:15 +02:00
Michal Čihař
a14a83b4a8 Documentation and coding style improvements 2013-08-07 16:17:02 +02:00
Michal Čihař
7e142381c9 Correctly generate link for exporting user 
With PMA_URL_getCommon we get correct separator and escaping
for free.
 2013-08-07 16:12:24 +02:00
Michal Čihař
311fc81bce Correctly generate link for revoking user 
With PMA_URL_getCommon we get correct separator and escaping
for free.
 2013-08-07 16:07:24 +02:00
Michal Čihař
950af59138 Correctly use PMA_URL_getCommon instead of manually adding some parameters 2013-08-07 16:01:10 +02:00
Michal Čihař
056ed1929e Correctly generate link for editing user 
With PMA_URL_getCommon we get correct separator and escaping for free.
 2013-08-07 15:57:46 +02:00
Michal Čihař
47b6481845 Remove always set $conditional_class variable 2013-08-07 15:48:19 +02:00
Michal Čihař
e5905bb884 Better error message 2013-08-07 15:25:44 +02:00
Michal Čihař
c2c6ace1ae Do not check against hardcoded value 2013-08-07 15:23:48 +02:00
Michal Čihař
bb1df87584 Gettext is already loaded at this point 2013-08-07 15:12:57 +02:00
Michal Čihař
a89bb5dd92 Move assignment out of if 2013-08-07 15:12:09 +02:00
Michal Čihař
aa92d22931 Allow config loader to recover from fatal errors 
The config loader now registers shutdown function which can print out
error message in case of loading config file fails.

Fixes bug #3980
 2013-08-07 15:07:29 +02:00
Michal Čihař
7153a45546 Correctly merge server variables fix to master 2013-08-07 14:43:01 +02:00
Michal Čihař
04ed28ccd5 Merge remote-tracking branch 'origin/QA_4_0' 
Conflicts:
	server_variables.php
 2013-08-07 14:41:59 +02:00
Michal Čihař
e4ee7fc51f Merge commit '2684d0a0f8631f920ad2c29a2a497eb6afed5a22' 2013-08-07 14:41:15 +02:00
Michal Čihař
01ebe9c030 Do not double HTML encode URL 
PMA_generate_common_url already does HTML encoding, so there is no need
to do that again (bug #4026).
 2013-08-07 14:39:39 +02:00
Marc Delisle
0c6e134d36 Fix merge conflicts 2013-08-07 08:31:38 -04:00
Marc Delisle
e5f46ca907 Merge commit '67dc378' 2013-08-07 08:28:40 -04:00
Weblate
2684d0a0f8 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-08-07 14:28:16 +02:00
성현 양
1b70a0086b Translated using Weblate (Korean) 
Currently translated at 73.1% (1908 of 2609)
 2013-08-07 14:28:13 +02:00
Marc Delisle
c2b2c7b6e9 Bug #4048 Cannot select foreign value in Search 2013-08-07 08:27:34 -04:00