gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,429 Commits 12 Branches 481 Tags 2.4 GiB
220a67f6c3
Commit Graph

147 Commits

Author SHA1 Message Date
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
Michal Čihař
10bc618ebe Remove unused global variable access 
Signed-off-by: Michal Čihař <mcihar@suse.cz>
 2013-12-04 09:42:56 +01:00
Marc Delisle
20770f3f33 Merge branch 'QA_4_1' 2013-11-27 12:41:45 -05:00
Marc Delisle
fbce9502e4 Fix merge conflicts 2013-11-27 12:41:01 -05:00
Marc Delisle
b22b76e7f5 bug #4158 Events page says no privileges with ALL PRIVILEGES 2013-11-27 12:36:51 -05:00
Madhura Jayaratne
ce75da4220 Wrap a long line 2013-11-27 07:27:47 +05:30
Hugues Peccatte
464ec23ad8 Huge PHPDoc update. 2013-11-10 23:04:58 +01:00
Marc Delisle
2f1176d27c Fix merge conflicts 2013-11-10 08:14:19 -05:00
Marc Delisle
226295fa39 Fix typo; clarify bug reference and add explanation 2013-11-10 06:48:11 -05:00
Hugues Peccatte
d3601abf96 Global PHPDoc update. 2013-11-10 12:29:55 +01:00
Hugues Peccatte
80210a489a Update PHPDoc. 2013-11-08 19:28:20 +01:00
Hugues Peccatte
a7137df361 Update phpdoc. 2013-11-08 19:28:19 +01:00
Hugues Peccatte
d7df8b8185 Update types in PHPDoc. 2013-11-08 19:28:18 +01:00
Madhura Jayaratne
17e4f9eb39 Fix syntax highlighting. Use PMA_Util::formatSql() for SQL formatting 2013-10-19 10:56:47 +05:30
Madhura Jayaratne
a79e570329 class is optional 2013-10-13 12:35:16 +05:30
Madhura Jayaratne
6f27ec86cc Auto submit display direction dropdown 2013-10-13 12:10:30 +05:30
Marc Delisle
ffd3a06811 Merge branch 'QA_4_0' 2013-10-09 10:08:24 -04:00
Marc Delisle
4fb5088f86 bug #3678 Does not display or manipulate bit(64) fields appropriately 2013-10-09 10:06:47 -04:00
Mohamed Ashraf
2bb923284c Merge remote-tracking branch 'origin/master' into error_reporting 
Conflicts:
	ChangeLog
 2013-09-05 20:12:28 +02:00
Mohamed Ashraf
088166f0a3 Merge remote-tracking branch 'origin/master' into error_reporting 
Conflicts:
	ChangeLog
 2013-09-01 13:07:52 +02:00
Kasun Chathuranga
99c65f37e7 Table specific privileges 2013-08-30 18:49:03 +05:30
Isaac Bennetch
fa87bcec06 Merge pull request #582 from kasunchathuranga/fractionalSecs 
Use fractional seconds in time, datetime and timestamp
 2013-08-27 06:37:30 -07:00
Madhura Jayaratne
7ec7440c57 Query "inline" link disappears when running UPDATE query 2013-08-25 18:34:04 +05:30
Kasun Chathuranga
412b3b4c31 Do not add trailing 0s for 'CURRENT_TIMESTAMP' string 2013-08-18 22:39:14 +05:30
Kasun Chathuranga
b495061cdf Use fractional seconds in time 2013-08-10 11:26:43 +05:30
Michal Čihař
07c1e0a14a Revert "Use parser flags instead of regexp matching" 
This reverts commit 622523de41.

We don't have flags always available...
 2013-08-07 11:37:52 +02:00
Michal Čihař
865de7028a Use foreach instead of for 2013-08-07 11:25:18 +02:00
Michal Čihař
2c17db1063 Calculate file path just once 2013-08-07 11:22:39 +02:00
Michal Čihař
e725e3b55e Do not assign inside if statement 2013-08-07 11:21:14 +02:00
Michal Čihař
4734ffae58 Wrap line 2013-08-07 11:20:48 +02:00
Michal Čihař
622523de41 Use parser flags instead of regexp matching 2013-08-07 11:20:01 +02:00
Michal Čihař
0a3d1d5be8 Better names for URL generating functions 2013-08-07 10:58:17 +02:00
Michal Čihař
969c3cca56 Remove unused params doc 2013-08-07 08:50:22 +02:00
Michal Čihař
d1bb142e87 Remove unused param from PMA_Util::showMySQLDocu 2013-08-07 08:48:50 +02:00
Michal Čihař
d7c3b58337 Dropped MySQL manual type configuration 
Nothing but default settings is really working now:

- most formats are no longer available on MySQL formats
- for downloadable doc our links are in most cases broken and nobody
  noticed this, so I assume nobody is using this
- anyway most current installations don't have troubles with internet
  access what was main motivation for this configuration directive
 2013-08-07 08:32:01 +02:00
Michal Čihař
eac01ea7f7 Split URL generating from returning URL 2013-08-07 08:26:59 +02:00
Mohamed Ashraf
1bbb3816a8 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting 
Conflicts:
	ChangeLog
	libraries/Scripts.class.php
	libraries/config.default.php
 2013-08-07 01:05:48 +02:00
Michal Čihař
6d127c62da Use lowercase constant 2013-08-06 15:15:10 +02:00
Michal Čihař
79c64a0b7b Fix syntax error 2013-08-06 13:37:25 +02:00
Michal Čihař
b8ea23ab9f Drop $cfg['SQP']['fmtType'] 
It has no effect anyway and in case we would want to make syntax
highlighting optional, it needs to be done in javascript and needs
better configuration name than this one.
 2013-08-06 13:35:09 +02:00
Michal Čihař
2711010c05 Use new truncating code 2013-08-06 12:30:53 +02:00
Michal Čihař
32b33a9e26 Incorporate truncating into PMA_Util::formatSql 
It is used quite often as well.
 2013-08-06 12:29:27 +02:00
Michal Čihař
a9bce21ba9 No need to check for parser error as we do not highlight the query anyway 2013-08-06 12:24:28 +02:00
Michal Čihař
99af0cbc7e Remove unused parameter from PMA_Util::formatSql 
We no longer need parsed SQL here.
 2013-08-06 12:24:28 +02:00
Michal Čihař
a6a1e2d571 Drop formatting choices here 
They do not have any effect with CodeMirror highlighting anyway, this
configuration has to be passed to javascript and handled there.
 2013-08-06 12:18:16 +02:00
Michal Čihař
10fff3082f Simplify PMA_Util::formatSql function 
We no longer need to use parsed query, it's anyway done in javascript.
 2013-08-06 12:06:45 +02:00
Michal Čihař
959644445d PMA_Util::formatSql now requires unparsed query as well 
In most cases we just need to output it as is, formatting is done in
javascript.
 2013-08-06 12:04:14 +02:00
Michal Čihař
df898ba031 Missing ) 2013-07-30 15:10:11 +02:00
Michal Čihař
a5f572e132 Factor out text showing detection as well 2013-07-30 15:07:44 +02:00
Michal Čihař
be7ad383c8 Fix typo 2013-07-30 14:57:20 +02:00