gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,711 Commits 12 Branches 481 Tags 2.4 GiB
7981437b85
Commit Graph

98711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
7981437b85 Avoid having to check for uninitialized comment_map 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 19:07:29 +05:30
Madhura Jayaratne
78d2b1a70b Fix parameter name in doc comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 19:03:40 +05:30
Madhura Jayaratne
d8784a3889 Another bad line break 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 18:59:32 +05:30
Madhura Jayaratne
6b1d977e33 Fix bad line break 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 18:58:18 +05:30
Madhura Jayaratne
5e823b1813 isset($num_rows) always evaluated to false 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 18:51:49 +05:30
Madhura Jayaratne
4f9bb04e55 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-03-26 18:35:24 +05:30
Madhura Jayaratne
b5eefc7a53 Fix bad line breaks in functions.js 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 18:19:50 +05:30
Madhura Jayaratne
92299af11a Fix bad line breaks 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 18:16:18 +05:30
Madhura Jayaratne
c177ebeaea Avoid loose comparing 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 18:11:12 +05:30
Burak Yavuz
879453cad3 Translated using Weblate (Turkish) 
Currently translated at 99.9% (3041 of 3043 strings)

[CI skip]
 2015-03-26 13:35:28 +01:00
Weblate
9096a58e4e Merge remote-tracking branch 'origin/master' 2015-03-26 13:32:53 +01:00
Madhura Jayaratne
3e77c708b4 Check whether query succeeded 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 18:02:38 +05:30
Weblate
15107aa414 Merge remote-tracking branch 'origin/master' 2015-03-26 13:25:49 +01:00
Burak Yavuz
0cbca7a022 Translated using Weblate (Turkish) 
Currently translated at 99.9% (3040 of 3043 strings)

[CI skip]
 2015-03-26 13:25:46 +01:00
Madhura Jayaratne
53cb164d6c Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-03-26 17:55:28 +05:30
Madhura Jayaratne
865eb0cda6 Another instance of loose comparing fixed 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 17:54:20 +05:30
Madhura Jayaratne
f05f535210 Scrutinizer does not like loose comparing 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 17:52:51 +05:30
Madhura Jayaratne
f6e0d94f1a _dbgQuery also accepts false 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 17:41:37 +05:30
Marc Delisle
4eccae5290 Merge pull request #1547 from znck/master 
Remove unneeded closing tags
 2015-03-26 07:56:45 -04:00
Madhura Jayaratne
a0aaf65c54 Merge branch 'QA_4_4' 2015-03-26 09:25:05 +05:30
Madhura Jayaratne
112d4a90d3 Merge branch 'bug4814' into QA_4_4 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 09:23:13 +05:30
Madhura Jayaratne
f3b7d693ec bug #4814 MySQL 5.7.6 and Databases 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 09:21:29 +05:30
Madhura Jayaratne
c720215bda Merge branch 'QA_4_4' 2015-03-26 08:44:16 +05:30
Madhura Jayaratne
943bf8b907 bug Use 'server' parameter in console to work in multi server environments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-26 08:28:32 +05:30
Marc Delisle
84d55a756c Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-25 14:30:37 -04:00
Marc Delisle
349bdb78a3 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-25 14:30:09 -04:00
Marc Delisle
92cdd81d7d Merge pull request #1583 from harish095/Dark-Theme-for-Console 
Dark Theme for Console
 2015-03-25 14:28:55 -04:00
Balรกzs รšr
3666627236 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3042 of 3042 strings)

[CI skip]
 2015-03-25 15:07:39 +01:00
Marc Delisle
9afe060298 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-25 07:41:23 -04:00
Marc Delisle
fa763b1828 Merge pull request #1579 from addaleax/json-pretty-print 
Add option for exporting pretty-printed JSON
 2015-03-25 07:40:36 -04:00
Madhura Jayaratne
015377cdef Merge branch 'QA_4_4' 2015-03-25 16:19:13 +05:30
Madhura Jayaratne
a6810ece96 bug #4819 Request URI too large; use post of multi submit 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-25 15:36:48 +05:30
Madhura Jayaratne
90da8d0c12 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-03-25 14:11:06 +05:30
Madhura Jayaratne
7663dea459 rfe #1619 Show databases as list instead of as dropdown when no database is selected 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-25 11:49:31 +05:30
Marc Delisle
f72eabf3b9 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-24 15:38:16 -04:00
Marc Delisle
8e3668044c bug #4818 MySQL 5.7.6 and changing the password for another user 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-24 15:23:52 -04:00
Marc Delisle
96c627101c Remove extraneous code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-24 13:29:06 -04:00
Marc Delisle
103d226016 Merge branch 'QA_4_4' 2015-03-24 13:28:08 -04:00
Marc Delisle
40406c5e7e bug #4813 MySQL 5.7.6 and the Users menu tab 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-24 13:26:51 -04:00
Marc Delisle
96a98e9035 Adapt translations to colon removal 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-24 12:07:28 -04:00
Marc Delisle
561233b91d Streamline message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-24 12:00:43 -04:00
Marc Delisle
bd75433c5f Remove extraneous colons 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-24 11:54:23 -04:00
Madhura Jayaratne
c74b37a5f5 Unit tests for PMA_resultSetHasJustOneTable() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-24 20:41:18 +05:30
Madhura Jayaratne
0a89ee137f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-03-24 20:14:03 +05:30
Madhura Jayaratne
ccca280ea6 rfe #947 Show edit/delete also when there is calculated column 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-24 20:13:01 +05:30
Marc Delisle
f0d4454cf0 Merge pull request #1610 from Anshu-xLR/Bug4816 
Fixed localization issue in <database> --> Operations window
 2015-03-24 07:55:45 -04:00
Madhura Jayaratne
42877d8b35 Use timeouts here 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-24 08:36:31 +05:30
Madhura Jayaratne
efa4cdc1d3 Merge branch 'QA_4_4' 2015-03-24 08:22:26 +05:30
Madhura Jayaratne
c5eb730041 Merge branch 'QA_4_3' into QA_4_4 2015-03-24 08:21:35 +05:30
Madhura Jayaratne
f4ddd75bfc Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-24 08:19:33 +05:30