gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,386 Commits 12 Branches 481 Tags 2.4 GiB
7d361806c3
Commit Graph

106386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
7d361806c3 Share code for rendering custom header and footer 
Fixes #12802

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-19 15:20:12 +01:00
Michal Čihař
e267c6f9af Merge remote-tracking branch 'origin/pull/12803' into tmp 2016-12-19 15:06:30 +01:00
Michal Čihař
53274555b6 Add source release support 
See #12348

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-19 14:44:20 +01:00
Michal Čihař
7ad21270c4 Remove .htaccess from tests 
Issue #12348

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-19 13:35:28 +01:00
Weblate
59934c2914 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-12-19 09:15:31 +01:00
Franco
391c79e177 Translated using Weblate (Spanish) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-19 09:15:30 +01:00
Deven Bansod
33af5ac3d6 Uncomment mistakenly commented Selenium testing setting 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-12-19 13:45:00 +05:30
Isaac Bennetch
ea619794e5 Fix documentation markup 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-12-17 10:16:55 -05:00
Marc Delisle
128b0279de Translated using Weblate (French) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-15 00:48:27 +01:00
Marc Delisle
ba5212cb46 Translated using Weblate (French) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-15 00:46:22 +01:00
dingo thirteen
96c267cdf7 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-14 20:31:15 +01:00
Isaac Bennetch
e3a4bfe757 Fix display of custom header and footer in certain edge cases. 
Issues #12801 and #12802

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-12-14 12:32:42 -05:00
Michal Čihař
96350a7984 Do not use control link when working with stored procedures 
Fixed stored procedure execution.

Fixes #12813

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-14 15:57:39 +01:00
Michal Čihař
eec9d3f3dd Use === to avoid suprises with numeric table names 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-14 15:34:39 +01:00
Michal Čihař
715bdf3a49 Fixed operation with lower_case_table_names=2 
The problem is that mysqli_fields_meta returns orgtable as lowercase
making phpMyAdmin treat it as alias later nad finding no fields for
original table.

Fixes issue #11816

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-14 15:29:43 +01:00
Παναγιώτης Παπάζογλου
92d41e4d7f Translated using Weblate (Greek) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-14 15:29:34 +01:00
Phillip Rohmberger
30bfba75da Translated using Weblate (German) 
Currently translated at 99.5% (3206 of 3222 strings)

[CI skip]
 2016-12-14 15:29:34 +01:00
Domen
16c72323d1 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-14 10:30:30 +01:00
Weblate
9f775e4b0b Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-12-13 16:50:22 +01:00
Stefano Martinelli
ceec247a20 Translated using Weblate (Italian) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-12-13 16:50:20 +01:00
Giovanni Sora
e40d0439fd Translated using Weblate (Interlingua) 
Currently translated at 74.7% (2408 of 3222 strings)

[CI skip]
 2016-12-13 16:50:20 +01:00
monicagrau
fd897920d7 Translated using Weblate (Catalan) 
Currently translated at 99.2% (3199 of 3222 strings)

[CI skip]
 2016-12-13 16:50:19 +01:00
Michal Čihař
ef4e584eea Fix return value documentation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 16:13:18 +01:00
Weblate
a1fa82f39b Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-12-13 11:24:18 +01:00
Giovanni Sora
ca1abc679c Translated using Weblate (Interlingua) 
Currently translated at 74.7% (2407 of 3222 strings)

[CI skip]
 2016-12-13 11:24:16 +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
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ř
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ř
f18e02b16d Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 10:40:52 +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
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ř
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ř
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