Michal Čihař
67543568b1
Merge commit 'f414eb577b13f908f4bea09d69ddc944b7f4629c'
...
Conflicts:
libraries/schema/Visio_Relation_Schema.class.php
2013-06-11 13:33:25 +02:00
Michal Čihař
f414eb577b
bug #3631 Drop not working Visio schema export.
2013-06-11 13:31:33 +02:00
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
Michal Čihař
08665f2ca7
Hide params from DBI connect methods as well
2013-06-10 15:04:54 +02:00
Michal Čihař
f5e5cc8d02
Better handle boolean values in traceback
2013-06-10 15:02:16 +02:00
Marc Delisle
21dab1ba05
Merge commit '9b414c0'
2013-06-10 08:04:15 -04:00
Marc Delisle
684c85d90f
Merge commit '063a2d9'
2013-06-10 08:03:38 -04:00
Weblate
9b414c0025
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
2013-06-10 14:02:19 +02:00
Dadan Setia
3215d68c24
Translated using Weblate (Indonesian)
...
Currently translated at 74.8% (1946 of 2603)
2013-06-10 14:02:16 +02:00
Marc Delisle
063a2d9937
bug #3964 Import using https does not work
2013-06-10 08:02:00 -04:00
Weblate
f23d7fc736
Merge remote-tracking branch 'origin/master'
2013-06-10 11:59:57 +02:00
Dadan Setia
b1554e044e
Translated using Weblate (Indonesian)
...
Currently translated at 71.4% (1903 of 2665)
2013-06-10 11:59:49 +02:00
Michal Čihař
6e0264b023
Merge remote-tracking branch 'origin/QA_4_0'
2013-06-10 11:59:02 +02:00
J.M
1ac9560aa7
Update session upload progress bug comment in import_status.php
2013-06-09 16:46:01 +02:00
J.M
953a530d40
Update session upload progress bug comment in import_status.php
2013-06-09 16:41:29 +02:00
Weblate
8db55be0c2
Merge remote-tracking branch 'origin/master'
2013-06-09 13:45:28 +02:00
Ghanshyam Bagul
fc7f0cf6eb
Translated using Weblate (Hindi)
...
Currently translated at 54.4% (1449 of 2665)
2013-06-09 13:45:18 +02:00
Marc Delisle
62fe63ac9b
Merge commit 'a2593c0'
2013-06-09 07:44:57 -04:00
Marc Delisle
be578027ce
Merge commit 'b5089cf'
2013-06-09 07:44:10 -04:00
Marc Delisle
2014051542
Merge commit '70a3d4a'
2013-06-09 07:43:57 -04:00
Weblate
a2593c0c93
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
2013-06-09 13:43:08 +02:00
Ghanshyam Bagul
8f61a48478
Translated using Weblate (Hindi)
...
Currently translated at 57.0% (1483 of 2603)
2013-06-09 13:43:05 +02:00
Rouslan Placella
b5089cf908
bug #3971 Ctrl/shift + click opens links in same window
2013-06-09 07:42:21 -04:00
Ghanshyam Bagul
c0fbf1338c
Translated using Weblate (Hindi)
...
Currently translated at 53.7% (1432 of 2665)
2013-06-09 11:26:04 +02:00
Ghanshyam Bagul
2964153fe7
Translated using Weblate (Hindi)
...
Currently translated at 53.7% (1432 of 2665)
2013-06-09 11:25:25 +02:00
