Commit Graph

17495 Commits

Author SHA1 Message Date
ninadsp
8ddfb7140d Used localized string for the Inline Edit anchor being generated 2010-08-26 22:22:39 +05:30
ninadsp
f1e72d7664 Removed the inline call to confirmLink() and instead attached the jQuery call to it. jQuery call attached to the proper class 2010-08-26 20:20:51 +05:30
ninadsp
43c18c50b8 Incorrect resolution of merge conflict was causing the database name to not show up on the serverinfo div. Fixed it 2010-08-26 20:19:51 +05:30
ninadsp
bbb94f628f Created a new js file for the tbl_structure.php page and moved jQuery scripts for it into that file 2010-08-26 20:03:15 +05:30
ninadsp
50f2a0d6ea Improved response of the Truncate table action on success 2010-08-26 19:53:27 +05:30
ninadsp
7f9d141a85 Removed the blank new line at the end, which was causing issues 2010-08-24 18:25:09 +05:30
ninadsp
9399f8af8d Improved the appendInlineAnchor() function to edit the text now displayed with each anchor 2010-08-22 13:23:16 +05:30
ninadsp
5a27df6ad8 Missing brackets during the merge. Added them 2010-08-22 12:59:53 +05:30
ninadsp
6a2445ccf2 Fixed the error caused due to a missing index , relocated the code that sets the null class for a null element 2010-08-22 12:59:25 +05:30
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Marc Delisle
7be8236208 comment was no longer accurate 2010-08-20 08:46:59 -04:00
Marc Delisle
22eaa592ca unused code 2010-08-20 08:43:09 -04:00
Michal Čihař
272c57cdba Change back to master after merging to STABLE/TESTING. 2010-08-20 13:56:28 +02:00
Michal Čihař
86baee8d4e Do not apply TESTING/STABLE update to 2.11 branch. 2010-08-20 13:53:01 +02:00
Michal Čihař
2af8ff42e9 Merge branch 'QA_3_3' 2010-08-20 13:42:38 +02:00
Michal Čihař
8b53799f0d Merge branch 'MAINT_3_3_5' into QA_3_3 2010-08-20 13:42:29 +02:00
Michal Čihař
5a0fec9b3c Set version to 3.3.5.1. 2010-08-20 13:42:17 +02: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
Pootle server
7b1c0187cf Merge remote branch 'origin/master' 2010-08-20 12:40:29 +02:00
Michal Čihař
59b3b4916b Escape error message coming from MySQL to avoid XSS on bad parameters. 2010-08-20 11:35:42 +02:00
Michal Čihař
782b8b46be Avoid information disclossure on error. 2010-08-20 11:33:24 +02:00
Kęstutis
8277a89471 Translation update done using Pootle. 2010-08-20 11:23:01 +02:00
Kęstutis
5ed7b73561 Translation update done using Pootle. 2010-08-20 11:22:41 +02:00
Kęstutis
9cf00efb0f Translation update done using Pootle. 2010-08-20 11:22:33 +02:00
Kęstutis
780fdbd616 Translation update done using Pootle. 2010-08-20 11:21:33 +02:00
Kęstutis
445be4c63c Translation update done using Pootle. 2010-08-20 11:20:49 +02:00
Kęstutis
b489c3d3cd Translation update done using Pootle. 2010-08-20 11:20:41 +02:00
Kęstutis
b07916c28a Translation update done using Pootle. 2010-08-20 11:20:15 +02:00
Michal Čihař
bf60ec82e9 Fix possible XSS on IIS redirect page. 2010-08-20 11:20:10 +02:00
Kęstutis
e5d531ef71 Translation update done using Pootle. 2010-08-20 11:20:06 +02:00
Kęstutis
58ba2c0b64 Translation update done using Pootle. 2010-08-20 11:19:49 +02:00
Kęstutis
514075daf1 Translation update done using Pootle. 2010-08-20 11:19:42 +02:00
Kęstutis
0b5de42e31 Translation update done using Pootle. 2010-08-20 11:19:31 +02:00
Kęstutis
8ffb2e5978 Translation update done using Pootle. 2010-08-20 11:19:12 +02:00
Kęstutis
3ba4ff2ff3 Translation update done using Pootle. 2010-08-20 11:16:49 +02:00
Kęstutis
c7a2d1287f Translation update done using Pootle. 2010-08-20 11:15:45 +02:00
Kęstutis
9ee295927d Translation update done using Pootle. 2010-08-20 11:13:47 +02:00
Kęstutis
40723397c2 Translation update done using Pootle. 2010-08-20 11:13:21 +02:00
Kęstutis
bda87b9a3d Translation update done using Pootle. 2010-08-20 11:12:43 +02:00
Kęstutis
57b48a722c Translation update done using Pootle. 2010-08-20 11:11:34 +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
Kęstutis
5a3ad0757f Translation update done using Pootle. 2010-08-20 11:11:27 +02:00
Kęstutis
052be343de Translation update done using Pootle. 2010-08-20 11:11:19 +02:00
Kęstutis
b3fa1d3929 Translation update done using Pootle. 2010-08-20 11:11:02 +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
Kęstutis
0ef89f72b9 Translation update done using Pootle. 2010-08-20 11:08:38 +02:00
Kęstutis
e19ec590ea Translation update done using Pootle. 2010-08-20 11:08:13 +02:00
Kęstutis
f0ed78a8cf Translation update done using Pootle. 2010-08-20 11:06:31 +02:00