Commit Graph

57488 Commits

Author SHA1 Message Date
Madhura Jayaratne
75c4a2ed45 Merge branch 'QA_3_4'
Conflicts:
	js/sql.js
2011-10-05 20:22:47 +05:30
Madhura Jayaratne
ad5c7f5d0a bug #3418849 [interface] Inline edit shows dropdowns even after closing 2011-10-05 08:55:19 +05:30
Madhura Jayaratne
0cacdc7fca Merge branch 'QA_3_4'
Conflicts:
	libraries/navigation_header.inc.php
2011-10-05 00:42:56 +05:30
Madhura Jayaratne
f7a31e5f4c bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false 2011-10-05 00:34:56 +05:30
Rouslan Placella
306901394e Fixed usage of undefined function PMA_getImage() in setup script 2011-10-04 19:51:02 +01:00
Dieter Adriaenssens
8adddca21f Merge branch 'QA_3_4' 2011-10-04 19:16:10 +02:00
Dieter Adriaenssens
e234958545 Merge branch 'MAINT_3_4_6' into QA_3_4 2011-10-04 19:15:42 +02:00
Dieter Adriaenssens
ca597dc423 [security] Fixed XSS in setup (host parameter), see PMASA-2011-16 2011-10-04 19:15:19 +02:00
Pootle server
afd311a74c Merge remote-tracking branch 'origin/master' 2011-10-04 12:40:18 +02:00
Marc Delisle
c25b7c8966 Merge branch 'QA_3_4' 2011-10-04 06:20:48 -04:00
Marc Delisle
bc5aa87ae9 Merge branch 'MAINT_3_4_6' into QA_3_4 2011-10-04 06:20:28 -04:00
Marc Delisle
1af420e223 [security] Fixed XSS in setup (verbose parameter) 2011-10-04 06:20:17 -04:00
Marc Delisle
73913f135e Use standard SQL terminology in format string 2011-10-04 05:49:20 -04:00
Pootle server
6bd5553b40 Merge remote-tracking branch 'origin/master' 2011-10-03 22:40:08 +02:00
Marc Delisle
f06ab07979 Merge branch 'QA_3_4' 2011-10-03 15:12:44 -04:00
Marc Delisle
7d586b458d Merge branch 'MAINT_3_4_6' into QA_3_4 2011-10-03 15:12:01 -04:00
Dieter Adriaenssens
d35cba9808 Fixed local path disclosure vulnerability, see PMASA-2011-15 2011-10-03 20:44:43 +02:00
Dieter Adriaenssens
fbaa5cc1a1 Fixed local path disclosure vulnerability, see PMASA-2011-15 2011-10-03 20:44:05 +02:00
Pootle server
41018d1ba0 Merge remote-tracking branch 'origin/master' 2011-10-03 20:40:10 +02:00
Dieter Adriaenssens
e05b37d3c9 Fixed local path disclosure vulnerability, see PMASA-2011-15 2011-10-03 20:38:36 +02:00
Marc Delisle
2ff7b4cc93 Fix merge conflicts 2011-10-03 12:42:35 -04:00
Marc Delisle
0baec64a64 Merge branch 'QA_3_4' 2011-10-03 12:41:32 -04:00
Marc Delisle
b939d1048e 3.4.7-dev is starting 2011-10-03 12:41:20 -04:00
Marc Delisle
46a1afb372 Preparing for 3.4.6-rc1 2011-10-03 12:34:18 -04:00
Matรญas Bellone
1a9d34c26f Translation update done using Pootle. 2011-10-03 15:56:25 +02:00
Matรญas Bellone
4866f0ced6 Translation update done using Pootle. 2011-10-03 15:50:22 +02:00
Piotr Przybylski
a1da3096a1 Pure CSS linear gradient for IE 10 and new syntax for linear gradient in Safari 5.1 and Chrome 10+
Added browser versions in comments
2011-10-02 22:41:48 +02:00
Victor Volkov
c54b318076 Translation update done using Pootle. 2011-10-02 18:59:12 +02:00
Victor Volkov
1d42f75b2d Translation update done using Pootle. 2011-10-02 18:53:49 +02:00
Victor Volkov
9258ca71b6 Translation update done using Pootle. 2011-10-02 18:52:56 +02:00
Pootle server
ff905c4af4 Merge remote-tracking branch 'origin/master' 2011-10-02 14:40:08 +02:00
Victor Volkov
a13f578f30 Translation update done using Pootle. 2011-10-02 13:56:40 +02:00
Victor Volkov
96cc76694f Translation update done using Pootle. 2011-10-02 13:49:50 +02:00
Victor Volkov
765ead9550 Translation update done using Pootle. 2011-10-02 13:49:28 +02:00
Victor Volkov
15b41d7189 Translation update done using Pootle. 2011-10-02 13:44:47 +02:00
Marc Delisle
1df108de90 Fix merge conflicts 2011-10-02 07:41:32 -04:00
Victor Volkov
1fc90dd81a Translation update done using Pootle. 2011-10-02 13:37:38 +02:00
Victor Volkov
495188f9bd Translation update done using Pootle. 2011-10-02 13:36:08 +02:00
Marc Delisle
2c7b06f543 Merge branch 'QA_3_4' 2011-10-02 07:35:54 -04:00
Victor Volkov
b3a55fe5e1 Translation update done using Pootle. 2011-10-02 13:35:43 +02:00
Victor Volkov
32a881d5bd Translation update done using Pootle. 2011-10-02 13:31:09 +02:00
Victor Volkov
543dd3e514 Translation update done using Pootle. 2011-10-02 13:29:45 +02:00
Victor Volkov
5ab716578d Translation update done using Pootle. 2011-10-02 13:29:34 +02:00
Victor Volkov
95ae9d4dc8 Translation update done using Pootle. 2011-10-02 13:29:11 +02:00
Victor Volkov
3ca1be58a3 Translation update done using Pootle. 2011-10-02 13:28:28 +02:00
Victor Volkov
ddf7e6853b Translation update done using Pootle. 2011-10-02 13:28:11 +02:00
Victor Volkov
50e2301982 Translation update done using Pootle. 2011-10-02 13:25:58 +02:00
Marc Delisle
e27961b1b2 bug #3417089 [synchronize] Extraneous db choices 2011-10-02 07:25:45 -04:00
Pootle server
95a0777b2e Merge remote-tracking branch 'origin/master' 2011-10-02 06:40:25 +02:00
Madhura Jayaratne
634220143b Valid starts 2011-10-02 08:12:24 +05:30