Michal Čihař
15c3fee596
Document file
2013-08-06 15:03:33 +02:00
Michal Čihař
ee4a97ede0
Wrap long condition
2013-08-06 15:02:08 +02:00
Michal Čihař
dba4f07914
Add missing docs
2013-08-06 15:01:16 +02:00
Michal Čihař
adf5b3bb97
Correctly format comments in generated file
2013-08-06 14:57:25 +02:00
Michal Čihař
1d12c885aa
Ensure same sorting
2013-08-06 14:52:04 +02:00
Michal Čihař
f829c43c06
Coding style
2013-08-06 14:39:40 +02:00
Michal Čihař
53230cba43
Fix variable name
2013-08-06 13:51:30 +02:00
Michal Čihař
0e96f7a8af
Always initialize variable
2013-08-06 13:49:20 +02:00
Michal Čihař
554d0fbb42
Remove tests for removed methods
2013-08-06 13:43:23 +02:00
Michal Čihař
d9278f4a04
Document dropping some of the configuration
2013-08-06 13:38:45 +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ř
2783d92621
Drop no longer used $cfg['SQP']['fmtColor']
2013-08-06 13:31:10 +02:00
Michal Čihař
2c1f014171
Replace getCssCodeMirror by inline CSS
2013-08-06 13:29:47 +02:00
Michal Čihař
94855c2137
Update CodeMirror to 3.15
2013-08-06 13:27:09 +02:00
Michal Čihař
cc3645592f
Drop no longer used config for SQP CSS
2013-08-06 13:21:14 +02:00
Michal Čihař
3af16f504a
Remove no longer used SQP CSS rules
2013-08-06 13:20:16 +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ř
cb413506a6
As PMA_Util::formatSql is now trivial, the test can be as well
2013-08-06 12:24:28 +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ř
9473fb8fed
Remove code for adding MySQL documentation links to query
...
This does not work anyway with CodeMirror based highlighter.
2013-08-06 12:00:06 +02:00
Michal Čihař
6bb21aec66
Do not try to add documentation links with disabled docs
2013-08-06 11:56:37 +02:00
Marc Delisle
76133dd007
Directly use the request parameter
2013-08-06 05:42:34 -04:00
Marc Delisle
ecb2aa89d3
Directly use the request parameter
2013-08-06 05:23:48 -04:00
Marc Delisle
03f5339d6f
Dead code
2013-08-06 05:20:03 -04:00
Michal Čihař
e2d154319d
Merge pull request #567 from adamgsoc2013/ut_plu_dbi
...
add test cases to cover more issues on import and transformations
2013-08-06 01:11:42 -07:00
Weblate
b55f553855
Merge remote-tracking branch 'origin/master'
2013-08-06 10:11:10 +02:00
Myung Han Yu
eb73ee6617
Translated using Weblate (Korean)
...
Currently translated at 69.6% (1889 of 2714)
2013-08-06 10:11:04 +02:00
Michal Čihař
a853666003
Merge pull request #568 from adamgsoc2013/UT_plu_table
...
fix code comments on test codes
2013-08-06 01:10:45 -07:00
adamgsoc2013
202d7f40bc
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into UT_plu_table
2013-08-05 23:50:43 +08:00
adamgsoc2013
66184fe8cc
fix code comments on test code
2013-08-05 23:50:20 +08:00
adamgsoc2013
09e4190073
using space instead of tab; fixing indention
2013-08-05 22:48:49 +08:00
adamgsoc2013
12a827abc4
add test cases to cover more issues on import and transformations
2013-08-05 22:43:33 +08:00
Madhura Jayaratne
6caccf9d1f
Merge pull request #565 from ayushchd/unit_testing_2
...
Fix test case for date issue
2013-08-05 05:06:12 -07:00
Weblate
95fc4d1c76
Merge remote-tracking branch 'origin/master'
2013-08-05 12:03:00 +02:00
Dong-bum Kim
3d81d2110b
Translated using Weblate (Korean)
...
Currently translated at 69.6% (1888 of 2714)
2013-08-05 12:02:57 +02:00
Dieter Adriaenssens
e320e565ab
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (2713 of 2714)
2013-08-05 12:02:53 +02:00
Marc Delisle
246cfdb90e
Directly use the request parameter
2013-08-05 06:00:53 -04:00
ayushchd
c823778b47
Resolve merge conflict
2013-08-05 14:44:04 +05:30
Michal Čihař
3063535532
Merge remote-tracking branch 'origin/QA_4_0'
...
Conflicts:
tbl_tracking.php
2013-08-05 10:02:09 +02:00
Michal Čihař
6cff5f0c47
Merge commit '55bf30f5a8d236dc13a5c4d7d5d9afe7de6cc311'
2013-08-05 10:01:05 +02:00
Michal Čihař
3a6d29f183
Use PMA_generate_common_url for URL parameters
2013-08-05 10:00:39 +02:00
FliegenKLATSCH
bebe981371
Version-Parameter fixed
...
Single Tracking-Entries couldn't be deleted because of missing Version in the Delete-Link.
2013-08-05 09:58:17 +02:00
Michal Čihař
e3f2fc7759
Merge pull request #566 from FliegenKLATSCH/patch-1
...
Version-Parameter fixed
2013-08-05 00:52:54 -07:00
Michal Čihař
d88b6cc64e
Merge pull request #563 from mynetx/demo-footer-repo-link-new-window
...
Demo server footer: Open Git links in new window
2013-08-05 00:51:26 -07:00