Commit Graph

60294 Commits

Author SHA1 Message Date
Madhura Jayaratne
7dddcd837c Minor interface changes to the privileges tab in database view 2011-11-27 23:30:00 +05:30
Marc Delisle
301f8d981a Move the Cancel button next to the Save button 2011-11-27 07:37:43 -05:00
Madhura Jayaratne
3c4e231867 A forgotten change in making JS files load dynamically. 2011-11-27 14:17:07 +05:30
Madhura Jayaratne
e095e926c1 styles for #popup_background is still needed for gis data editor 2011-11-27 14:13:57 +05:30
Marc Delisle
3dce618b7b Merge branch 'QA_3_4' 2011-11-26 06:54:49 -05:00
Marc Delisle
5e61730157 bug #3438420 [core] Magic quotes removed in PHP 5.4 2011-11-26 06:54:40 -05:00
Marc Delisle
277b6a96fa Merge branch 'QA_3_4' 2011-11-26 06:17:16 -05:00
Marc Delisle
dddcddbf38 bug #3442004 [interface] DB suggestion not correct for user with underscore 2011-11-26 06:17:08 -05:00
Madhura Jayaratne
bbc44c410c Merge branch 'QA_3_4'
Conflicts:
	ChangeLog
	Documentation.html
	README
	libraries/Config.class.php
	libraries/display_tbl.lib.php
2011-11-25 18:25:13 +05:30
Madhura Jayaratne
9c278d020c bug #3442028 [edit] Inline editing enum fields with null shows no dropdown 2011-11-25 18:12:53 +05:30
Marc Delisle
b82662961f Freshmeat.net renamed to freecode.com 2011-11-24 17:34:41 -05:00
Marc Delisle
7d553e1bc8 3.4.9-dev 2011-11-24 17:06:51 -05:00
Marc Delisle
c43babad7c 3.4.9-dev 2011-11-24 17:05:44 -05:00
Marc Delisle
96dd071a5f Fix merge conflicts 2011-11-24 16:54:25 -05:00
Michal Čihař
03fd559382 Fix syntax error introduced by f62c4a1809 2011-11-24 19:25:08 +01:00
Madhura Jayaratne
378fe0b597 Merge branch 'QA_3_4' 2011-11-24 23:42:25 +05:30
Madhura Jayaratne
29455fe79b Merge branch 'QA_3_4' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into QA_3_4 2011-11-24 23:12:37 +05:30
Madhura Jayaratne
ff0ea2f9b9 bug #3431427: Fix for enum and set columns 2011-11-24 23:06:12 +05:30
Marc Delisle
cf5faa1dd1 Fix merge conflicts 2011-11-24 12:26:31 -05:00
Madhura Jayaratne
c8dbed11b2 Merge branch 'QA_3_4' 2011-11-24 22:48:25 +05:30
Madhura Jayaratne
f414a0ec32 bug #3407235 [interface] Entering the key through a lookup window does not reset NULL 2011-11-24 22:45:51 +05:30
Rouslan Placella
f22a457199 Removed redundant code. Already using 'onclick' since commit 0c2f7f16f5 2011-11-24 16:44:21 +00:00
Rouslan Placella
f6d0aa3873 Improved the rendering of the designer menu when it's moved to the right 2011-11-24 16:14:43 +00:00
Rouslan Placella
2776f89444 Disabled floating of the menubar in designer and fixed designer menu rendering in IE 2011-11-24 15:48:29 +00:00
Dieter Adriaenssens
f62c4a1809 coding style : control structures 2011-11-24 15:32:30 +01:00
Dieter Adriaenssens
90bd76540c coding style : correct use of includeonce() 2011-11-24 14:47:45 +01:00
Michal Čihař
4ec5f183b3 Fix format string 2011-11-24 08:28:57 +01:00
dannybeckett
2dad6175da Translation update done using Pootle. 2011-11-24 04:01:14 +02:00
Marc Delisle
f9b7a9fdc0 Translation update done using Pootle. 2011-11-24 03:59:15 +02:00
dannybeckett
8dbb1dc6e2 Translation update done using Pootle. 2011-11-24 03:52:14 +02:00
dannybeckett
8050c1f936 Translation update done using Pootle. 2011-11-24 03:16:24 +02:00
dannybeckett
85aae50b58 Translation update done using Pootle. 2011-11-24 03:09:57 +02:00
dannybeckett
ac406d0e9f Translation update done using Pootle. 2011-11-24 03:09:50 +02:00
dannybeckett
e34e48e2b2 Translation update done using Pootle. 2011-11-24 03:09:45 +02:00
dannybeckett
8db897c523 Translation update done using Pootle. 2011-11-24 03:09:35 +02:00
Pootle server
c979a8bec6 Translation update done using Pootle. 2011-11-24 03:08:58 +02:00
dannybeckett
3e5d16a0d9 Translation update done using Pootle. 2011-11-24 03:08:40 +02:00
dannybeckett
6b8af657de Translation update done using Pootle. 2011-11-24 03:08:37 +02:00
dannybeckett
10a6e19994 Translation update done using Pootle. 2011-11-24 03:08:30 +02:00
dannybeckett
d10d4a5670 Translation update done using Pootle. 2011-11-24 03:08:12 +02:00
dannybeckett
16166ee2af Translation update done using Pootle. 2011-11-24 03:08:09 +02:00
dannybeckett
8919278be4 Translation update done using Pootle. 2011-11-24 03:08:00 +02:00
dannybeckett
6163785e3b Translation update done using Pootle. 2011-11-24 03:07:44 +02:00
dannybeckett
2d39757656 Translation update done using Pootle. 2011-11-24 03:07:17 +02:00
dannybeckett
d6d5c4ef54 Translation update done using Pootle. 2011-11-24 03:07:14 +02:00
dannybeckett
718597a85b Translation update done using Pootle. 2011-11-24 03:07:11 +02:00
dannybeckett
a93a83b0cb Translation update done using Pootle. 2011-11-24 03:06:56 +02:00
dannybeckett
7c658b082f Translation update done using Pootle. 2011-11-24 03:06:54 +02:00
dannybeckett
b49d5c5cfa Translation update done using Pootle. 2011-11-24 03:06:51 +02:00
dannybeckett
30c22f5bc8 Translation update done using Pootle. 2011-11-24 03:06:48 +02:00