Commit Graph

6871 Commits

Author SHA1 Message Date
Marc Delisle
da46a09c24 rfe #3310562 Wording about Column 2011-06-02 11:25:12 -04:00
Marc Delisle
ee481df7c8 Merge branch 'QA_3_4' 2011-06-02 10:44:57 -04:00
Marc Delisle
98d113270e bug #3306981 [interface] pmahomme and table statistics 2011-06-02 10:44:45 -04:00
Marc Delisle
b5c1ee6509 Merge branch 'QA_3_4' 2011-05-30 16:33:09 -04:00
Marc Delisle
99eb0cde32 bug #3308072 [auth] Version disclosure to anonymous visitors 2011-05-30 16:32:29 -04:00
Marc Delisle
7d8be177ef ChangeLog for three features from GSoC 2011 2011-05-28 07:00:37 -04:00
Marc Delisle
ecc81cc238 bug #3308476 [interface] "Show all" not persistent after a sort 2011-05-27 16:04:53 -04:00
Marc Delisle
72bc4b6543 bug #3308476 [interface] "Show all" not persistent after a sort 2011-05-27 16:00:40 -04:00
Marc Delisle
468238bd08 bug #3306958 [interface] Unnecessary Details slider 2011-05-24 10:36:14 -04:00
Marc Delisle
24a7764533 bug #3306958 [interface] Unnecessary Details slider 2011-05-24 10:35:04 -04:00
Michal Čihař
e6026f6faf Merge remote-tracking branch 'origin/QA_3_4' 2011-05-23 13:22:11 +02:00
Michal Čihař
eb52f22eb0 bug #3276001 [core] Avoid caching of index.php. 2011-05-23 13:19:43 +02:00
Michal Čihař
181705cbd1 Merge remote-tracking branch 'origin/QA_3_4' 2011-05-23 10:39:33 +02:00
Michal Čihař
adc6de0685 [auth] Fixed error handling for signon auth method.
The message is now stored in caller session data and properly displayed
in example script.
2011-05-23 10:33:14 +02:00
Madhura Jayaratne
21c3493d3c Merge branch 'QA_3_4' 2011-05-22 22:41:55 +05:30
Madhura Jayaratne
e936257d44 bug #3305883 [interface] Table is dropped regardless of confirmation 2011-05-22 22:01:47 +05:30
Madhura Jayaratne
6619e39d63 Merge branch 'QA_3_4' 2011-05-22 13:06:05 +05:30
Madhura Jayaratne
16305005c5 bug #3305517 [config] Config for export compression not used 2011-05-22 13:00:39 +05:30
Madhura Jayaratne
633f63004b Merge branch 'QA_3_4' 2011-05-22 09:33:48 +05:30
Madhura Jayaratne
f5eaf8c7d8 bug #3305606 [interface] Show all button wraps on privileges page 2011-05-22 09:30:44 +05:30
Dieter Adriaenssens
f64de0a3ea Remove deprecated function PMA_DBI_get_fields 2011-05-20 23:21:11 +02:00
Marc Delisle
da8521c9b1 3.4.1 2011-05-20 13:17:56 -04:00
Marc Delisle
16a28bbeaa 3.4.1 2011-05-20 13:17:17 -04:00
Marc Delisle
15e0b38073 Merge branch 'QA_3_4' 2011-05-20 12:55:55 -04:00
Marc Delisle
20cf17923e Merge branch 'MAINT_3_4_1' into QA_3_4 2011-05-20 12:55:32 -04:00
Marc Delisle
89c8f3cbfe ChangeLog entries for security fixes 2011-05-20 12:55:23 -04:00
Marc Delisle
0a345d8ee1 Merge branch 'QA_3_4' 2011-05-18 08:07:06 -04:00
Yuichiro
81f939f5df patch #3303813 [setup] Define a label that was missing 2011-05-18 08:06:44 -04:00
Marc Delisle
5fdf725d5b Merge branch 'QA_3_4' 2011-05-18 07:39:51 -04:00
Marc Delisle
ac9d911c3f bug #3303869 [interface] Unnecessary scrolling on Databases page 2011-05-18 07:39:42 -04:00
Madhura Jayaratne
62d922fac0 Merge branch 'QA_3_4' 2011-05-17 22:28:53 +05:30
Madhura Jayaratne
6780808723 Correction to the changelog entry 2011-05-17 22:25:46 +05:30
Madhura Jayaratne
8590dc5a7f Merge branch 'QA_3_4' 2011-05-17 22:20:54 +05:30
Madhura Jayaratne
b091f91f92 bug #3301249 [interface] Iconic table operations does not remove inline edit label 2011-05-17 22:15:58 +05:30
Marc Delisle
f4d9b34b9d 3.4.2-dev 2011-05-17 07:47:18 -04:00
Marc Delisle
9a8407e5ce 3.4.2-dev 2011-05-17 07:43:15 -04:00
Marc Delisle
ffe3a79301 Merge branch 'QA_3_4' 2011-05-17 07:23:42 -04:00
Marc Delisle
46245d0c9b bug #3302733 [core] Some browsers report an insecure https connection 2011-05-17 07:22:56 -04:00
Marc Delisle
c74fad43c4 Merge branch 'QA_3_4' 2011-05-16 12:53:25 -04:00
Marc Delisle
71a533536b bug #3302872 [synchronize] Synchronize and user name 2011-05-16 12:53:10 -04:00
Michal Čihař
69fefacf1a Merge branch 'QA_3_4' 2011-05-16 16:20:14 +02:00
Herman van Rink
c021d2f719 bug #3285929 [privileges] Revert temporary fix 2011-05-16 14:51:42 +02:00
Marc Delisle
0d0df4a37e Merge branch 'QA_3_4' 2011-05-15 18:25:53 -04:00
Marc Delisle
ee22340d83 bug #3300981 [navi] Table filter is case sensitive 2011-05-15 18:25:20 -04:00
Yuichiro
e53fa42980 Patch #3302354 Add gettext wrappers around a message 2011-05-15 13:40:11 -04:00
Marc Delisle
8d3f3201fa Merge branch 'QA_3_4' 2011-05-15 13:24:42 -04:00
Yuichiro
6923ccab3e Patch #3302313 Show a translated label 2011-05-15 13:23:51 -04:00
Thilanka
4d3d5eb46d Patch #3256122 [search] Show/hide db search results 2011-05-15 13:07:32 -04:00
Marc Delisle
9ac8148754 Merge branch 'QA_3_4' 2011-05-15 12:37:52 -04:00
Madhura Jayaratne
dd3bd9043d Changelog entry 2011-05-15 12:37:22 -04:00
Marc Delisle
5f4a8e6a97 Update to jQuery 1.6.1 2011-05-14 08:26:00 -04:00
Marc Delisle
ecd28686b8 "up to date" message on main page when current version is up to date 2011-05-13 06:37:15 -04:00
Marc Delisle
3ff49129e1 Merge branch 'QA_3_4' 2011-05-12 12:59:28 -04:00
Marc Delisle
900a580089 - Bug #3301108 Synchronize and already configured host
- Also, some fields must be readonly instead of disabled
2011-05-12 12:57:28 -04:00
ayax88
3222d3a43d Add support for mass prefix change (rfe#2021981). 2011-05-11 13:33:29 +02:00
Marc Delisle
9fd029b10c Merge branch 'QA_3_4' 2011-05-11 06:16:00 -04:00
Marc Delisle
d2e6208688 3.4.0 release 2011-05-11 06:15:38 -04:00
Marc Delisle
082d0e5c8e 3.4.0 release 2011-05-11 06:12:16 -04:00
Marc Delisle
0e40c042cf 3.4.1-dev 2011-05-07 11:08:12 -04:00
Marc Delisle
9d42dfc1c4 3.4.1-dev 2011-05-07 11:06:15 -04:00
Marc Delisle
fd1ac3cdac 3.5.0-dev 2011-05-06 06:13:40 -04:00
Herman van Rink
5569316389 bug #3285929 [privileges] Don't fail silently on missing priviledge to execute REVOKE ALL PRIVILEGES 2011-04-29 22:06:48 +02:00
Marc Delisle
b2d9121f18 Remove the custom color picker feature 2011-04-22 07:00:45 -04:00
Marc Delisle
626d6d8557 bug #3134495 [synchronization] Data containing single quotes prevents sync 2011-04-21 09:23:14 -04:00
Marc Delisle
d6c91e4c7d ChangeLog entry for this bug report 2011-04-20 10:10:34 -04:00
Michal Čihař
da57d39e87 Merge branch 'QA_3_3'
Conflicts:
	Documentation.html
	README
	libraries/Config.class.php
	translators.html
2011-03-21 11:40:01 +01:00
Marc Delisle
86cdc9f7bb 3.3.11-dev 2011-03-19 07:58:11 -04:00
Michal Čihař
8fb267930e bug #3039384 [auth] Force signon auth on signon URL change. 2011-03-18 16:12:16 +01:00
Michal Čihař
efd8db8298 bug #3208723 [import] Fix import of utf-8 XML files.
The string should be already in utf-8.
2011-03-18 15:36:04 +01:00
Samiran Raj Boro
d2bee66fc4 server variables documentation link in server_variables.php
- $doclink is not used anymore as we dont use the value after echo the link
- $VARIABLE_DOC_LINKS is first check isset() because it might not be stored in our ./libraries/server_variables_doc.php

if any new variables are introduced in new version of MySQL it must be added to server_variable_doc.php to display the link
2011-03-16 11:51:09 +01:00
Michal Čihař
60933d667b bug #3206876 [core] Work without mbstring installed.
This is patch from upstream php-gettext, which will be included in next
release there.
2011-03-15 08:07:13 +01:00
Dieter Adriaenssens
e0a70f4c6b Update library PHPExcel to version 1.7.6 2011-03-02 20:56:37 +01:00
Michal Čihař
a5e5cc6a7b rfe #1168350 [interface] Add clear button to SQL edit box. 2011-03-02 14:30:59 +01:00
Michal Čihař
c052954bec rfe #1312657 [dbi] Default to mysqli extension. 2011-03-02 14:19:01 +01:00
Michal Čihař
8149492cbe rfe #1640812 [auth] Add example for OpenID authentication using signon method. 2011-03-02 13:46:43 +01:00
Michal Čihař
d0d236fd62 rfe #2936155 [auth] Allow to pass additional parameters using signon method. 2011-03-02 11:44:57 +01:00
Michal Čihař
e3db72428a Changelog entry 2011-03-01 16:42:49 +01:00
Marc Delisle
8af00da90d ChangeLog for Ajaxify browse and delete criteria 2011-02-28 12:52:04 -05:00
Michal Čihař
95e841ec2d Merge branch 'QA_3_3'
Conflicts:
	lang/german-utf-8.inc.php
2011-02-21 13:51:52 +01:00
Michal Čihař
c722cf64a3 Update German translation, tracker #3187551 2011-02-21 13:46:01 +01:00
Michal Čihař
3d213ed827 Merge branch 'QA_3_3' 2011-02-14 10:45:10 +01:00
Marc Delisle
e165326388 Reference to minor security fixes 2011-02-12 13:37:11 -05:00
Marc Delisle
6e750d1d48 3.3.9.2 ChangeLog 2011-02-11 12:53:40 -05:00
Marc Delisle
4812f4ce0f 3.3.9.2 ChangeLog 2011-02-11 12:53:01 -05:00
Michal Čihař
41813c09aa [interface] Indicate shared bookmarks in interface. 2011-02-10 13:47:24 +01:00
Michal Čihař
69c0a887fc bug #3177136 [interface] Indicate that bookmark is being used on browse. 2011-02-10 10:15:07 +01:00
Michal Čihař
677e5a5da7 rfe #3148361 [interface] Replace hard coded limit with $cfg[LimitChars]. 2011-02-08 22:03:18 +01:00
Marc Delisle
ae44d8b113 ChangeLog for 3.3.9.1 2011-02-08 08:23:30 -05:00
Marc Delisle
09b124c272 ChangeLog for 3.3.9.1 2011-02-08 08:20:20 -05:00
Marc Delisle
06081b8f78 3.3.9.1 release 2011-02-08 08:17:36 -05:00
Michal Čihař
cd74e9fa5d bug #3175227 [auth] Reset user cache on login. 2011-02-08 13:15:01 +01:00
Michal Čihař
a8afc24b42 Changelog entry 2011-02-08 11:54:51 +01:00
Michal Čihař
67a8a06c1a [interface] Default to not count tables in database.
This gives big performance penalty in case there is many databases and
the number of tables is not that much useful to justify it.
2011-01-28 14:29:44 +01:00
Michal Čihař
dc0c6938b2 [security] Redirect external links to avoid Referer leakage. 2011-01-28 13:22:41 +01:00
Michal Čihař
d50215684a [interface] Add link to documentation for status variables. 2011-01-28 09:28:59 +01:00
Marc Delisle
e7d9457431 rfe #3158867 [privileges] No DROP DATABASE warning if you delete a user 2011-01-15 09:23:57 -05:00
Michal Čihař
eeea3d6845 [export] Better handling of export to PHP array.
There is no need for own logic here, we can use var_export.
2011-01-13 13:42:24 +01:00
Marc Delisle
89552c74c4 Merge branch 'QA_3_3' 2011-01-12 08:05:40 -05:00
Marc Delisle
31cd4bdd6a bug #3155842 [core] Edit relational page and page number 2011-01-12 08:04:57 -05:00
Marc Delisle
45eb47fe14 Merge branch 'QA_3_3' 2011-01-08 13:45:40 -05:00
Marc Delisle
8244589813 Bug #3153409 [core] 0 row(s) affected 2011-01-08 13:44:28 -05:00
Madhura Jayaratne
066b746bef patch #3150164 [structure] Ordering by size gives incorrect results 2011-01-03 08:10:49 -05:00
Marc Delisle
cfca67f422 Merge branch 'QA_3_3' 2011-01-03 08:03:41 -05:00
Madhura Jayaratne
55cd2fd898 patch #3150164 [structure] Ordering by size gives incorrect results 2011-01-03 08:02:28 -05:00
Marc Delisle
895e69ec2a 3.3.9 release 2011-01-03 07:02:08 -05:00
Marc Delisle
18f50cc043 3.3.9 release 2011-01-03 06:59:30 -05:00
Marc Delisle
97716f5a5a 3.3.9 release 2011-01-03 06:53:58 -05:00
erickoh75
3fc7fc55ee patch #3147400 [structure] Aria table size printed as unknown 2010-12-29 08:31:51 -05:00
erickoh75
a022d7aa59 patch #3147400 [structure] Aria table size printed as unknown 2010-12-29 08:30:16 -05:00
Marc Delisle
ab393d3f82 Bug #3141327 (Foreign key input options) 2010-12-27 08:29:31 -05:00
Marc Delisle
7d9313245b rfe #3141330 [relation] When displaying results, show a link to the foreign table even when phpMyAdmin configuration storage is not active 2010-12-25 15:41:37 -05:00
Marc Delisle
30696bcbd0 3.3.10-dev 2010-12-22 12:30:00 -05:00
Marc Delisle
abbbd192bf 3.3.10-dev 2010-12-22 12:29:09 -05:00
Dieter Adriaenssens
5d915f1ff6 Merge branch 'QA_3_3'
Conflicts:

	libraries/sqlparser.lib.php
2010-12-13 21:36:51 +01:00
Dieter Adriaenssens
8afdcbe2b8 bug #3127904, Close all opened round brackets indents 2010-12-13 21:18:33 +01:00
Marc Delisle
b36fb9e8bf Fix merge conflicts 2010-12-11 08:19:42 -05:00
Marc Delisle
b6f717a602 bug #3125606 [parser] Query for table "level" causes strange display 2010-12-11 08:03:50 -05:00
Marc Delisle
1f5896a88b Avoid bug entries that relate to a version not yet released 2010-12-11 07:48:30 -05:00
Adnan
c871141236 bug #3112614 [pdf schema] Scratchboard for PDF pages not working 2010-12-09 08:03:59 -05:00
Adnan
2ba852dc5c bug #3112614 [pdf schema] Scratchboard for PDF pages not working 2010-12-09 08:01:51 -05:00
Dieter Adriaenssens
e69bbb4ec1 Use less noisy message and remove disable link on database statistics 2010-12-08 20:21:51 +01:00
Dieter Adriaenssens
7dcd159da6 bug #3119882, Display query chart on demand 2010-12-04 15:12:45 +01:00
Dieter Adriaenssens
d370730eff bug #3119874, Show integers without decimals on status page 2010-12-04 14:13:51 +01:00
Michal Čihař
89f03ef81b bug #3123433 [interface] Avoid double escaping of MySQL errors.
The PMA_DBI_getError function already does escaping, so there is no need
to escape that string again on displaying.
2010-12-02 17:14:59 +01:00
Marc Delisle
a93399b8a4 the goal of master is currently to stabilize 3.4.0 2010-12-02 07:37:12 -05:00
Marc Delisle
ad1468c8a2 Merge branch 'QA_3_4' 2010-11-29 13:03:29 -05:00
Marc Delisle
0593112674 Merge branch 'MAINT_3_4_0' into QA_3_4 2010-11-29 13:03:10 -05:00
Marc Delisle
dff18d6af8 3.3.8.1 correct release date and PMASA ref 2010-11-29 13:02:51 -05:00
Marc Delisle
bc0b9fa744 3.3.8.1 correct release date and PMASA ref 2010-11-29 13:01:59 -05:00
Michal Čihař
86f566ce7b Merge branch 'QA_3_4' 2010-11-28 18:12:10 +01:00
Michal Čihař
adaa0ab3a5 Merge branch 'MAINT_3_4_0' into QA_3_4
Conflicts:
	ChangeLog
2010-11-28 18:12:01 +01:00
Marc Delisle
1199f7a3db Merge branch 'QA_3_4' 2010-11-28 08:16:37 -05:00
Marc Delisle
ae764b973f fix merge conflicts 2010-11-28 08:15:53 -05:00
garas
a3ae93f776 patch #3112792 [navi] Left panel table grouping incorrect 2010-11-28 08:12:22 -05:00
Herman van Rink
fff3afc08e bug #3115519: Prevent long queries from being shown in confirmation popup 2010-11-26 20:55:58 +01:00
Marc Delisle
87fa9bd524 ChangeLog for XSS fix 2010-11-26 09:12:18 -05:00
Marc Delisle
968a8d2ad7 ChangeLog for XSS fix 2010-11-26 09:10:47 -05:00
Marc Delisle
3f12de1746 ChangeLog for XSS fix 2010-11-26 09:08:51 -05:00
Marc Delisle
b1103e2db9 fix merge conflicts 2010-11-26 09:07:19 -05:00
Dieter Adriaenssens
468d08f975 Merge branch 'QA_3_4' 2010-11-24 16:59:12 +01:00
Dieter Adriaenssens
4e6a1bb0a9 Merge branch 'MAINT_3_4_0' into QA_3_4 2010-11-24 16:58:58 +01:00
Dieter Adriaenssens
d1a6f043e2 Merge branch 'QA_3_3' into MAINT_3_4_0 2010-11-24 16:58:06 +01:00
Craig Duncan
d6a7bd40fa patch #3117535, replication : Add quotes to database in initial statement 2010-11-24 16:56:32 +01:00
Marc Delisle
782beabb6a 3.4.1-dev 2010-11-22 13:26:56 -05:00
Marc Delisle
9c8514fb97 3.5.0-dev 2010-11-22 13:23:08 -05:00
Marc Delisle
3b74d9ba01 credits 2010-11-19 13:07:49 -05:00
Marc Delisle
b2d7a78012 rfe #3111455 [interface] Column highlighting and marking in table view 2010-11-18 17:11:04 -05:00
Dieter Adriaenssens
65fcab4122 Merge branch 'QA_3_3' 2010-11-14 21:08:28 +01:00
Dieter Adriaenssens
63aec5b328 bug #1762306, Copy database with view of a view 2010-11-14 21:03:13 +01:00
Dieter Adriaenssens
57c5abf579 Merge branch 'QA_3_3' 2010-11-14 18:28:10 +01:00
Dieter Adriaenssens
8277c92e25 bug #3077463, Events were not copied when copying/renaming database 2010-11-14 18:27:10 +01:00
Marc Delisle
5f4604c9bb bug #3103853 [js] Double quotes were not escaped in generated js; I think this only applies to 3.3.x 2010-11-06 07:51:06 -04:00
Marc Delisle
e93a16f5a3 fix merge conflicts 2010-11-04 06:35:35 -04:00
jirand
81a338db80 patch #3101490 Default function for TIMESTAMP 2010-11-04 06:27:31 -04:00
Marc Delisle
fff8f28a53 Merge branch 'QA_3_3' 2010-10-29 05:39:02 -04:00
Marc Delisle
540cd447a3 bug [doc] Fix references to MySQL doc 2010-10-29 05:38:12 -04:00
Marc Delisle
f734c4c1ac 3.3.8 release 2010-10-25 12:20:34 -04:00
Marc Delisle
60e468cd18 3.3.8 release 2010-10-25 12:19:24 -04:00
Michal Čihař
10bbd76fc1 bug #3087682 [interface] Do not apply LeftFrameDBSeparator on first character. 2010-10-21 11:32:49 +02:00
Marc Delisle
61851eb80d 3.3.9-dev 2010-10-18 06:11:12 -04:00
Marc Delisle
266b8e3aaf 3.3.9-dev 2010-10-18 06:09:38 -04:00
Marc Delisle
7cbdcd6be1 fix merge conflicts 2010-10-09 06:37:30 -04:00
Marc Delisle
2d4b9e2aea support ARIA storage engine as well as its previous name MARIA 2010-10-09 06:35:06 -04:00
Dieter Adriaenssens
90c48f8696 Merge branch 'QA_3_3' 2010-10-07 20:51:08 +02:00
Dieter Adriaenssens
8c34269e52 bug #3062454, Display routines/events also when no tables are defined 2010-10-07 20:32:07 +02:00
Marc Delisle
d1bebc67f6 fix merge conflicts 2010-10-03 09:42:40 -04:00
Marc Delisle
1c49cd3d64 bug #3038193 [display] Error when editing row with GEOMETRY column 2010-10-03 09:34:08 -04:00
Marc Delisle
f503d5667e Merge branch 'QA_3_3' 2010-09-29 08:04:47 -04:00
Marc Delisle
22fa5adee3 bug #3056023 [import] USE query not working 2010-09-29 08:04:32 -04:00
Dieter Adriaenssens
1fe6e59d73 Merge branch 'QA_3_3' 2010-09-28 20:07:00 +02:00
Dieter Adriaenssens
c0d1c7a2ae export/copy procedures and routines before tables 2010-09-28 19:37:03 +02:00
Michal Čihař
728034d7ea bug #1669459 [interface] Do not automatically mark PDF schema rows to delete 2010-09-16 16:18:23 +02:00
Michal Čihař
8417db5866 rfe #2956556 [interface] Allow to wrap enum values. 2010-09-16 16:02:49 +02:00
Michal Čihař
1b187c909d rfe #1105678 [interface] Drop page-break-before as it is useless for smaller tables.
In real world you have quite a lot of tables with just few fields and
for these page-break-before is really a bad idea.
2010-09-16 15:35:36 +02:00
Michal Čihař
f47e0933c3 [core] Force generating of new session on login
This improves security because session ID and token are generated fresh
for each user.
2010-09-16 15:19:46 +02:00
Dieter Adriaenssens
ae04356ed2 Merge branch 'QA_3_3' 2010-09-11 16:34:16 +02:00
Dieter Adriaenssens
adaa35a87f Update library PHPExcel to version 1.7.4 2010-09-11 16:18:42 +02:00
Dieter Adriaenssens
77b6fb172d Merge branch 'QA_3_3'
Conflicts:

	ChangeLog
2010-09-10 17:34:52 +02:00
Dieter Adriaenssens
194e357a99 BIGINT field type added to table analysis on import 2010-09-10 17:28:12 +02:00
Marc Delisle
db08d6ad3a 3.3.7 release 2010-09-07 12:33:58 -04:00
Marc Delisle
e9605b9473 3.3.7 release 2010-09-07 12:33:03 -04:00
Michal Čihař
a727fd587d Unify plain text documentation formatting a little bit.
Most of things (except ChangeLog) are now proper reStructuredText.
2010-09-07 15:17:08 +02:00
Michal Čihař
0431042bd0 Drop $Id$ expansion, nobody complained so far it not working. 2010-09-07 15:00:44 +02:00
Herman van Rink
223d8850cf patch #3055886 [config] Add Left frame table filter visibility config option, thanks to eesau 2010-09-02 14:35:30 +02:00
Herman van Rink
7aa4aa62dc bug #3056610 [interface] Removed modification options for information_schema 2010-09-02 11:53:53 +02:00
Marc Delisle
9b846d65a8 3.3.8-dev 2010-08-31 12:11:49 -04:00
Michal Čihař
b58db4c2e7 Merge branch 'QA_3_3' 2010-08-30 17:30:47 +02:00
Michal Čihař
73ce5705bd [setup] Fixed escaping of server name. 2010-08-30 17:30:37 +02:00
Michal Čihař
0bf02f05f1 Merge branch 'QA_3_3'
Conflicts:
	libraries/sqlparser.data.php
	pdf_pages.php
2010-08-30 17:24:55 +02:00
Michal Čihař
061b87f11f bug #3035300 [parser] Fixed wrong definition of keywords. 2010-08-30 17:23:50 +02:00
Michal Čihař
4f487780a0 bug #3042665 [parser] Add workaround for MySQL way of handling backtick. 2010-08-30 17:19:11 +02:00
Michal Čihař
fdb0d32df4 Merge branch 'QA_3_3' 2010-08-30 14:18:02 +02:00
Michal Čihař
4a234050f2 bug #3054458 [core] Fixed displaying number of rows. 2010-08-30 14:17:51 +02:00
Michal Čihař
7f1b1df69f [core] Remove last remaining parts of profiling code which was removed in 2006. 2010-08-30 11:01:31 +02:00
Michal Čihař
d17fba309c Fix permissions.
Most files were made executable somewhere in ninadsp tree, reverting
this.
2010-08-30 09:53:37 +02:00
Marc Delisle
949f068733 3.3.6 release 2010-08-28 10:46:02 -04:00
Marc Delisle
23da6a6e1a 3.3.6 release 2010-08-28 10:44:56 -04:00
Marc Delisle
56381c086f adapted patch #3050492 to new code 2010-08-28 08:57:27 -04:00
Martin Schönberger
fee00e61aa Patch #3050492, Cannot drag table box to the edge 2010-08-28 08:16:05 -04:00
Marc Delisle
9a9399e07a Credits for Ninad Pundalik 2010-08-27 17:50:20 -04:00
ninadsp
9c34a0eec9 Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches 2010-08-28 01:53:52 +05:30
Herman van Rink
0ea410c3e4 updated changelog 2010-08-26 10:01:08 +02:00
Michal Čihař
5c63cbd231 Merge branch 'QA_3_3'
Conflicts:
	Documentation.html
	README
	libraries/Config.class.php
	translators.html
2010-08-23 17:10:04 +02:00
Michal Čihař
03d3062a65 Credits and changelog for Lori. 2010-08-23 11:17:15 +02:00
Michal Čihař
4a75c9b26e Changelog and credits for schema export. 2010-08-23 11:14:30 +02:00
Michal Čihař
5a51858352 [relations] Dropped WYSIWYG-PDF configuration variable. 2010-08-23 11:05:12 +02:00
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Marc Delisle
67b3567543 Users preferences log entry 2010-08-21 08:13:44 -04:00
Marc Delisle
9036ac09e3 3.3.7-dev 2010-08-20 13:03:13 -04:00
Michal Čihař
862e3ca2a7 Merge branch 'QA_3_3'
Conflicts:
	libraries/core.lib.php
	server_databases.php
	server_privileges.php
2010-08-20 13:40:37 +02:00
Michal Čihař
41145feb12 Merge branch 'MAINT_3_3_5' into QA_3_3
Conflicts:
	ChangeLog
	libraries/common.lib.php
2010-08-20 13:36:49 +02:00
Michal Čihař
d128f80605 Changelog. 2010-08-20 13:33:32 +02:00
Michal Čihař
5128563d07 Merge branch 'QA_3_3'
Conflicts:
	libraries/common.lib.php
	libraries/core.lib.php
2010-08-20 11:11:27 +02:00
Michal Čihař
893abac3e5 bug #3042495 [core] Move PMA_sendHeaderLocation to core.lib.php.
It might be needed from common.inc.php even if PMA_MINIMUM_COMMON is
defined.
2010-08-20 11:09:15 +02:00
Michal Čihař
5f837f08c9 Merge branch 'QA_3_3' 2010-08-20 11:02:50 +02:00
Michal Čihař
a29323a1a6 bug #3044189 [doc] Cleared documentation for hide_db. 2010-08-20 11:02:38 +02:00
ninadsp
c0ee037c59 Resolved a Merge Conflict 2010-08-17 18:25:03 +05:30
Marc Delisle
bda213a5ac bug #3042706 [pmadb] Relations, bookmarks, etc deleted after table drop 2010-08-11 10:48:05 -04:00
Marc Delisle
dda6de20d2 bug #3042706 [pmadb] Relations, bookmarks, etc deleted after table drop 2010-08-10 17:55:04 -04:00
ninadsp
95a8521f11 Merge remote branch 'origin/master' 2010-08-10 00:55:22 +05:30
Marc Delisle
ba038ed6e1 fix merge conflict 2010-08-07 07:10:18 -04:00
Marc Delisle
789d3a4131 Withdraw or edit FAQ entries related to older MySQL or PHP 2010-08-07 07:08:11 -04:00
Marc Delisle
75d5afd401 merge conflict 2010-08-07 06:30:13 -04:00
Marc Delisle
04c2f9d254 bug #3040226 [XHTML] LockFromUpdate checkbox not checked by default 2010-08-07 06:27:04 -04:00
ninadsp
a458147969 Merge from upstream. Resolved a conflict in js/functions.js 2010-08-05 23:51:14 +05:30
Marc Delisle
fd65dcdcd1 Merge branch 'QA_3_3' 2010-08-05 13:00:24 -04:00
Marc Delisle
d42dab9dd4 patch #3039269 [dbi] Wrong variable checked for nopassword option 2010-08-05 12:22:56 -04:00
Hauke Henningsen
5675555d5a patch #3038312 [export] JSON export 2010-08-03 13:08:21 -04:00
Isaac Bennetch
6383f23035 patch #3038293 [doc] Language and grammar fixes 2010-08-03 12:39:02 -04:00
Marc Delisle
887e2be664 fix merge conflicts 2010-08-01 06:20:10 -04:00
Marc Delisle
fd1d214d35 bug #3036132 [core] Triggers not fetched if dbname has an hyphen 2010-08-01 06:17:03 -04:00
Marc Delisle
f9f987f544 Merge branch 'QA_3_3' 2010-07-31 14:54:34 -04:00
Marc Delisle
7951b2bacc bug #3034026 [confirmation] TRUNCATE queries get no confirmation request 2010-07-31 14:54:05 -04:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Michal Čihař
39aa4355a9 Convert default queries to unified expansion. 2010-07-27 10:01:58 +02:00
Michal Čihař
442294fa60 [interface] Fixed rendering of error/notice/info titles background. 2010-07-27 09:48:37 +02:00
Michal Čihař
6405357c0f Changelog entry. 2010-07-27 09:43:39 +02:00
Michal Čihař
bc4dbbd8c2 Merge branch 'QA_3_3' 2010-07-26 18:29:49 +02:00
Marc Delisle
e43fe5a8f1 3.3.5 release 2010-07-26 12:27:30 -04:00
Marc Delisle
f3f073a0ba 3.3.5 release 2010-07-26 12:26:41 -04:00
Michal Čihař
cfc7fd7a2d The linked-tables infrastructure is now called phpMyAdmin configuration storage. 2010-07-26 17:16:55 +02:00
Michal Čihař
bcc372b5c5 Merge branch 'QA_3_3' 2010-07-26 15:51:48 +02:00
Michal Čihař
049fc7fef7 bug #3031705 [core] Fix generating condition for real numbers by comparing them to string. 2010-07-26 15:51:26 +02:00
Michal Čihař
83d458aa05 Revert "bug #3031705 [core] Do not use CONCAT for DECIMAL fields."
This reverts commit ef500cd23f.

We probably need to use CONCAT still, just the other side should be
converted to string as well.
2010-07-26 15:45:36 +02:00
Marc Delisle
cdcc5d7443 Merge branch 'QA_3_3' 2010-07-25 13:33:03 -04:00
Marc Delisle
053d6ca88e bug #3033063 [core] Navi gets wrong db name 2010-07-25 13:32:35 -04:00
Marc Delisle
0a05b396b3 Merge branch 'MAINT_3_3_5' 2010-07-25 07:54:43 -04:00
Marc Delisle
368cf8d74f Merge branch 'MAINT_3_3_5' into QA_3_3 2010-07-25 07:53:41 -04:00
Marc Delisle
58021a8e6c bug [scripts] MySQL 5.5.5 does not accept TIMESTAMP(14) in create_tables.sql 2010-07-25 07:53:07 -04:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
06cf763358 [interface] Better formatting for SQL validator results. 2010-07-21 13:45:32 +02:00
Michal Čihař
1faec011d0 SQL validator works also with SOAP PHP extension. 2010-07-21 13:17:15 +02:00
Michal Čihař
709c97dee3 Chagelog update. 2010-07-21 10:17:35 +02:00
Michal Čihař
60b2d5a3a4 Merge branch 'QA_3_3'
Conflicts:
	Documentation.html
	README
	libraries/Config.class.php
	translators.html
2010-07-20 14:39:46 +02:00
Michal Čihař
ef500cd23f bug #3031705 [core] Do not use CONCAT for DECIMAL fields. 2010-07-20 14:37:53 +02:00
Michal Čihař
0305c10f91 rfe #3016457 [interface] Define tab order in SQL form to allow easier tab navigation. 2010-07-20 14:19:46 +02:00
Michal Čihař
11e53fb141 [core] Dropped AllowAnywhereRecoding configuration variable.
It really does not make sense these days, now the recoding of
export/import is available when the necessary extensions are loaded and
it is possible to disable it using RecodingEngine directive.
2010-07-20 12:05:07 +02:00
Michal Čihař
a4055b4773 [core] RecodingEngine now accepts none as valid option. 2010-07-20 11:56:21 +02:00
ninadsp
e7b130baf7 Merge remote branch 'origin/master' 2010-07-19 21:54:37 +05:30
Marc Delisle
4e5061d323 Generate password only available if JS is enabled 2010-07-19 10:03:17 -04:00
Marc Delisle
0c9cbf6c6e 3.3.6-dev 2010-07-18 14:35:21 -04:00
Marc Delisle
828d008838 3.3.6-dev 2010-07-18 14:34:32 -04:00
Dieter Adriaenssens
e31dcc11ef Merge branch 'QA_3_3'
Conflicts:

	libraries/import.lib.php
2010-07-14 22:32:10 +02:00
Dieter Adriaenssens
dbe5daaad3 Converting number of Excel column names no longer limited 2010-07-14 22:29:26 +02:00
ninadsp
9dd93987ca Reverted po files changes. 2010-07-15 00:17:49 +05:30
Dieter Adriaenssens
84b5a0af5b Merge branch 'QA_3_3' 2010-07-13 23:40:34 +02:00
Dieter Adriaenssens
22b0ac9079 remove todo, after upgrade PHPExcel 2010-07-13 23:39:42 +02:00
Dieter Adriaenssens
17fc1370f3 Merge branch 'QA_3_3'
Conflicts:

	ChangeLog
	libraries/import.lib.php
2010-07-13 23:27:15 +02:00
Dieter Adriaenssens
6648c620d9 Convert Excel column name correctly 2010-07-13 23:23:51 +02:00
Dieter Adriaenssens
d7b8248997 Update library PHPExcel 1.7.3c in QA_3_3 branch 2010-07-13 20:23:31 +02:00
Dieter Adriaenssens
64a2832ac8 Update library PHPExcel to version 1.7.3c 2010-07-13 20:07:41 +02:00
Dieter Adriaenssens
ee0b2895ce Update library PHPExcel to version 1.7.3 2010-07-13 20:02:18 +02:00
Marc Delisle
f6ef0c87a8 Merge branch 'QA_3_3' 2010-07-12 08:57:05 -04:00
Marc Delisle
cda9df7101 bug [export] CSV for MS Excel (Windows) should have semi-colon as separator 2010-07-12 08:56:30 -04:00
Marc Delisle
ce2cad2886 fix merge conflicts 2010-07-11 08:05:50 -04:00
Marc Delisle
b55ba34d43 bug #3023507 [core] No result set display from stored procedure SELECT 2010-07-11 08:00:42 -04:00
Marc Delisle
b2616ac46d bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from master, todo: update PHP excel?) 2010-07-10 08:01:07 -04:00
Marc Delisle
c1be602a1e fix merge conflicts 2010-07-08 07:52:47 -04:00
Marc Delisle
20d4c3a894 bug #3026400 [PHP] ereg functions are deprecated 2010-07-08 07:49:11 -04:00
ninadsp
020dac8c89 Merge remote branch 'origin/master' 2010-07-07 18:53:41 +05:30
Marc Delisle
bd09ef50ff Merge branch 'QA_3_3' 2010-07-06 16:58:50 -04:00
Marc Delisle
9903c5f3d0 bug #3025975 [auth] Odd LoginCookieValidity default value 2010-07-06 16:58:13 -04:00
Piotr Przybylski
573edc0329 patch #3025161 [core] Prevent sending of unnecessary cookies 2010-07-06 11:43:02 -04:00
ninadsp
e049c1d158 Merge remote branch 'origin/master'
Conflicts:
	po/fr.po
	po/sl.po
2010-07-03 21:00:08 +05:30
Marc Delisle
9e857f9f84 fix merge conflicts 2010-07-02 12:32:00 -04:00
Marc Delisle
6ea9467949 bug #3024344 [setup] Setup forces numeric MemoryLimit 2010-07-02 12:26:54 -04:00
Marc Delisle
01d6fed4e2 fix merge conflicts 2010-06-30 11:37:53 -04:00
Marc Delisle
108f3305e9 bug: avoid loading twice a js file 2010-06-30 11:35:46 -04:00
ninadsp
bcbf327139 Merge remote branch 'origin/master' 2010-06-29 23:54:01 +05:30
Marc Delisle
116d1297af solve merge conflicts 2010-06-29 08:23:47 -04:00
Marc Delisle
852ed51c27 bug [replication] Do not offer information_schema in the list of databases 2010-06-29 08:14:31 -04:00
Marc Delisle
90ac3d39a0 bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible 2010-06-29 07:56:10 -04:00
Marc Delisle
f463b1cc7a bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible 2010-06-29 07:48:28 -04:00
Marc Delisle
af6c9cf8a8 3.3.4 release 2010-06-28 07:38:57 -04:00
Marc Delisle
c699af70e9 3.3.4 release 2010-06-28 07:37:55 -04:00
ninadsp
ac7cab7160 Revert "Revert "Merge remote branch 'origin/master'""
This reverts commit 4214d83e12.
2010-06-26 15:45:27 +05:30
ninadsp
4214d83e12 Revert "Merge remote branch 'origin/master'"
This reverts commit c850b8be8b, reversing
changes made to dcdde2f99f.
2010-06-26 15:43:52 +05:30
ninadsp
c850b8be8b Merge remote branch 'origin/master'
Conflicts:
	po/tr.po
2010-06-26 15:38:12 +05:30
Marc Delisle
1be2d538df fix merge conflicts 2010-06-24 10:09:19 -04:00
Stéphane Pontier
4c0e653de0 patch #2932113 Slow export when having lots of databases 2010-06-24 10:01:21 -04:00
Marc Delisle
3efb889d61 3.3.5-dev 2010-06-20 06:27:15 -04:00
Marc Delisle
12edc03e2f 3.3.5-dev 2010-06-20 06:25:07 -04:00
ninadsp
a8d6f9ff4c Merge remote branch 'origin/master' 2010-06-15 15:39:51 +05:30
Marc Delisle
f1d8953670 fix conflicts 2010-06-13 08:59:05 -04:00
Marc Delisle
ae8ddbf15b bug #2986422 [import] Results for query are not displayed 2010-06-13 08:42:24 -04:00
Michal Čihař
8dfdcca68b Merge branch 'QA_3_3' 2010-06-11 12:41:33 +02:00
Michal Čihař
1e2731dc96 [engines] Fix getting InnoDB status. 2010-06-11 12:41:18 +02:00
ninadsp
834b36bd6a Merge remote branch 'origin/master' 2010-06-09 22:49:38 +05:30
Marc Delisle
e05ced2a21 Merge branch 'QA_3_3' 2010-06-08 12:41:56 -04:00
Isaac Bennetch
122d86c1c5 patch #3013264 FAQ 1.40 correction 2010-06-08 12:41:26 -04:00
ninadsp
42de77813c Merge remote branch 'origin/master' 2010-06-06 20:01:39 +05:30
Marc Delisle
f50d6694e7 bug #3011126 [display] Edit link missing after long query 2010-06-05 08:28:24 -04:00
Marc Delisle
c3ea6fb22b bug #3011126 [display] Edit link missing after long query 2010-06-05 08:20:36 -04:00
Dieter Adriaenssens
662f3d4da3 merge with master 2010-06-03 21:21:34 +02:00
Dieter Adriaenssens
b4d8e58a72 Update library PHPExcel to version 1.7.3c 2010-06-03 20:35:06 +02:00
ninadsp
160f4314eb Merge remote branch 'origin/master' 2010-06-03 22:34:52 +05:30
Lorikeet Lee
f1f3b2a54e patch #2999595, rfe #2998130 [interface] Cleanup navigation frame.
These things do not bring much added value and just take space.
2010-06-03 14:14:02 +02:00
Marc Delisle
5dfe98a378 bug [privileges] List of tables not shown when the db name has a wildcard 2010-06-02 12:37:19 -04:00
Marc Delisle
5d525e89eb bug [privileges] List of tables not shown when the db name has a wildcard 2010-06-02 12:32:54 -04:00
Marc Delisle
39c73a94ee bug [synchronize] Rows were deleted in target table regardless of the "Would you like to delete..." option 2010-06-01 12:43:46 -04:00
Marc Delisle
432379c87d bug [synchronize] Rows were deleted in target table regardless of the "Would you like to delete..." option 2010-06-01 12:34:57 -04:00
Marc Delisle
d18a3eb3c0 Merge branch 'QA_3_3' 2010-05-30 08:44:33 -04:00
Marc Delisle
cfcec687fa bug #2986383 Not all data being shown / counted 2010-05-30 08:43:41 -04:00
Marc Delisle
62556cb5b6 Merge branch 'QA_3_3' 2010-05-28 13:07:29 -04:00
Marc Delisle
f483cdb123 bug #3008411 Last dropped database remains active in navi 2010-05-28 13:06:06 -04:00
Dieter Adriaenssens
9c6e8bc186 Update library PHPExcel to version 1.7.3 2010-05-25 22:10:48 +02:00
Michal Čihař
fc8cbf0c28 Merge branch 'QA_3_3'
Conflicts:
	lang/afrikaans-utf-8.inc.php
	lang/albanian-utf-8.inc.php
	lang/arabic-utf-8.inc.php
	lang/azerbaijani-utf-8.inc.php
	lang/bangla-utf-8.inc.php
	lang/basque-utf-8.inc.php
	lang/belarusian_cyrillic-utf-8.inc.php
	lang/belarusian_latin-utf-8.inc.php
	lang/bosnian-utf-8.inc.php
	lang/brazilian_portuguese-utf-8.inc.php
	lang/bulgarian-utf-8.inc.php
	lang/catalan-utf-8.inc.php
	lang/chinese_simplified-utf-8.inc.php
	lang/chinese_traditional-utf-8.inc.php
	lang/croatian-utf-8.inc.php
	lang/czech-utf-8.inc.php
	lang/danish-utf-8.inc.php
	lang/dutch-utf-8.inc.php
	lang/english-utf-8.inc.php
	lang/estonian-utf-8.inc.php
	lang/finnish-utf-8.inc.php
	lang/french-utf-8.inc.php
	lang/galician-utf-8.inc.php
	lang/georgian-utf-8.inc.php
	lang/german-utf-8.inc.php
	lang/greek-utf-8.inc.php
	lang/hebrew-utf-8.inc.php
	lang/hindi-utf-8.inc.php
	lang/hungarian-utf-8.inc.php
	lang/indonesian-utf-8.inc.php
	lang/italian-utf-8.inc.php
	lang/japanese-utf-8.inc.php
	lang/korean-utf-8.inc.php
	lang/latvian-utf-8.inc.php
	lang/lithuanian-utf-8.inc.php
	lang/macedonian_cyrillic-utf-8.inc.php
	lang/malay-utf-8.inc.php
	lang/mongolian-utf-8.inc.php
	lang/norwegian-utf-8.inc.php
	lang/persian-utf-8.inc.php
	lang/polish-utf-8.inc.php
	lang/portuguese-utf-8.inc.php
	lang/romanian-utf-8.inc.php
	lang/russian-utf-8.inc.php
	lang/serbian_cyrillic-utf-8.inc.php
	lang/serbian_latin-utf-8.inc.php
	lang/sinhala-utf-8.inc.php
	lang/slovak-utf-8.inc.php
	lang/slovenian-utf-8.inc.php
	lang/sort_lang.sh
	lang/spanish-utf-8.inc.php
	lang/swedish-utf-8.inc.php
	lang/tatarish-utf-8.inc.php
	lang/thai-utf-8.inc.php
	lang/turkish-utf-8.inc.php
	lang/ukrainian-utf-8.inc.php
	lang/uzbek_cyrillic-utf-8.inc.php
	lang/uzbek_latin-utf-8.inc.php
2010-05-25 16:12:51 +02:00
Michal Čihař
6fb04650a8 Changelog entry. 2010-05-25 15:24:48 +02:00
ninadsp
38ac78e3ba merging changes from origin 2010-05-24 18:32:42 +05:30
Marc Delisle
abc229d0b0 bug #3004216 Field attributes use inline CSS 2010-05-23 08:27:27 -04:00
ninadsp
bed1948d04 testing git setup - no major change made in code yet
only added a few comments
2010-05-23 01:22:01 +05:30
Panagiotis Papazoglou
40ee06f0b6 Greek update 2010-05-18 12:38:01 -04:00
Panagiotis Papazoglou
3c33759072 Greek update 2010-05-18 12:35:33 -04:00
Michal Čihař
b22daddbb7 Merge branch 'QA_3_3' 2010-05-11 11:56:31 +02:00
Michal Čihař
bc5d816449 [browse] Fix handling of sort order if only column is specified. 2010-05-11 11:56:25 +02:00
Marc Delisle
8a106dbad1 3.3.3 release 2010-05-10 12:31:05 -04:00
Marc Delisle
fb9d4037cc 3.3.3 release 2010-05-10 12:30:01 -04:00
Marc Delisle
78bb9c71c0 bug #2998889 Import button does not work in Catalan 2010-05-09 07:07:15 -04:00
Marc Delisle
5227d998ec bug #2998889 Import button does not work in Catalan 2010-05-09 07:00:49 -04:00
Dieter Adriaenssens
b8db7a63eb merge QA_3_3 2010-05-03 23:25:49 +02:00
Dieter Adriaenssens
a3a47a429d properly escape import value 2010-05-03 23:13:11 +02:00
Marc Delisle
435a470445 3.3.4.0-dev 2010-05-01 15:21:33 -04:00
Marc Delisle
f57a5cfdf9 3.3.4.0-dev 2010-05-01 15:20:38 -04:00
Marc Delisle
89c08b468b Merge branch 'QA_3_3' 2010-04-29 12:54:55 -04:00
Marc Delisle
6b50847a8c bug #2993970 Page numbering in Table of Contents 2010-04-29 12:54:25 -04:00
Marc Delisle
05a7a9f307 Merge branch 'QA_3_3' 2010-04-29 12:31:10 -04:00
Marc Delisle
ef2a411db9 bug #2994168 Show auto_increment in uppercase 2010-04-29 12:30:59 -04:00
Marc Delisle
9ec14c786c Avoid selecting UNHEX function by default for a BLOB column for which editing is protected 2010-04-28 13:15:49 -04:00
Marc Delisle
b76df0d609 Avoid selecting UNHEX function by default for a BLOB column for which editing is protected 2010-04-28 13:06:09 -04:00
Marc Delisle
ba0ca1851a Merge branch 'QA_3_3' 2010-04-26 16:38:46 -04:00
Marc Delisle
06c8fa0abb Tracking report should obey MaxCharactersInDisplayedSQL 2010-04-26 16:38:20 -04:00
Marc Delisle
a9bfc2cd5b Merge branch 'QA_3_3' 2010-04-26 07:42:25 -04:00
Marc Delisle
6393fff59d bug #2975408 Data too long for column data_sql 2010-04-26 07:41:36 -04:00
Michal Čihař
2154120e3a [core] Include Content Security Policy HTTP headers.
See <https://wiki.mozilla.org/Security/CSP/Specification> for more
details. I hope current rule is flexible enough to avoid impact on
existing functionality.
2010-04-25 16:51:53 +02:00
Marc Delisle
ec263b9170 Merge branch 'QA_3_3' 2010-04-25 07:10:20 -04:00
Marc Delisle
e9ee6cf1d1 bug #2983065 Error when changing from Maria to MyISAM engine 2010-04-25 07:09:39 -04:00
Marc Delisle
bd90d40def bug #2974067 non-binary fields shown as hex 2010-04-23 14:07:03 -04:00
Marc Delisle
acdf39e95b bug #2974067 non-binary fields shown as hex 2010-04-23 14:00:53 -04:00
Michal Čihař
7faaf32f50 [doc] Incorporate synchronisation docs into main document.
This is not as detailed as the original was, but we really don't have
detailed documentation right now.
2010-04-22 15:50:55 +02:00
Michal Čihař
7f5be87f3c Merge branch 'QA_3_3' 2010-04-20 10:22:26 +02:00
Madhura Jayaratne
769aec95ef [engines] Fix warnings when changing table engine to Maria.
bug #2983062, patch #2989408
2010-04-20 10:22:10 +02:00
Muhammad Adnan
378094ac30 [interface] Use jQuery calendar dialog.
rfe #2983207, patch #2988715
2010-04-20 10:08:41 +02:00
Marc Delisle
e537f88313 rfe 2988629 Improve labels in relation view 2010-04-18 08:52:44 -04:00
Marc Delisle
5a75ca180a rfe #2988633 Improve ON DELETE/ON UPDATE drop-downs 2010-04-17 19:22:12 -04:00
Michal Čihař
13b9403d74 rfe #2964518 [interface] Allow to choose servers from configuration for synchronisation. 2010-04-16 16:26:13 +02:00
Michal Čihař
87d19393b3 rfe #2972969 [interface] Fix flipping of headers in non-IE browsers. 2010-04-16 15:41:13 +02:00
Michal Čihař
84d25c0c00 rfe #2981999 [interface] Default sort order is now SMART. 2010-04-16 15:13:43 +02:00
Michal Čihař
956c2fadca Fix author name. 2010-04-16 15:13:13 +02:00
Michal Čihař
541c99c084 Merge branch 'QA_3_3' 2010-04-16 09:58:27 +02:00
Sutharshan Balachandren
69dd779f40 [interface] Fix initial state of tables in designer.
bug #2983060, patch #2987900
2010-04-16 09:57:53 +02:00
Sutharshan Balachandren
e194beb978 [interface] Add javascript validation of datetime input.
patch #2983960
2010-04-16 09:53:44 +02:00
Philip Frank
c77216d532 [interface] Convert upload progress bar to jQuery.
patch #2986073
2010-04-15 10:36:23 +02:00
Herman van Rink
72b18cbb9d Merge branch 'QA_3_3' 2010-04-14 14:10:12 +02:00
Martynas Mickevičius
55572a531c Patch #2986708: Fix for the bug #2983066 2010-04-14 14:09:10 +02:00
Marc Delisle
e2ef709f49 3.3.2 release 2010-04-13 16:09:53 -04:00
Marc Delisle
9607165535 3.3.2 release 2010-04-13 15:06:00 -04:00
Madhura Jayaratne
846ce15039 [engines] Fix parsing of PBXT status. 2010-04-13 13:54:25 +02:00
Dieter Adriaenssens
ed9ef7cb12 Merge branch 'QA_3_3' 2010-04-12 20:17:23 +02:00
Dieter Adriaenssens
f73b0e0195 PHPExcel : IBM AIX iconv() does not work 2010-04-12 20:15:13 +02:00
Michal Čihař
8e68430610 [edit] CURRENT_TIMESTAMP is also valid for datetime fields. 2010-04-12 09:55:58 +02:00
Michal Čihař
76ae26376e Fix folding expression. 2010-04-12 09:55:11 +02:00
sutharshan
9fda4bb515 Convert loading of export/import to jQuery ready event.
This way it is done after document is fully loaded and no race
conditions can appear as with inline js.

patch #2984337, bug #2983446
2010-04-11 11:17:47 +02:00
Marc Delisle
3c475d8599 Merge branch 'QA_3_3' 2010-04-10 07:25:42 -04:00
Madhura Jayaratne
d0d24a6e71 Patch #2984893 - InnoDB storage page emits warning 2010-04-10 07:22:37 -04:00
Michal Čihař
d2873126e1 patch #2984058 [edit] Buttons for quicky creating common SQL queries.
Thanks to sutharshan, but the patch was heavily modified.
2010-04-09 11:44:04 +02:00
Marc Delisle
1fc253e19e Merge branch 'QA_3_3' 2010-04-08 10:32:51 -04:00
Ankit Gupta
b3c041bb99 patch #2983492 When asking to synchronize Structure and Data, only Structure is done 2010-04-08 10:32:13 -04:00
Michal Čihař
adbc1b2572 Merge branch 'QA_3_3' 2010-04-07 13:52:07 +02:00
Michal Čihař
c9d7a66210 Merge branch 'MAINT_3_3_2' into QA_3_3 2010-04-07 13:51:58 +02:00
Michal Čihař
7e40035275 Be more specific about problems with Suhosin. 2010-04-07 13:51:43 +02:00
Michal Čihař
08cda2f076 Merge branch 'QA_3_3'
Conflicts:
	Documentation.html
	README
	libraries/Config.class.php
	translators.html
2010-04-07 09:24:12 +02:00
Lorikeet Lee
8a7b66f3a0 Do not group if there would be one table in group. 2010-04-07 09:19:34 +02:00
Marc Delisle
f472cb1498 3.3.3-dev 2010-04-06 13:03:58 -04:00
Marc Delisle
210b7631da 3.3.3-dev 2010-04-06 13:00:48 -04:00
Brian Douglass
6e68e2d149 Patch #2981165 Optionally disable the Type column 2010-04-05 10:06:36 -04:00
Marc Delisle
360101dbfb bug #2973949 SQL History broken (need to revert patch #2899969) 2010-04-04 17:30:36 -04:00
Marc Delisle
1f62ea1932 bug #2973949 SQL History broken (need to revert patch #2899969) 2010-04-04 17:21:48 -04:00
Michal Čihař
764a808e1a Add changelog entry for recent fixes. 2010-04-02 10:13:08 +02:00
Dieter Adriaenssens
20a402ba29 Merge branch 'QA_3_3' 2010-04-01 21:07:09 +02:00
Dieter Adriaenssens
366d50a79b Properly format server status parameter 2010-04-01 20:50:03 +02:00