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

109304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
ff90f20054 Merge branch 'QA_4_7' 2017-03-21 08:24:24 +01:00
Michal Čihař
2e448d46e3 Fixed setting password on recent MariaDB with non working plugins 
When the plugins are not working (eg. the plugins directory does not
exist), we should still allow to change the password.

Fixes #12757

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-21 08:23:06 +01:00
Michal Čihař
7c35333e5d Fix method names 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-20 17:56:09 +01:00
Michal Čihař
77990debb5 Document return types 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-20 17:56:08 +01:00
Michal Čihař
50e634afca Remove documentation for non existing param 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-20 17:56:08 +01:00
Michal Čihař
159e748a2b Simplify getting table create options 
- use saner method name (getCreateOptions)
- fix error case

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-20 17:56:08 +01:00
Michal Čihař
a51ac4ef8b Simplify getting row format 
- remove not needed word Table from method name
- fix code to handle errors
- convert existing users of getStatusInfo('ROW_FORMAT') to this method

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-20 17:56:08 +01:00
Michal Čihař
ca9ea74d20 Simplify getting table rows 
- simplify method name
- fix code handling error path

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-20 17:56:08 +01:00
Michal Čihař
44d3cb3869 Simplify getting table collation 
- remove not needed word Table from method name
- fix code to handle errors

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-20 17:56:08 +01:00
Michal Čihař
b2bf9fba87 Simplify getting table comment 
- remove not needed word Show from method name
- fix code to handle errors

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-20 17:56:08 +01:00
Michal Čihař
56046cc7e2 Simplify getting storage engine 
- remove not needed word Table from method name
- fix code to handle errors
- convert existing users of getStatusInfo('ENGINE') to this method

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-20 17:56:08 +01:00
Michal Čihař
e655e08e6e Fix comments indentation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-20 17:56:05 +01:00
Michal Čihař
7c8f340d26 Remove commented out code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-20 17:55:39 +01:00
Michal Čihař
db893a4683 Remove unused variables 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-20 17:55:38 +01:00
Michal Čihař
9f2773c9c2 Simplify rereading of information 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-20 17:55:38 +01:00
Vishal Pandey
5da44ce1a6 Move the tbl_info.inc.php code to Table class 
Fixes #12567

Signed-off-by: flash1452 <vishpandey2014@gmail.com>
 2017-03-20 17:55:21 +01:00
Michal Čihař
2c48b61757 Merge branch 'QA_4_7' 2017-03-20 17:46:01 +01:00
Michal Čihař
1584708b09 Merge commit '548b6b4d0ebdefc352d5aff3d191e8c57273399f' 2017-03-20 17:45:57 +01:00
Michal Čihař
211541f56e Changelog entry for #13105 and #13107 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-20 16:19:40 +01:00
Raghuram
c1b9c83b76 Fixes adding attribute while updating virtual col 
Fixes #13105

Signed-off-by: Raghuram Vadapalli<raghuram.vadapalli@research.iiit.ac.in>
 2017-03-20 16:19:33 +01:00
Weblate
841dbe678f Merge remote-tracking branch 'origin/master' 2017-03-20 16:13:25 +01:00
Franco
ab641210be Translated using Weblate (Spanish) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-20 16:13:24 +01:00
tmtisfree
a7fa6c1ced Translated using Weblate (French) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-20 16:13:20 +01:00
Weblate
548b6b4d0e Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-03-20 16:13:19 +01:00
tmtisfree
21741c5edd Translated using Weblate (French) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-03-20 16:13:16 +01:00
Michal Čihař
272663dd2f Merge branch 'QA_4_7' 2017-03-20 16:13:02 +01:00
Michal Čihař
89e33a3386 Merge commit '528fb463312f81bf009ee0a13d6f6c39d20501cb' 2017-03-20 16:12:57 +01:00
Michal Čihař
cb691faf76 Do not try to sync favorite tables if configuration storage is not enabled 
Fixes #13092

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-20 16:12:32 +01:00
Володимир
528fb46331 Translated using Weblate (Ukrainian) 
Currently translated at 99.9% (3191 of 3192 strings)

[CI skip]
 2017-03-19 21:47:27 +01:00
Володимир
a83915e3d2 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-19 21:47:21 +01:00
Franco
2dfc7af01e Translated using Weblate (Spanish) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-18 23:23:55 +01:00
Arif Budiman
29ce0ff602 Translated using Weblate (Indonesian) 
Currently translated at 70.3% (2247 of 3192 strings)

[CI skip]
 2017-03-18 18:45:45 +01:00
Arif Budiman
cc8e766e4d Translated using Weblate (Indonesian) 
Currently translated at 70.2% (2244 of 3194 strings)

[CI skip]
 2017-03-18 18:45:39 +01:00
Michal Čihař
0700cee6e3 Merge pull request #13024 from nijel/remove-unused-auth-code 
Remove no longer needed code in authentication
 2017-03-16 15:50:46 +01:00
Osaid Rehman Nasir
7c22af6d78 Added change password test 
Issue #12393

Signed-off-by: osaid <osaid.nasir@gmail.com>
 2017-03-16 15:49:14 +01:00
Michal Čihař
17335236cf Merge pull request #13079 from manishbisht/remove-inline-javascript 
Removed inline onmousedown javascript
 2017-03-16 15:15:33 +01:00
Michal Čihař
f7104beb91 Merge branch 'QA_4_7' 2017-03-16 15:13:53 +01:00
Michal Čihař
9b12ee20e0 Merge remote-tracking branch 'origin/QA_4_7' 2017-03-16 15:13:50 +01:00
Michal Čihař
91a16c90c8 Fixed editing of rows with text primary key 
We do htmlspecialchars in PHP, so we should not URL de/encode here.

Fixes #13088

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-16 15:12:38 +01:00
Michal Čihař
a9ec71c887 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-03-16 14:57:11 +01:00
Weblate
0f862dfab1 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-03-16 14:55:22 +01:00
Progyan Bhattacharya
f2e25bbf41 Translated using Weblate (Bengali) 
Currently translated at 73.4% (2343 of 3192 strings)

[CI skip]
 2017-03-16 14:55:18 +01:00
Michal Čihař
76668dcfd2 Merge branch 'QA_4_7' 2017-03-16 14:54:58 +01:00
Michal Čihař
f50e3682f5 Delete only phpMyAdmin cookies on upgrade 
Fixes #12660

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-16 14:54:19 +01:00
Weblate
17d57d7317 Merge remote-tracking branch 'origin/master' 2017-03-16 14:41:35 +01:00
Progyan Bhattacharya
f3299a32ce Translated using Weblate (Bengali) 
Currently translated at 73.2% (2340 of 3194 strings)

[CI skip]
 2017-03-16 14:41:30 +01:00
Michal Čihař
1dd118d275 Offer login as different user on access denied from MySQL 
Fixes #13087

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-16 14:40:55 +01:00
Manish Bisht
29bdabe15e Removed inline onmousedown javascript 
Signed-off-by: Manish Bisht <manish.bisht490@gmail.com>
 2017-03-15 22:14:00 +05:30
Michal Čihař
cd2202cd19 Merge branch 'QA_4_7' 2017-03-15 16:49:30 +01:00
Weblate
a8acc52431 Merge remote-tracking branch 'origin/master' 2017-03-15 16:49:04 +01:00