Commit Graph

52252 Commits

Author SHA1 Message Date
Madhura Jayaratne
79b5bd602e Changelog entries for GIS features 2011-08-17 19:14:43 +05:30
Madhura Jayaratne
d501fc1fe6 Merge branch 'OpenGIS' 2011-08-17 18:02:25 +05:30
Michal Čihař
c04a557c02 Drop databases only if they do exist 2011-08-17 14:18:19 +02:00
Marc Delisle
798e9c44bd Merge commit '4ce54e17340d4155fa4613ff3954c91ad76d55e9' 2011-08-17 07:53:07 -04:00
Michal Čihař
82c6f950eb Avoid loading themes from non directories, . and .. 2011-08-17 13:32:49 +02:00
Michal Čihař
4e94e3e35d Remove unused code 2011-08-17 13:26:46 +02:00
Michal Čihař
a1d6104502 Use Theme class for getting file name 2011-08-17 13:25:48 +02:00
Madhura Jayaratne
0387ea0b40 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-08-17 16:48:50 +05:30
Michal Čihař
aca93f4508 Fix typo in testcase as well 2011-08-17 13:14:26 +02:00
Madhura Jayaratne
46722b8035 Merge branch 'master' into OpenGIS 2011-08-17 16:43:18 +05:30
Michal Čihař
576e76d419 Fix indentation 2011-08-17 12:31:33 +02:00
Michal Čihař
08967fec6a Make the string translatable 2011-08-17 12:31:04 +02:00
Michal Čihař
e89da7e7e4 Fix typo 2011-08-17 12:30:15 +02:00
Michal Čihař
16b0a64d0b Merge branch 'QA_3_4' 2011-08-17 09:59:53 +02:00
Michal Čihař
5146970826 Escape displayed user input 2011-08-17 09:57:29 +02:00
Michal Čihař
97439c45f0 This is already done 2011-08-17 09:50:42 +02:00
Michal Čihař
98226ff723 Fixup 2011-08-17 09:44:52 +02:00
Michal Čihař
f63345e9c0 Merge remote-tracking branch 'tyron/master' 2011-08-17 08:31:57 +02:00
Michal Čihař
a4305a2672 Merge remote-tracking branch 'pootle/master'
Conflicts:
	po/es.po
	po/ja.po
	po/sl.po
	po/tr.po
2011-08-17 08:31:08 +02:00
Aris Feryanto
4ce54e1734 Fix merge conflict with clear_selection branch 2011-08-17 14:20:23 +08:00
Aris Feryanto
629ba9da86 CSS for timepicker 2011-08-17 13:48:48 +08:00
Aris Feryanto
5e60aa8380 Fix merge conflict with origin/master 2011-08-17 13:41:38 +08:00
Aris Feryanto
3193c113c8 Grid edit: fix NULL-related things when editing datetime field 2011-08-17 13:38:39 +08:00
Aris Feryanto
88f3796f1e Grid edit: add datetimepicker support for date, datetime, and timestamp field 2011-08-17 13:12:31 +08:00
Yuichiro
ad4b382829 Translation update done using Pootle. 2011-08-17 02:56:22 +02:00
Yuichiro
3f0fdbee7b Translation update done using Pootle. 2011-08-17 02:41:54 +02:00
Dieter Adriaenssens
cbca775738 coding style and wrapping long lines 2011-08-17 00:09:17 +02:00
Dieter Adriaenssens
3e342bceac fix typo 2011-08-16 23:05:22 +02:00
Domen
8f8c6932bf Translation update done using Pootle. 2011-08-16 22:58:51 +02:00
Domen
3d4b6b982b Translation update done using Pootle. 2011-08-16 22:58:45 +02:00
Domen
6629eb4cfe Translation update done using Pootle. 2011-08-16 22:58:33 +02:00
Domen
6d67555456 Translation update done using Pootle. 2011-08-16 22:58:17 +02:00
Domen
583e481c54 Translation update done using Pootle. 2011-08-16 22:58:03 +02:00
Domen
e1ccbf11bd Translation update done using Pootle. 2011-08-16 22:57:55 +02:00
Domen
e94ac25f7c Translation update done using Pootle. 2011-08-16 22:57:29 +02:00
Domen
fe272df4fe Translation update done using Pootle. 2011-08-16 22:57:02 +02:00
Domen
ab694b5361 Translation update done using Pootle. 2011-08-16 22:56:52 +02:00
Domen
97363bef3e Translation update done using Pootle. 2011-08-16 22:56:44 +02:00
Domen
7738694aed Translation update done using Pootle. 2011-08-16 22:56:22 +02:00
Domen
9278bfe13c Translation update done using Pootle. 2011-08-16 22:56:03 +02:00
Domen
a8e85b3398 Translation update done using Pootle. 2011-08-16 22:55:52 +02:00
Domen
89233cb18f Translation update done using Pootle. 2011-08-16 22:55:41 +02:00
Domen
26c5bd7ed0 Translation update done using Pootle. 2011-08-16 22:55:32 +02:00
Domen
824fc36614 Translation update done using Pootle. 2011-08-16 22:55:22 +02:00
Domen
180b46c528 Translation update done using Pootle. 2011-08-16 22:54:57 +02:00
Domen
45990fb858 Translation update done using Pootle. 2011-08-16 22:54:44 +02:00
Domen
948b73df9f Translation update done using Pootle. 2011-08-16 22:54:35 +02:00
Domen
513507ed49 Translation update done using Pootle. 2011-08-16 22:54:02 +02:00
Domen
9493b87d59 Translation update done using Pootle. 2011-08-16 22:53:45 +02:00
Domen
4006a9eab7 Translation update done using Pootle. 2011-08-16 22:53:31 +02:00