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

108266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Giovanni Sora
98d4b2eca4 Translated using Weblate (Interlingua) 
Currently translated at 74.6% (2418 of 3239 strings)

[CI skip]
 2016-12-13 11:23:18 +01:00
Weblate
bddb5500e6 Merge remote-tracking branch 'origin/master' 2016-12-13 11:19:05 +01:00
Michal Čihař
c9a67a4d5e Translated using Weblate (Czech) 
Currently translated at 93.0% (3014 of 3239 strings)

[CI skip]
 2016-12-13 11:19:01 +01:00
Michal Čihař
c5b879c745 Merge branch 'QA_4_6' 2016-12-13 11:18:26 +01:00
Michal Čihař
2b134240b8 Share code for session cache key calculation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 11:17:58 +01:00
Michal Čihař
8ef66ace36 Merge branch 'QA_4_6' 2016-12-13 10:54:59 +01:00
Michal Čihař
8d5939348e Use current user in session cache key 
This makes it automatically valid only for current user.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 10:54:08 +01:00
Michal Čihař
91dd60e6ad Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 10:42:21 +01:00
Michal Čihař
0ddcd3c372 Merge branch 'QA_4_6' 2016-12-13 10:41:29 +01:00
Michal Čihař
f18e02b16d Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 10:40:52 +01:00
Weblate
f87a5e7654 Merge remote-tracking branch 'origin/master' 2016-12-13 10:39:56 +01:00
Michal Čihař
7c737eeb72 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-12-13 10:39:55 +01:00
Laura Arjona Reina
2fdfb642b0 Translated using Weblate (Spanish) 
Currently translated at 99.1% (3205 of 3232 strings)

[CI skip]
 2016-12-13 10:39:55 +01:00
Michal Čihař
49a20101e2 Merge branch 'QA_4_6' 2016-12-13 10:39:42 +01:00
Michal Čihař
35a838697e Merge commit '685b51d5d517fa69297617c18e0cb4c7caeb9482' 2016-12-13 10:39:37 +01:00
Michal Čihař
4fc04f3938 Adjust tests to new setup handling of messages 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 10:39:02 +01:00
Weblate
353358c1f4 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-12-13 10:31:41 +01:00
Laura Arjona Reina
7cccdd022c Translated using Weblate (Spanish) 
Currently translated at 99.8% (3218 of 3222 strings)

[CI skip]
 2016-12-13 10:31:41 +01:00
Michal Čihař
90e4325bcf Rewrite https in setup and messages handling 
- The client side check is more reliable
- Does not depend on server setup
- Removed related inline javascript (see #12261)

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 10:31:25 +01:00
jorge jansen abreu
685b51d5d5 Translated using Weblate (Spanish) 
Currently translated at 99.8% (3216 of 3222 strings)

[CI skip]
 2016-12-13 10:25:44 +01:00
Laura Arjona Reina
7ae3259b64 Translated using Weblate (Spanish) 
Currently translated at 99.7% (3215 of 3222 strings)

[CI skip]
 2016-12-13 10:25:21 +01:00
Michal Čihař
583f5ff533 Merge branch 'QA_4_6' 2016-12-13 09:22:23 +01:00
Michal Čihař
2086bb61c1 Add changelog entry for PHP 7.1 compatibility 
Fixes #12800

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 09:21:48 +01:00
Michal Čihař
569a4d280c Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 09:04:16 +01:00
Michal Čihař
28968fe919 Set correct Uptime value for tests 
MySQL returns this as integer, so we should do the same for tests.

See also #12539

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 09:04:10 +01:00
Michal Čihař
1fd24b650d Update phpSecLib to 2.0.4 
* fix E_DEPRECATED errors on PHP 7.1
* Random: fix issues with serialize()

Issue #12800

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 08:43:52 +01:00
Michal Čihař
cb6d733e5a Fix other places of wrong value for # in tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 08:29:40 +01:00
Deven Bansod
ffaf589a26 Fix numeric errors 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-13 08:29:40 +01:00
Michal Čihař
9f5789dff8 Set reasonable mock value for tests 
Set integer where we do a COUNT() SQL.

See also #12539

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 08:29:40 +01:00
Michal Čihař
48144987d8 Ensure font size is integer, we do further calculations with it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 08:29:40 +01:00
Michal Čihař
034047a219 There is no runkit for 7.1 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 08:29:40 +01:00
Michal Čihař
1308ecccd0 Enable testing in PHP 7.1 
I hoped there will be phpMyAdmin 4.7.0 by time PHP 7.1 is out, but
obviously that's not the case, so we should fix 4.6 branch as well.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 08:23:46 +01:00
Michal Čihař
06d76588c2 Merge pull request #12797 from jrchamp/patch-1 
PMA_getRealSize - Performance and Readability
 2016-12-13 08:09:47 +01:00
Michal Čihař
a9bd6bebb2 Merge branch 'QA_4_6' 2016-12-13 07:59:58 +01:00
Michal Čihař
c72b1563d1 Fix various broken or outdated links 
Backported from master

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 07:59:07 +01:00
Michal Čihař
14c8214bb4 Merge remote-tracking branch 'origin/pull/12805' into QA_4_6 2016-12-13 07:55:40 +01:00
Michal Čihař
251860bc91 Merge branch 'QA_4_6' 2016-12-13 07:51:05 +01:00
Michal Čihař
60ff6f759f Create batch in a temporary file 
This should avoid problems described in comments of
421e8b0f54

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 07:50:17 +01:00
Isaac Bennetch
78af58dd0a Improve documentation for servers with Suhosin; issue #12434 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-12-12 19:55:36 -05:00
Lucie Procházková
de4fb44eeb Translated using Weblate (Czech) 
Currently translated at 93.3% (3008 of 3222 strings)

[CI skip]
 2016-12-13 00:44:31 +01:00
Lucie Procházková
3fbbf39c7f Translated using Weblate (Czech) 
Currently translated at 92.7% (2998 of 3232 strings)

[CI skip]
 2016-12-13 00:44:23 +01:00
jrchamp
e52bbde39b PMA_getRealSize - Performance and Readability 
The "upstream" Moodle code was updated in MDL-39524; rather than looping through the options, preg_match allows us to directly select the correct multiplication factor with a single function call. Note that the default behavior (integer coercion) handles both bare integers and numbers of bytes (factor 1).

Signed-off-by: Jonathan Champ <jrchamp@ncsu.edu>
 2016-12-09 15:13:20 -05:00
Michal Čihař
c1cc04c298 Merge branch 'QA_4_6' 2016-12-08 13:17:56 +01:00
Michal Čihař
9693522a86 Revert "Use unserialize without objects if available" 
This reverts commit d61dbc1d6f.

Honestly I don't think this work as documented:

PHP Warning:  unserialize() expects parameter 2 to be array, boolean given
 2016-12-08 13:17:03 +01:00
Michal Čihař
0079d9a940 Merge branch 'QA_4_6' 2016-12-08 12:04:26 +01:00
Michal Čihař
d61dbc1d6f Use unserialize without objects if available 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-08 12:04:05 +01:00
Michal Čihař
0c5acc9127 Merge branch 'QA_4_6' 2016-12-08 11:42:07 +01:00
Michal Čihař
f2bfa7d745 Avoid running shell scripts as CGI 
There is really no reason for that besides misconfigured servers.

This is followup for PMASA-2016-54

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-08 11:41:42 +01:00
Michal Čihař
a1a306c7ce Add missing use call 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-08 11:09:18 +01:00
Michal Čihař
616d216fd1 Simplify checks for Ajax request 
Use isAjax method instead of doing the check separately.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 18:23:52 +01:00