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
Spun Nakandala
3fabd7728f
$_POST['fields'][...] variables renamed such that they better reflect their intended purpose
2013-06-13 11:31:29 +05:30
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
Spun Nakandala
9ef591e69e
space added before elseif
2013-06-12 17:21:51 +05:30
Spun Nakandala
96bf1782d3
PMA_getHtmlForConfirmPage method added to sql.lib.php to create html for the confirm page.
2013-06-11 21:55:39 +05:30
Spun Nakandala
7f80aa2971
Avoided the use of global variables by directly accessing super global variables.
2013-06-11 20:42:07 +05:30
Weblate
dd0f5aafb7
Merge remote-tracking branch 'origin/master'
2013-06-11 13:38:46 +02:00
Peter Rosa
5995b1e70a
Translated using Weblate (Slovak)
...
Currently translated at 72.5% (1933 of 2665)
2013-06-11 13:38:43 +02:00
Madhura Jayaratne
31d448e7e6
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
2013-06-11 17:08:05 +05:30
Madhura Jayaratne
56db0c29c6
Update the call to renamed functions
2013-06-11 17:04:25 +05:30
Weblate
8cec5e2560
Merge remote-tracking branch 'origin/master'
2013-06-11 13:33:49 +02:00
Peter Rosa
6a35caf22d
Translated using Weblate (Slovak)
...
Currently translated at 72.4% (1929 of 2665)
2013-06-11 13:33:45 +02:00
Michal Čihař
3af2a12162
Merge remote-tracking branch 'origin/QA_4_0'
2013-06-11 13:33:31 +02:00
Michal Čihař
67543568b1
Merge commit 'f414eb577b13f908f4bea09d69ddc944b7f4629c'
...
Conflicts:
libraries/schema/Visio_Relation_Schema.class.php
2013-06-11 13:33:25 +02:00
Madhura Jayaratne
9c681b30af
Rename PMA_import_sessionCheck() -> PMA_Import_sessionCheck()
2013-06-11 17:02:20 +05:30
Weblate
b369f6a912
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
2013-06-11 13:31:53 +02:00
Peter Rosa
29519cb165
Translated using Weblate (Slovak)
...
Currently translated at 76.1% (1981 of 2603)
2013-06-11 13:31:50 +02:00
Madhura Jayaratne
0ecadbba0d
Rename PMA_import_progressCheck() -> PMA_Import_progressCheck()
2013-06-11 17:01:42 +05:30
Michal Čihař
f414eb577b
bug #3631 Drop not working Visio schema export.
2013-06-11 13:31:33 +02:00
Madhura Jayaratne
afdb9ec796
Rename PMA_import_nopluginCheck() -> PMA_Import_nopluginCheck()
2013-06-11 17:00:54 +05:30
Madhura Jayaratne
37eaa0a680
rename PMA_import_apcCheck() -> PMA_Import_apcCheck()
2013-06-11 17:00:11 +05:30
Madhura Jayaratne
0dee9a7789
Wrap a long line
2013-06-11 16:58:55 +05:30
Michal Čihař
68dfc347f9
Fixed formatting of documentation URL (can contain %, so it can not be used as format string)
2013-06-11 13:23:43 +02:00
Michal Čihař
0ee0d8e8c5
bug #3962 Proper escaping of JSON export
...
We now use json_encode instead of home made encoder. Also we now
generate JSON data on the fly, what reduces memory usage.
2013-06-11 11:49:02 +02:00
Michal Čihař
d2ff57bf33
Changelog entries
2013-06-11 11:24:45 +02:00
Michal Čihař
f62b884294
Remove trailing dots from suggested database name
...
This only makes it harder to type it new name (RFE #1429 ).
2013-06-11 11:22:32 +02:00
Michal Čihař
bdcba3b082
Document switching extension as an option (RFE #1427 )
2013-06-11 11:12:59 +02:00
Michal Čihař
95739f8104
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
2013-06-11 11:04:34 +02:00
Michal Čihař
9e1a59b7d7
NDB supports relations since 7.3
...
RFE #1433
2013-06-11 11:03:48 +02:00
Weblate
24cb1cfac5
Merge remote-tracking branch 'origin/master'
2013-06-11 09:00:31 +02:00
Dadan Setia
00ef3cc354
Translated using Weblate (Indonesian)
...
Currently translated at 71.4% (1904 of 2665)
2013-06-11 09:00:23 +02:00
Michal Čihař
5e6d3eaa53
Whitespace cleanup
2013-06-11 08:59:58 +02:00
Michal Čihař
eba0fe6688
Merge remote-tracking branch 'origin/QA_4_0'
2013-06-11 08:59:43 +02:00
Michal Čihař
82c0b75949
Merge commit 'd34f8d5182b34519de2b5b6778d09c49da5111dc'
2013-06-11 08:59:38 +02:00
Weblate
207f04a1d7
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
2013-06-11 08:58:58 +02:00
Dadan Setia
a019f7e7b7
Translated using Weblate (Indonesian)
...
Currently translated at 74.8% (1947 of 2603)
2013-06-11 08:58:55 +02:00
Michal Čihař
d34f8d5182
Disable response wrapper in fatal error path
...
There might be some critical pieces (eg. json, pcre or session) missing
and there is no way to make Response class working at this point.
Fixes #3981
2013-06-11 08:57:49 +02:00
Michal Čihař
b6073bf722
Whitespace cleanup
2013-06-11 08:52:51 +02:00
Marc Delisle
47652894f7
Merge branch 'QA_4_0'
2013-06-10 13:01:22 -04:00
Marc Delisle
be6d6733d9
ChangeLog entry for pull request 409
2013-06-10 13:00:13 -04:00
Kari Söderholm
0a13fa1938
Fix missing post params in export.php for removeCRLF option in ExportCsv
...
and ExportExcel plugins.
This is needed after commit a564d981e9
2013-06-10 12:58:39 -04:00
Kari Söderholm
0181fa9400
Fix regression: Missing removeCRLF option in ExportCsv and ExportExcel plugins.
2013-06-10 12:57:27 -04:00
Michal Čihař
a93592b076
Revert "Missing include"
...
This reverts commit 73862412ee
2013-06-10 17:40:52 +02:00
Michal Čihař
73862412ee
Missing include
2013-06-10 17:27:45 +02:00
Michal Čihař
37781045a4
More reliable Drizzle detection
...
Checking version is not working since Drizzle has changed versioning
scheme. As it does not support charsets, checking whether server
supports these seems to be better approach.
Also see https://bugs.launchpad.net/drizzle/+bug/951788
2013-06-10 15:55:40 +02:00
Michal Čihař
7365676ce0
AJAX request might not be set at this point
2013-06-10 15:20:21 +02:00
Michal Čihař
c07ff28119
Skip postConnect for control user
2013-06-10 15:08:26 +02:00
Michal Čihař
834dfe57f9
Detect Drizzle even in case cache exists
2013-06-10 15:05:50 +02:00
