Commit Graph

99307 Commits

Author SHA1 Message Date
Madhura Jayaratne
eb3c00dfcb This is a numeric field
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-24 22:41:35 +05:30
Madhura Jayaratne
85064d4ae3 Merge branch 'QA_4_4' 2015-04-24 10:03:41 +05:30
Madhura Jayaratne
738b37477b bug #4869 Drop column action not asking to confirm
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-24 10:01:29 +05:30
Madhura Jayaratne
648e2e1120 Merge branch 'QA_4_4' 2015-04-24 06:08:20 +05:30
Madhura Jayaratne
ef3b023c63 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-24 06:06:50 +05:30
Madhura Jayaratne
b4cddffe9d bug #4870 Inconsistency in 'Ignore' checkbox in insert page
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-24 06:05:01 +05:30
Marc Delisle
408675bb13 Merge branch 'QA_4_4' 2015-04-23 14:49:45 -04:00
Marc Delisle
64aa8cd2ab ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-23 14:49:14 -04:00
Marc Delisle
b4c0f26383 Merge pull request #1654 from smita786/QA_4_4
fix bug #4867
2015-04-23 14:48:43 -04:00
Smita Kumari
4743362c60 fix bug #4867
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2015-04-24 00:02:51 +05:30
Madhura Jayaratne
598f618427 Remove from metadata export until we find a way to align ids between them
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-23 19:27:45 +05:30
Madhura Jayaratne
7950b63ce0 Merge branch 'QA_4_4'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-23 19:26:28 +05:30
Weblate
a9a23c7d1c Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-04-23 15:53:36 +02:00
Albert Song
1cba23a203 Translated using Weblate (Chinese (Taiwan))
Currently translated at 95.4% (2898 of 3035 strings)

[CI skip]
2015-04-23 15:53:33 +02:00
Madhura Jayaratne
3d3e0ece6c Avoid filling up error log with info level messages
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-23 19:23:12 +05:30
Madhura Jayaratne
ecf39c8364 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-23 19:12:11 +05:30
Madhura Jayaratne
50d5db0643 Remove id field from some of the metadata
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-23 19:11:21 +05:30
Madhura Jayaratne
2693ad8699 Dump all metadata at the end
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-23 18:53:42 +05:30
Weblate
1b03849e55 Merge remote-tracking branch 'origin/master' 2015-04-23 13:57:27 +02:00
Albert Song
892adb17bb Translated using Weblate (Chinese (Taiwan))
Currently translated at 93.9% (2888 of 3075 strings)

[CI skip]
2015-04-23 13:57:24 +02:00
Marc Delisle
1bfdfd7dce Remove unused parameters
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-23 07:57:14 -04:00
Madhura Jayaratne
9764ec4968 Reorder in alphabetical order
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-23 15:17:19 +05:30
Madhura Jayaratne
95eb45fddc rfe #1661 Support checksum table
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-23 15:05:53 +05:30
Madhura Jayaratne
eabeea02e7 Remove redundant db engine check
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-23 14:31:04 +05:30
Madhura Jayaratne
089ea589c7 More maxlength
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-23 13:25:03 +05:30
Madhura Jayaratne
58bb3e77bb maxlength for index name
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-23 13:20:42 +05:30
Madhura Jayaratne
05c8553345 Max length for view names
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-23 13:17:24 +05:30
Madhura Jayaratne
c6d21e3c16 rfe Option groups for 'With selected' dropdown in database structure page
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-23 13:10:27 +05:30
Madhura Jayaratne
edc210c66b These are not multi table maintenance actions
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-23 13:00:35 +05:30
Madhura Jayaratne
8dc1fe4727 Merge branch 'QA_4_4' 2015-04-23 12:48:26 +05:30
Madhura Jayaratne
179e581475 bug #4866 Limit column ordering in index edit dialog
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-23 12:47:03 +05:30
Marc Delisle
4da88d0fcf Merge commit '9e19fcf' 2015-04-22 09:47:05 -04:00
Marc Delisle
efa7f0d3c9 Merge commit 'f120a77' 2015-04-22 09:46:43 -04:00
Marc Delisle
40af9f6c13 Merge commit '1c92fdb' 2015-04-22 09:46:32 -04:00
Weblate
9e19fcf371 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-04-22 15:45:47 +02:00
João Rodrigues
caccf0a9ab Translated using Weblate (Portuguese)
Currently translated at 59.2% (1798 of 3035 strings)

[CI skip]
2015-04-22 15:45:45 +02:00
Marc Delisle
f120a77f4c bug #4865 sprintf(): Too few arguments
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-22 09:45:22 -04:00
Marc Delisle
6dcfe4b6d5 Use strict comparison
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-22 08:32:47 -04:00
Weblate
1b1d00962a Merge remote-tracking branch 'origin/master' 2015-04-22 13:28:44 +02:00
João Rodrigues
f49b685535 Translated using Weblate (Portuguese)
Currently translated at 58.2% (1792 of 3075 strings)

[CI skip]
2015-04-22 13:28:41 +02:00
Madhura Jayaratne
96e30781d1 List of columns is ordered. Use row numbers
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-22 16:58:35 +05:30
Madhura Jayaratne
f1236e2ec5 Identify keys in structure snapshots
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-22 15:31:30 +05:30
Madhura Jayaratne
54a2b7a81e Wrap some long lines
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-22 13:10:26 +05:30
Madhura Jayaratne
741a08208b Do not return duplicate column names
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-22 13:02:49 +05:30
Madhura Jayaratne
f2015f5b20 Add icon for columns with index
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-22 13:00:21 +05:30
Madhura Jayaratne
0bc04da034 Fix variable name
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-22 12:49:31 +05:30
Madhura Jayaratne
b5d75f952b Allow retrieving indexes by types
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-22 12:25:45 +05:30
Madhura Jayaratne
fba28baa32 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-22 11:28:11 +05:30
Madhura Jayaratne
9bb5363995 Add space
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-22 11:26:59 +05:30
Marc Delisle
0fe34e4ef2 Merge branch 'QA_4_4' 2015-04-21 11:28:35 -04:00