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

129 Commits

Author SHA1 Message Date
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
Michal Čihař
7a97781c23 Share code for checking whether to show icons 2013-07-30 14:54:21 +02:00
Michal Čihař
9310e76a0e Fix indentation 2013-07-30 13:23:51 +02:00
Michal Čihař
7dc178ce49 Avoid double saving of version into session cache 2013-07-30 09:14:54 +02:00
Mohamed Ashraf
b83f0eb463 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting 
Conflicts:
	ChangeLog
	doc/config.rst
	js/messages.php
	libraries/config/setup.forms.php
	version_check.php

changed 'libraries/Util.class.php' to accept the newly renamed proxy variables
 2013-07-29 18:12:04 +02:00
Madhura Jayaratne
6d2d17e575 Merge branch 'master' into pma_string 2013-07-27 23:08:42 +05:30
Madhura Jayaratne
b31a9cd16f Simplify how inline edit link is added. 2013-07-27 20:10:12 +05:30
Madhura Jayaratne
2a28436bdd #4035 Query "inline" link disappears when turning off "Explain SQL" option 2013-07-27 20:03:26 +05:30
Dieter Adriaenssens
ad8aa19097 remove duplicate code, CURLOPT_RETURNTRANSFER is set twice 2013-07-27 14:25:42 +02:00
Madhura Jayaratne
e5519859fb Make all string function accessible via $GLOBALS['PMA_String'] 2013-07-17 16:36:13 +05:30
Isaac Bennetch
e65826c408 Merge branch 'configurableMenus' of git://github.com/kasunchathuranga/phpmyadmin into kasunchathuranga-configurableMenus 2013-07-14 00:24:16 -04:00
Michal Čihař
df3502e804 Another adding of comma to sentences 2013-07-12 15:54:18 +02:00
Kasun Chathuranga
f56891acec Merge branch 'master' into configurableMenus 
Conflicts:
	libraries/Menu.class.php
	libraries/Util.class.php
 2013-07-12 17:01:03 +05:30
Michal Čihař
eb2f4634b3 wrap some long lines 2013-07-12 11:03:50 +02:00
Michal Čihař
e338e91e9d Improve version parsing to cope with version numbers we use currently 2013-07-12 10:54:59 +02:00
Michal Čihař
fc163bb512 Move version parsing to Util class 2013-07-12 10:54:01 +02:00
Michal Čihař
e4e6e1e46f Set timeout for version check requests 
Ported from setup script code (setup/lib/index.lib.php).
 2013-07-12 10:25:34 +02:00
Michal Čihař
dcd8d12cf6 Move version gathering into function and test it 2013-07-12 10:21:17 +02:00
Kasun Chathuranga
b756916c46 Manage user groups 2013-07-08 15:28:57 +05:30