Commit Graph

99350 Commits

Author SHA1 Message Date
Madhura Jayaratne
09b5c4399e Add missing doc comments
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-28 07:17:06 +05:30
Madhura Jayaratne
e4a3c69831 Properly exclude recaptcha and swekey
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-28 07:12:18 +05:30
Madhura Jayaratne
a1d50f20a9 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-28 07:09:57 +05:30
Madhura Jayaratne
230b0d3ed1 Remove trailing white spaces
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-28 07:08:48 +05:30
Marc Delisle
3007b73415 New FAQ 6.38 How can I reassign auto-incremented values?
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-27 14:40:19 -04:00
Madhura Jayaratne
3b3a14f33c Space after function keyword
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-27 19:14:00 +05:30
Madhura Jayaratne
e1ab1925c9 File is being unconditionally included; use "require_once" instead
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-27 19:12:17 +05:30
Madhura Jayaratne
0cb93d6870 File is being conditionally included; use "include" instead
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-27 19:11:26 +05:30
Madhura Jayaratne
b4c739849a Improve coding style in normalization.lib.php
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-27 18:35:57 +05:30
Madhura Jayaratne
aa1c35cedf Remove trailing whitespace
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-27 18:26:09 +05:30
Madhura Jayaratne
6cd4b33a79 Remove extra empty line
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-27 18:23:45 +05:30
Madhura Jayaratne
12165c8d9e Remove duplicate tag
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-27 18:22:42 +05:30
Madhura Jayaratne
0e221fd3f5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-27 18:17:57 +05:30
Madhura Jayaratne
cdc6a584aa Spaces around - operator
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-27 18:17:09 +05:30
Marc Delisle
9ffc3b4b91 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-04-27 08:43:57 -04:00
Marc Delisle
33b969a3b7 Refactor duplicate code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-27 08:43:46 -04:00
Madhura Jayaratne
598435fdda Spaces around - operator
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-27 18:13:23 +05:30
Madhura Jayaratne
0f3450a7c5 Spaces around > operator
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-27 18:11:11 +05:30
Madhura Jayaratne
aca3985b5e More spaces around assignments
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-27 18:07:38 +05:30
Madhura Jayaratne
3d85296d79 Spaces around assignments
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-27 18:06:36 +05:30
Madhura Jayaratne
7c82094f60 Do not use inline control structures
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-27 18:00:49 +05:30
Madhura Jayaratne
90120e1cc0 Space after foreach
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-27 17:59:11 +05:30
Madhura Jayaratne
fb52e6af04 Closing parenthesis of a multi-line function call must be on a line by itself
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-27 17:57:36 +05:30
Madhura Jayaratne
04f989269c Coding style fix - multi line if statements
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-27 17:50:30 +05:30
Madhura Jayaratne
ce4e1a7580 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-27 17:47:15 +05:30
Madhura Jayaratne
3fe20b3cdf Exclude sql-formatter
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-27 17:46:51 +05:30
Weblate
57ace83cc0 Merge remote-tracking branch 'origin/master' 2015-04-26 20:16:47 +02:00
Jozef Pistej
26655314e5 Translated using Weblate (Slovak)
Currently translated at 83.6% (2572 of 3075 strings)

[CI skip]
2015-04-26 20:16:44 +02:00
Hugues Peccatte
c8b6f6950d Minor code refactor.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-04-26 20:16:35 +02:00
Marc Delisle
8e0d4f19c5 4.4.4 release date
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-26 06:36:42 -04:00
Marc Delisle
730bb666c3 Merge branch 'QA_4_4' 2015-04-26 06:35:42 -04:00
Marc Delisle
285e0d9b61 4.4.5-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-26 06:35:06 -04:00
Marc Delisle
71bf8dede5 Merge branch 'QA_4_4' 2015-04-25 08:44:56 -04:00
Marc Delisle
527586ad43 bug Undefined index: Rows
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-25 08:44:26 -04:00
Marc Delisle
d13ba710ca Fix ambiguous return value
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-25 08:37:30 -04:00
Hauke Henningsen
6bcd94f570 Translated using Weblate (German)
Currently translated at 100.0% (3075 of 3075 strings)

[CI skip]
2015-04-25 10:46:33 +02:00
Madhura Jayaratne
88514e5b8b Fix syntax errors
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-24 23:24:36 +05:30
Madhura Jayaratne
e80e9f81af Wrap more long lines
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-24 23:16:41 +05:30
Madhura Jayaratne
01051dc93f Wrap some long lines
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-24 23:09:04 +05:30
Madhura Jayaratne
f4717b8c3a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-24 22:42:49 +05:30
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
Marc Delisle
f982adee97 Merge branch 'QA_4_4' 2015-04-24 13:08:50 -04:00
Marc Delisle
ff2fb74b35 bug #4871 Error on creating table
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-24 13:08:13 -04:00
Marc Delisle
775d1dca70 Best practice: remove PHP closing tag
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-24 11:33:29 -04:00
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