gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99,338 Commits 12 Branches 481 Tags 2.4 GiB
0e221fd3f5
Commit Graph

99338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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