Commit Graph

87760 Commits

Author SHA1 Message Date
Weblate
edadd42d7c Merge remote-tracking branch 'origin/master' 2013-11-08 18:30:05 +01:00
Luis Esteves
09fad40de0 Translated using Weblate (Portuguese)
Currently translated at 53.4% (1465 of 2740)
2013-11-08 18:29:59 +01:00
Marc Delisle
3ea0698d87 Merge pull request #744 from modulo-/bug4152
Removed constraints from datetime and timestamp input boxes
2013-11-08 09:29:44 -08:00
Weblate
5f3bc22367 Merge remote-tracking branch 'origin/master' 2013-11-08 13:43:28 +01:00
Luis Esteves
4c1f5512c5 Translated using Weblate (Portuguese)
Currently translated at 53.4% (1465 of 2740)
2013-11-08 13:43:24 +01:00
Marc Delisle
95489dec4d Use the already fetched list of databases 2013-11-08 07:41:30 -05:00
Margus Lind
05c4e0c8cc Removed constraints from datetime and timestamp input boxes ( added constrainInput:false option) 2013-11-08 09:37:10 +02:00
Marc Delisle
efb60dbe7f Remove dead code 2013-11-07 08:08:21 -05:00
Marc Delisle
d5a2bdda43 Removing SHOW DATABASES 2013-11-07 07:43:43 -05:00
Marc Delisle
a0cc22503b This no longer uses SHOW DATABASES 2013-11-07 07:18:00 -05:00
Marc Delisle
74a456e75c Remove dead code 2013-11-07 07:09:14 -05:00
Marc Delisle
5f8924ee22 Update po files 2013-11-06 12:48:30 -05:00
Marc Delisle
85ea82a409 Remove the ShowDatabasesCommand directive 2013-11-06 12:47:27 -05:00
Marc Delisle
87ffbfbee1 GSoC 2013 credits for students mentored by Marc 2013-11-06 06:55:36 -05:00
Michal Čihař
e60415574a Merge pull request #741 from Tithugues/fix-convertString
Fix PMA_convertString which use a wrong variable.
2013-11-05 22:10:54 -08:00
Hugues Peccatte
c1194ccd4e Fix PMA_convertString which use a wrong variable. 2013-11-05 20:51:49 +01:00
Marc Delisle
2f3e1ea15a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-11-05 12:44:42 -05:00
Marc Delisle
d8fd82a9f5 The DisableIS directive is removed 2013-11-05 12:44:04 -05:00
Weblate
e44226beac Merge remote-tracking branch 'origin/master' 2013-11-05 18:29:54 +01:00
Giovanni Sora
22f9499458 Translated using Weblate (Interlingua)
Currently translated at 31.5% (866 of 2744)
2013-11-05 18:29:48 +01:00
Marc Delisle
32e237c15b ChangeLog entry for bug 4134 2013-11-05 12:26:39 -05:00
Marc Delisle
5cb21ef969 Fix coding style 2013-11-05 12:25:54 -05:00
Marc Delisle
26bea3f104 Merge remote branch 'tithugues/fix-4134' 2013-11-05 12:16:32 -05:00
Marc Delisle
57ef25eed8 The DisableIS directive is being deprecated 2013-11-05 05:10:13 -05:00
Marc Delisle
2ac444acd4 The DisableIS directive is being deprecated 2013-11-05 04:42:43 -05:00
Marc Delisle
869c1847c2 4.1.0-beta2 2013-11-04 14:58:04 -05:00
Marc Delisle
1b0037f108 Merge branch 'QA_4_0' 2013-11-04 12:34:35 -05:00
Marc Delisle
9c0a4022d2 Fix merge conflict 2013-11-04 12:34:09 -05:00
Madhura Jayaratne
4d8e34d954 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-11-04 22:22:02 +05:30
Madhura Jayaratne
525fd79d19 Remove more trailing white spaces 2013-11-04 22:20:39 +05:30
Madhura Jayaratne
f1a461d7bf Remove trailing white spaces 2013-11-04 22:09:15 +05:30
Marc Delisle
e94f74fa51 The DisableIS directive is being deprecated 2013-11-04 06:11:50 -05:00
Marc Delisle
89d6473f49 The DisableIS directive is being deprecated 2013-11-04 05:56:39 -05:00
Michal Čihař
399fd56504 Add some credits for website as requested by Tony 2013-11-04 10:11:16 +01:00
Michal Čihař
5a614aeb64 Fix expected result 2013-11-04 09:49:01 +01:00
Michal Čihař
1ec6b61f46 Fix PMA_getHtmlForOptionsList parameters 2013-11-04 09:45:27 +01:00
Michal Čihař
bc4a5f35fa Use shared version of PMA_getHtmlForOptionsList instead of duplicating it 2013-11-04 09:27:42 +01:00
Michal Čihař
af00f1a4a5 Include standard check for running inside phpMyAdmin 2013-11-04 09:27:00 +01:00
Hugues Peccatte
12f1627656 Fix repositioning after delete.
Fix test related to repositioning.
2013-11-03 19:19:15 +01:00
Hugues Peccatte
4c5f8ce584 Merge branch 'master' into fix-4134-v2 2013-11-03 16:05:45 +01:00
Hugues Peccatte
d3adbcaf05 Fix calculation of pos after delete. 2013-11-03 16:02:50 +01:00
Marc Delisle
8fd0d79405 The DisableIS directive is being deprecated 2013-11-03 09:55:39 -05:00
Hugues Peccatte
1aedeefc43 Update start position after a delete. 2013-11-03 15:29:44 +01:00
Madhura Jayaratne
3b70bbc44e Remove more trailing white spaces 2013-11-03 19:20:24 +05:30
Madhura Jayaratne
0c887a5a55 Trailing white spaces 2013-11-03 19:16:50 +05:30
Madhura Jayaratne
f311c9c502 Remove trailing white spaces 2013-11-03 19:13:23 +05:30
Madhura Jayaratne
184316d891 Coding style fixes 2013-11-03 19:00:41 +05:30
Marc Delisle
d64ea21bed Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2013-11-03 07:47:32 -05:00
Piotr Przybylski
0f71786031 Tuned logo colors in setup
One more test fix
2013-11-03 13:17:29 +01:00
Piotr Przybylski
29ea84be7f Fixed failing test 2013-11-03 13:10:20 +01:00