webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-31 10:54:46 +03:00
Code Activity
84,299 Commits 12 Branches 481 Tags
768f736bcbe5370a2bc40a45e784c3db28f21838
Commit Graph

9397 Commits

Author SHA1 Message Date
Kasun Chathuranga
4dc2b2ecc4 Make 'full name' optional in getUniqueColumns() method as sometimes full name is not required 2013-06-18 12:31:26 +05:30
Kasun Chathuranga
06c4939e3f Show database name in 'Check referential integrity' operation as it already supports cross database relations 2013-06-18 12:27:33 +05:30
xmujay
e3a824cc7b 1. using a better function name 2. fix code style issue 3. add doc for functions 2013-06-17 21:43:13 +08:00
xmujay
8c000b4fee Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into 0609_monitor 2013-06-17 21:21:16 +08:00
Dieter Adriaenssens
87dbf5eb75 correctly indent parameter documentation 2013-06-17 15:14:55 +02:00
Dieter Adriaenssens
7f0d5ea26a fix indenting 2013-06-17 15:09:11 +02:00
Dieter Adriaenssens
5cefd359d6 fix coding style : closing parenthesis and brace of a multiline argument list, should go on a new line 2013-06-17 15:06:16 +02:00
Dieter Adriaenssens
9824e13af6 use 'include' not 'require' to include files conditionally 2013-06-17 15:01:17 +02:00
Madhura Jayaratne
4382a7b7dc Fix failing tests related to charset conversion 2013-06-17 12:48:28 +05:30
Marc Delisle
32c8ac600f Fix typo 2013-06-16 08:12:17 -04:00
Marc Delisle
b39aeb1f89 Remove author name 2013-06-16 08:10:16 -04:00
Marc Delisle
c4883127c7 This file should not end in .lib.php 2013-06-16 08:08:07 -04:00
Marc Delisle
e3e16d181d Code has to be executed for each iteration of the loop 2013-06-16 08:04:56 -04:00
Marc Delisle
27f5ec3b57 Merge pull request #428 from scnakandala/gsoc_2013 
Refactoring SQL executor
 2013-06-16 04:54:54 -07:00
Marc Delisle
d31ba0cb02 Merge branch 'QA_4_0' 2013-06-16 07:42:07 -04:00
Marc Delisle
178f83f915 bug #3984 Cannot insert in this table (PHP < 5.4) 2013-06-16 07:37:34 -04:00
xmujay
cb2f07eb94 refactor the Ajax request part of server_status_monitor.php 
1. split long code to function
2. move functions to server_status_monitor.lib.php
 2013-06-16 16:58:06 +08:00
Spun Nakandala
ac2dcec785 changed such that $first_reserved_word is checked for the reserved word SHOW 2013-06-15 22:04:32 +05:30
Spun Nakandala
c11d079fc9 changed getTableHtmlForMultipleQueries() to use parse_analyze.lib.php 2013-06-15 21:11:40 +05:30
Spun Nakandala
00a3354499 changed to look the $first_reserved_word rather than any $upper_data 2013-06-15 20:55:56 +05:30
Spun Nakandala
7cecc2f23d code related to analyzing the sql query transferred to the sql analyzer 2013-06-15 14:50:31 +05:30
Marc Delisle
90862a0f4d Fix merge conflict 2013-06-14 14:29:39 -04:00
Kasun Chathuranga
c6d568d4f3 Fix bug 3977 - Not detected configuration storage 2013-06-14 23:30:42 +05:30
Marc Delisle
f4f710a3e2 - Fix typo 
- Frames are gone!
 2013-06-13 17:10:54 -04:00
Spun Nakandala
6f8152857b error corrected 2013-06-14 02:02:15 +05:30
Marc Delisle
18b7f4e4d0 4.0.5-dev 2013-06-13 13:41:49 -04:00
Spun Nakandala
adf26c5223 documentation added for new queryflags (reload, drop_database) 2013-06-13 23:06:32 +05:30
Spun Nakandala
ae9ff0a8be check for drop database transfered to sql parser 2013-06-13 23:00:06 +05:30
Spun Nakandala
653bc9bd2c Checking for reload the navigation transfered to the sql parser 2013-06-13 23:00:04 +05:30
Marc Delisle
3216740323 No longer need to confirm at the PHP level 2013-06-13 12:34:05 -04:00
Marc Delisle
25a3a03e0c Merge pull request #415 from scnakandala/gsoc_2013 
Refactoring SQL executor
 2013-06-13 09:20:43 -07:00
Spun Nakandala
01a12cd253 error corrected 2013-06-13 20:28:29 +05:30
Spun Nakandala
a9fd9aae52 bookmark.lib.php corrected to use the new variable names in $_POST['bkm_fields'][..] 2013-06-13 19:35:10 +05:30
Marc Delisle
17536941ec Improve function name 2013-06-13 08:31:05 -04:00
Marc Delisle
abaca78516 Merge pull request #421 from xmujay/0609_monitor 
refactor server_status_monitor.php 1. split long functions 2. add server_status_monitor.lib.php
 2013-06-13 05:23:55 -07:00
Christoph Wiechert
e6e5873534 Added accesskey="q" to searchClause input field to quickly focus it per hotkey 2013-06-13 12:47:09 +02:00
xmujay
6acdec1aef rename the function to a meaningful name 2013-06-13 14:49:25 +08:00
xmujay
438c84178f Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into 0609_monitor 2013-06-13 10:30:01 +08:00
Spun Nakandala
ca8d81b95c PMA_isDropDatabase($sql_query) method added to sqlparser.lib.php 2013-06-12 22:05:24 +05:30
Spun Nakandala
e32064bcd2 code for displaying confirm page removed. 2013-06-12 19:54:44 +05:30
Atul Pratap Singh
80dec52d98 Fix bug#3922, user privileges, in QA_4_0 2013-06-12 18:10:38 +05:30
ayushchd
5ab5cb0f94 Conflict resolve with DBIDummy Class 2013-06-12 18:01:52 +05:45
ayushchd
febc05dae0 Unit tests for charset conversions 
Added test cases for:

1. libraries/char*
2. libraries/iconv*
3. libraries/kanji*
 2013-06-12 16:14:09 +05:45
Michal Čihař
9bcf95f235 Remove extra parenthesis 2013-06-12 10:57:00 +02:00
Michal Čihař
fab879f924 Simplify reCaptcha configuration 
Once private and public keys are in place, it is enabled. I see no need
for per server setup.
 2013-06-12 09:38:10 +02:00
Atul Pratap Singh
da4bd45136 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-06-12 12:55:25 +05:30
Atul Pratap Singh
63b913708a Fix bug#3922, user privileges-database name unescaped 2013-06-12 12:33:52 +05:30
Michal Čihař
b77f50e610 Do not use "Save" label on setup/preferences forms 
It is confusing as it looks like the configuration is actually saved,
but it's not the case. I believe "Apply" is more appropriate here.
 2013-06-12 08:54:56 +02:00
Kasun Chathuranga
0eb45c7a60 Add missing package names, align comments 2013-06-11 22:02:07 +05:30
Kasun Chathuranga
3ccfc6fe88 Fix indentation 2013-06-11 21:55:56 +05:30