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

108286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
d8c80afae9 Always set global settings for testing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 17:29:05 +01:00
Michal Čihař
9e93ba5b48 Merge remote-tracking branch 'origin/pull/12793' into tmp 2016-12-13 17:21:03 +01:00
Michal Čihař
f0d3aaa5c0 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-12-13 16:49:52 +01:00
Weblate
d379d7f568 Merge remote-tracking branch 'origin/master' 2016-12-13 16:32:46 +01:00
Giovanni Sora
fc28c39efb Translated using Weblate (Interlingua) 
Currently translated at 74.8% (2426 of 3239 strings)

[CI skip]
 2016-12-13 16:32:44 +01:00
monicagrau
642ad9a549 Translated using Weblate (Catalan) 
Currently translated at 98.7% (3199 of 3239 strings)

[CI skip]
 2016-12-13 16:32:43 +01:00
Michal Čihař
0522bb784a Merge pull request #12809 from nijel/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2016-12-13 16:32:38 +01:00
Scrutinizer Auto-Fixer
58b16e73c8 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-12-13 15:16:11 +00:00
osaid
800975a73c PMA_sendHeaderLocation called after actually sending headers 2016-12-13 20:33:37 +05:30
Stefano Martinelli
cde3ec1d8c Translated using Weblate (Italian) 
Currently translated at 100.0% (3239 of 3239 strings)

[CI skip]
 2016-12-13 15:14:48 +01:00
Michal Čihař
9b04a6d293 Fix rendering of language selector 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 12:59:41 +01:00
Burak Yavuz
e73a59f18e Translated using Weblate (Turkish) 
Currently translated at 100.0% (3239 of 3239 strings)

[CI skip]
 2016-12-13 11:30:05 +01:00
Weblate
8d3354b15e Merge remote-tracking branch 'origin/master' 2016-12-13 11:24:13 +01:00
Giovanni Sora
9ec783a180 Translated using Weblate (Interlingua) 
Currently translated at 74.6% (2419 of 3239 strings)

[CI skip]
 2016-12-13 11:24:10 +01:00
Michal Čihař
d7ea170950 Merge branch 'QA_4_6' 2016-12-13 11:23:58 +01:00
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
Michal Čihař
15f63f3d96 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-12-13 11:23:06 +01:00
Michal Čihař
a86450728a Translated using Weblate (Czech) 
Currently translated at 93.8% (3023 of 3222 strings)

[CI skip]
 2016-12-13 11:22:56 +01:00
Michal Čihař
719cb1f309 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-12-13 11:22:43 +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
Burak Yavuz
2e561a296e Translated using Weblate (Turkish) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-13 11:04:48 +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