Commit Graph

52277 Commits

Author SHA1 Message Date
Piotr Przybylski
e10ee28831 Better layout for wrapped database names in nav frame 2011-08-17 22:38:22 +02:00
Piotr Przybylski
746f3566bb set_time_limit may fail, make it do so silently 2011-08-17 22:22:39 +02:00
Madhura Jayaratne
683a512c41 Wrap long lines. 2011-08-18 00:04:40 +05:30
Madhura Jayaratne
5f2a52153b Use include_once when included conditionally 2011-08-17 23:54:14 +05:30
Madhura Jayaratne
18f567a3f1 Correcting indentation for switch statements 2011-08-17 23:52:36 +05:30
Madhura Jayaratne
1a1833662f Wrap long lines 2011-08-17 23:48:19 +05:30
Madhura Jayaratne
d67165f7bc Fix code style 2011-08-17 23:42:43 +05:30
Madhura Jayaratne
c5cbe21277 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-17 23:24:39 +05:30
Madhura Jayaratne
b3d627f3f6 Missing default function for Spatial types 2011-08-17 23:23:34 +05:30
Piotr Przybylski
2fdfc4fc1e "position: relative" on tables was required for grid, add it dynamically in PMA_makegrid 2011-08-17 18:25:56 +02:00
Piotr Przybylski
18c65bbbba relative position doesn't work correctly on <table> elements
in this case it broke position of "More" menus
2011-08-17 18:04:22 +02:00
Piotr Przybylski
69672d854d Fix More icon position 2011-08-17 17:51:21 +02:00
Madhura Jayaratne
5c561d1df3 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-17 20:59:47 +05:30
Madhura Jayaratne
20ff8f2ee0 These types are now supported in PMA 2011-08-17 20:45:16 +05:30
Michal Čihař
54037e2038 Update po files 2011-08-17 16:58:54 +02:00
Michal Čihař
5e4f8bff54 Merge remote-tracking branch 'pootle/master' 2011-08-17 16:58:20 +02:00
Michal Čihař
d1684d6d96 Ignore another external lib 2011-08-17 16:56:04 +02:00
Pootle server
cf8803fd44 Merge remote-tracking branch 'origin/master' 2011-08-17 16:40:13 +02:00
Madhura Jayaratne
79b5bd602e Changelog entries for GIS features 2011-08-17 19:14:43 +05:30
Pootle server
e3903233f8 Merge remote-tracking branch 'origin/master' 2011-08-17 14:40:12 +02:00
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
franz.georg
bd943b2ed9 Translation update done using Pootle. 2011-08-17 13:24:55 +02:00
franz.georg
da57391c98 Translation update done using Pootle. 2011-08-17 13:23:37 +02:00
franz.georg
6463f542cb Translation update done using Pootle. 2011-08-17 13:21:00 +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
franz.georg
33642bb905 Translation update done using Pootle. 2011-08-17 13:16:58 +02:00
franz.georg
3f4d65ba1e Translation update done using Pootle. 2011-08-17 13:14:37 +02:00
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
franz.georg
13cf3f615e Translation update done using Pootle. 2011-08-17 13:13:08 +02:00
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