Commit Graph

40508 Commits

Author SHA1 Message Date
Madhura Jayaratne
d466571b9c Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-06-17 07:33:44 +05:30
Madhura Jayaratne
2b6f807b61 Add borders 2011-06-17 07:28:24 +05:30
Madhura Jayaratne
1b2ed15272 If all the rows contain SRID, use OpenStreetMaps on the initial loading 2011-06-17 06:58:21 +05:30
Marc Delisle
79f28d8dbb ChangeLog entry for patch 2011-06-16 16:16:09 -04:00
Rouslan Placella
d90bad9a8b Patch #3316969 PMA_ajaxShowMessage() does not respect timeout 2011-06-16 16:15:12 -04:00
Madhura Jayaratne
4338b70d9f Merge branch 'QA_3_4'
Conflicts:
	js/sql.js
2011-06-16 21:23:12 +05:30
Madhura Jayaratne
9d2269d297 bug #3317293 [edit] Inline edit places HTML line breaks in edit area 2011-06-16 21:05:54 +05:30
Marc Delisle
51af35ee14 Merge branch 'QA_3_4' 2011-06-16 07:57:54 -04:00
Jacob Middag
99bae4acb9 patch #3317206 [privileges] Generate password option missing on new accounts 2011-06-16 07:57:09 -04:00
Madhura Jayaratne
3792b786d8 JavaScript code moved into .js file 2011-06-16 09:56:02 +05:30
Madhura Jayaratne
3c28961b9f Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
Conflicts:
	themes/original/css/theme_right.css.php
	themes/pmahomme/css/theme_right.css.php
2011-06-16 08:52:31 +05:30
Madhura Jayaratne
7a232336f7 Better doc comments 2011-06-16 08:39:23 +05:30
Madhura Jayaratne
92f4d21456 OpenStreetMaps now zoom correctly. 2011-06-16 08:17:16 +05:30
Pootle server
6f305d4081 Merge remote-tracking branch 'origin/master' 2011-06-16 00:40:06 +02:00
stefan
9bfa22c1ff Translation update done using Pootle. 2011-06-16 00:11:07 +02:00
stefan
351ef09b90 Translation update done using Pootle. 2011-06-16 00:10:58 +02:00
stefan
032d3ea658 Translation update done using Pootle. 2011-06-16 00:10:49 +02:00
stefan
f82d2beb09 Translation update done using Pootle. 2011-06-16 00:10:17 +02:00
stefan
e20532c0c4 Translation update done using Pootle. 2011-06-16 00:10:03 +02:00
stefan
df476a1b93 Translation update done using Pootle. 2011-06-16 00:09:44 +02:00
stefan
9e7e3b39af Translation update done using Pootle. 2011-06-16 00:09:31 +02:00
stefan
b90bf04618 Translation update done using Pootle. 2011-06-16 00:07:17 +02:00
stefan
aaead6b53c Translation update done using Pootle. 2011-06-16 00:06:46 +02:00
stefan
fa7a286e59 Translation update done using Pootle. 2011-06-16 00:06:30 +02:00
stefan
0d8f486a7b Translation update done using Pootle. 2011-06-16 00:05:55 +02:00
stefan
3c5979e104 Translation update done using Pootle. 2011-06-16 00:04:05 +02:00
stefan
ac1acdb727 Translation update done using Pootle. 2011-06-15 23:59:55 +02:00
stefan
2eb9a08b05 Translation update done using Pootle. 2011-06-15 23:57:02 +02:00
stefan
49d8d4aa62 Translation update done using Pootle. 2011-06-15 23:55:56 +02:00
stefan
991548f00d Translation update done using Pootle. 2011-06-15 23:55:16 +02:00
stefan
920d9a01df Translation update done using Pootle. 2011-06-15 23:54:09 +02:00
stefan
0df42cb61f Translation update done using Pootle. 2011-06-15 23:53:55 +02:00
stefan
4d21881b6e Translation update done using Pootle. 2011-06-15 23:53:34 +02:00
stefan
bfadd8098c Translation update done using Pootle. 2011-06-15 23:52:52 +02:00
stefan
2819f6cb2a Translation update done using Pootle. 2011-06-15 23:51:32 +02:00
stefan
374166e7e1 Translation update done using Pootle. 2011-06-15 23:51:10 +02:00
stefan
6ea13531b4 Translation update done using Pootle. 2011-06-15 23:50:52 +02:00
stefan
3669d3f769 Translation update done using Pootle. 2011-06-15 23:50:31 +02:00
stefan
d13b6b054e Translation update done using Pootle. 2011-06-15 23:50:14 +02:00
stefan
f5e5614400 Translation update done using Pootle. 2011-06-15 23:49:51 +02:00
stefan
6b65eebebe Translation update done using Pootle. 2011-06-15 23:48:44 +02:00
stefan
849911e099 Translation update done using Pootle. 2011-06-15 23:46:54 +02:00
stefan
cd682d897a Translation update done using Pootle. 2011-06-15 23:46:18 +02:00
stefan
c640f54635 Translation update done using Pootle. 2011-06-15 23:46:01 +02:00
stefan
f6a0ff9c2f Translation update done using Pootle. 2011-06-15 23:45:16 +02:00
stefan
fbb2157224 Translation update done using Pootle. 2011-06-15 23:44:36 +02:00
stefan
2a1268b95e Translation update done using Pootle. 2011-06-15 23:44:01 +02:00
stefan
abac8ccae7 Translation update done using Pootle. 2011-06-15 23:43:45 +02:00
stefan
8b3cc87892 Translation update done using Pootle. 2011-06-15 23:42:32 +02:00
stefan
fa4fec50a4 Translation update done using Pootle. 2011-06-15 23:41:34 +02:00