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

109266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Володимир
4325247078 Translated using Weblate (Ukrainian) 
Currently translated at 95.9% (3064 of 3194 strings)

[CI skip]
 2017-03-15 16:49:04 +01:00
Michal Čihař
4cdfa9a014 Merge branch 'QA_4_7' 2017-03-15 16:48:47 +01:00
Weblate
bc2266a9e7 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-03-15 16:18:35 +01:00
Володимир
7e7d3f45b0 Translated using Weblate (Ukrainian) 
Currently translated at 95.9% (3062 of 3192 strings)

[CI skip]
 2017-03-15 16:18:35 +01:00
Michal Čihař
8f640b9030 Do not point users to setup when it is disabled 
Fixes #13084

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-15 16:18:05 +01:00
Weblate
eae5041df2 Merge remote-tracking branch 'origin/master' 2017-03-14 16:00:07 +01:00
Володимир
f06f753dd6 Translated using Weblate (Ukrainian) 
Currently translated at 96.0% (3069 of 3194 strings)

[CI skip]
 2017-03-14 16:00:07 +01:00
Michal Čihař
7496debb67 Merge pull request #13073 from manishbisht/remove-inline-javascript 
Removed inline onmouseover and onmouseout javascript
 2017-03-14 15:59:55 +01:00
Isaac Bennetch
a413ad207a ChangeLog entry for 485804c 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-03-14 10:34:03 -04:00
Michal Čihař
aa308f01cf Merge branch 'QA_4_7' 2017-03-14 14:09:54 +01:00
Michal Čihař
1e8e72c757 Merge remote-tracking branch 'origin/QA_4_7' 2017-03-14 14:09:52 +01:00
Володимир
91e7f2490a Translated using Weblate (Ukrainian) 
Currently translated at 96.0% (3069 of 3194 strings)

[CI skip]
 2017-03-14 14:09:24 +01:00
Michal Čihař
49b497bd10 Changelog entry for #12708 and #13074 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-14 14:08:58 +01:00
Fenn-CS
2849c0cff8 Stripped PMA version from curl user-agent to increase consitency and security 
Signed-off-by: Fenn-CS <fenn25.fn@gmail.com>
 2017-03-14 14:08:36 +01:00
Володимир
c60da70ecd Translated using Weblate (Ukrainian) 
Currently translated at 96.0% (3067 of 3192 strings)

[CI skip]
 2017-03-14 14:07:20 +01:00
Weblate
79cd983170 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-03-14 13:29:22 +01:00
Володимир
45203ae951 Translated using Weblate (Ukrainian) 
Currently translated at 96.1% (3068 of 3192 strings)

[CI skip]
 2017-03-14 13:29:22 +01:00
Isaac Bennetch
58244de758 Adding composer lock for 4.7.0-rc1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-03-14 08:28:52 -04:00
Manish Bisht
23ae0c5e88 Removed onmouseover and onmouseout inline javascript 
Signed-off-by: Manish Bisht <manish.bisht490@gmail.com>
 2017-03-13 15:32:56 +05:30
Weblate
2e71a0781b Merge remote-tracking branch 'origin/master' 2017-03-13 10:07:37 +01:00
Володимир
02ea2d701a Translated using Weblate (Ukrainian) 
Currently translated at 96.4% (3082 of 3194 strings)

[CI skip]
 2017-03-13 10:07:37 +01:00
Weblate
a4f13b2c3f Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-03-13 10:07:33 +01:00
Володимир
adfffb3081 Translated using Weblate (Ukrainian) 
Currently translated at 96.4% (3080 of 3192 strings)

[CI skip]
 2017-03-13 10:07:33 +01:00
Michal Čihař
09e0ed8d0d Merge branch 'QA_4_7' 2017-03-13 10:07:03 +01:00
Michal Čihař
fc777c99a8 Split documentation for ShowChgPassword, ShowCreateDb and ShowPhpInfo 
It really doesn't make much sense to have them all covered by one text.

Fixes #13069

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-13 10:06:25 +01:00
Michal Čihař
aae3f7de71 Merge branch 'QA_4_7' 2017-03-13 09:58:32 +01:00
Michal Čihař
332899b968 Remove unused variable 
Introduced by pr #13053

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-13 09:58:03 +01:00
Michal Čihař
1235be161a Merge branch 'QA_4_7' 2017-03-13 09:56:47 +01:00
Michal Čihař
eccdb30ebb Changelog entry for #13053 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-13 09:56:28 +01:00
Raghuram
e54d5085d9 Fix broken links in setup page 
Signed-off-by: Raghuram Vadapalli<raghuram.vadapalli@research.iiit.ac.in>
 2017-03-13 09:55:31 +01:00
Michal Čihař
bf9223cc8f Merge branch 'QA_4_7' 2017-03-13 09:55:00 +01:00
Michal Čihař
7bd211a165 Merge pull request #13070 from Fenn-CS/master 
Changed button string in optional actions -table structures
 2017-03-13 09:42:36 +01:00
Weblate
15c6e4b429 Merge remote-tracking branch 'origin/master' 2017-03-13 09:19:06 +01:00
Володимир
fcacbb2a74 Translated using Weblate (Ukrainian) 
Currently translated at 96.5% (3083 of 3194 strings)

[CI skip]
 2017-03-13 09:19:06 +01:00
Weblate
a31c41dbcd Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-03-13 09:19:01 +01:00
Володимир
6fa7bbacd2 Translated using Weblate (Ukrainian) 
Currently translated at 96.5% (3081 of 3192 strings)

[CI skip]
 2017-03-13 09:19:01 +01:00
Michal Čihař
562d37a351 Merge branch 'QA_4_7' 2017-03-13 09:18:42 +01:00