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

108108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
6d7bfe2e31 Merge remote-tracking branch 'origin/master' 2016-11-29 04:50:05 +01:00
Deven Bansod
6473f6910a Merge branch 'QA_4_6' 
Conflicts:
	po/ja.po
 2016-11-29 09:21:14 +05:30
pralin
e050cdb8ad Translated using Weblate (Japanese) 
Currently translated at 70.3% (2275 of 3232 strings)

[CI skip]
 2016-11-29 04:50:02 +01:00
Deven Bansod
9fdc05ce38 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-11-29 09:06:57 +05:30
Deven Bansod
1ee52c8e4c ChangeLog for #12760 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-29 09:06:14 +05:30
Deven Bansod
6baa646c74 Check if the cfgrelation tables are actually set before using them 
Fix #12760

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-29 09:04:32 +05:30
Deven Bansod
17e4e9e5c0 ChangeLog for #12759 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-29 08:54:44 +05:30
Weblate
2d4c88ab15 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-29 04:23:34 +01:00
pralin
b1e14110de Translated using Weblate (Japanese) 
Currently translated at 70.7% (2280 of 3222 strings)

[CI skip]
 2016-11-29 04:23:32 +01:00
Deven Bansod
1b1d68293b Use proper check to verify if index is set in the Request 
Fix #12759

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-29 08:53:00 +05:30
Weblate
d879ecaaa8 Merge remote-tracking branch 'origin/master' 2016-11-29 04:09:13 +01:00
Deven Bansod
a530503c22 Replace call to undefined function by correct call 
Fix #12756

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-29 08:39:32 +05:30
pralin
19d2632f95 Translated using Weblate (Japanese) 
Currently translated at 70.3% (2275 of 3232 strings)

[CI skip]
 2016-11-29 04:09:11 +01:00
Michal Čihař
2d2bc08d6c Remove obsolete comment 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 14:25:47 +01:00
Michal Čihař
2a2b52bbec Merge remote-tracking branch 'origin/pull/12721' 2016-11-28 14:25:00 +01:00
Michal Čihař
d3b6d1e7fd Merge branch 'QA_4_6' 2016-11-28 14:24:55 +01:00
Michal Čihař
09f56abed6 Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 14:24:39 +01:00
Michal Čihař
519bddaa09 Merge branch 'QA_4_6' 2016-11-28 13:53:55 +01:00
Michal Čihař
068eae7e67 Add missing end of tags 
Fixes #12746

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 13:53:34 +01:00
Jees K Denny
48ebdf1852 Add missing end of meta tags in header 
Issue #12746

Signed-off-by: Jees K Denny <jees.jees5@gmail.com>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 13:51:41 +01:00
Michal Čihař
84971eaf4f Make function static as it's called statically 
Issue #12690, #12514

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 12:13:20 +01:00
osaid
b8a9b0f30d Share code for getting temporary directory 
Changed Encoding.php and File.php.

Fixes #12514

Signed-off-by: Osaid <osaid.nasir@gmail.com>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 12:12:59 +01:00
Michal Čihař
ef1f3b5cf7 Merge branch 'QA_4_6' 2016-11-28 12:07:19 +01:00
Michal Čihař
df66e4fa08 Share code for handling uploaded file 
There is no need to duplicate the incomplete logic in several places.

Issue #12514, #12690

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 12:05:59 +01:00
Michal Čihař
ad55a6eba8 Avoid listing demo.phpmyadmin.net twice 
Fixes #12744

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 11:39:21 +01:00
Michal Čihař
a4b6654293 Merge branch 'QA_4_6' 2016-11-28 11:37:51 +01:00
Michal Čihař
826a885a90 Fix comment for sql-parser vendor config 
Fixes #12745

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 11:37:09 +01:00
Michal Čihař
85f297ea6d Remove no longer needed include from setup 
Fixes #12748

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 11:35:54 +01:00
Michal Čihař
b758e59bc4 Merge branch 'QA_4_6' 2016-11-28 11:30:28 +01:00
Michal Čihař
10caf5bcae Check if variables are set prior to use 
Issue #12713

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 11:30:14 +01:00
Michal Čihař
b746697397 Correctly handle HTTP status when doing requests 
When performing requests, we should not simply return content in case of
failure, the error should be propagated.

This could lead to invalid reporting of Git commit data as we would
tread GitHub rate limiting response as commit information.

Fixes #12713

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 11:27:22 +01:00
Michal Čihař
598cfa7c40 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-11-28 11:01:25 +01:00
Michal Čihař
8640f79aae Merge branch 'QA_4_6' 2016-11-28 11:01:21 +01:00
Weblate
9c52bd0724 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-28 10:26:20 +01:00
Marc Delisle
09bfa5fa9d Translated using Weblate (French) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-11-28 10:26:18 +01:00
ncwgf
4d0d648728 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 99.0% (3192 of 3222 strings)

[CI skip]
 2016-11-28 10:26:17 +01:00
Weblate
3e7819fd4f Merge remote-tracking branch 'origin/master' 2016-11-28 10:26:16 +01:00
ncwgf
6c8ce08529 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 98.7% (3193 of 3232 strings)

[CI skip]
 2016-11-28 10:26:13 +01:00
Michal Čihař
4e81f883f8 Merge branch 'QA_4_6' 2016-11-28 10:25:21 +01:00
Michal Čihař
4d26bec55a Adjust docs to latest Docker image changes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 10:25:05 +01:00
Weblate
73f1007c35 Merge remote-tracking branch 'origin/master' 2016-11-28 05:57:38 +01:00
Deven Bansod
420cb4ff7a Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2016-11-28 10:28:19 +05:30
Marc Delisle
89f2305cb5 Translated using Weblate (French) 
Currently translated at 99.9% (3229 of 3232 strings)

[CI skip]
 2016-11-28 05:57:35 +01:00
ncwgf
7d7c5e6897 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 98.7% (3192 of 3232 strings)

[CI skip]
 2016-11-28 05:57:34 +01:00
Deven Bansod
0a56073acd Adjust tests 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-28 10:27:29 +05:30
Deven Bansod
9e27e02688 Refactor intials row to use template 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-28 10:27:25 +05:30
Carlos Ferreira
7a890b884f Translated using Weblate (French) 
Currently translated at 99.7% (3225 of 3232 strings)

[CI skip]
 2016-11-27 15:32:09 +01:00
Isaac Bennetch
c1acb3a212 Prepare for 4.6.6-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-11-26 08:01:00 -05:00
Isaac Bennetch
88bbbcf27d Merge remote-tracking branch 'upstream/QA_4_6' into QA_4_6 2016-11-25 23:30:07 -05:00
Deven Bansod
a3c015b7db Merge branch 'QA_4_6' 2016-11-26 09:52:26 +05:30