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

108331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
5cc8f7ebea Merge remote-tracking branch 'origin/QA_4_6' 2016-12-19 13:36:39 +01:00
Weblate
677d1cd640 Merge remote-tracking branch 'origin/master' 2016-12-19 09:16:21 +01:00
Deven Bansod
a8018c2fa1 Merge branch 'QA_4_6' 2016-12-19 13:46:59 +05:30
Franco
0c416502c2 Translated using Weblate (Spanish) 
Currently translated at 99.8% (3234 of 3239 strings)

[CI skip]
 2016-12-19 09:16:21 +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
2a6b05d965 Use documentation link instead of wiki for Composer details 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-12-18 00:13:41 -05:00
Isaac Bennetch
697e1cec72 Hints about using Composer for library dependencies 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-12-18 00:09:36 -05:00
Isaac Bennetch
ea619794e5 Fix documentation markup 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-12-17 10:16:55 -05:00
Michal Čihař
c16f1eb87d Merge branch 'QA_4_6' 2016-12-15 09:18:05 +01:00
Michal Čihař
d00ad18075 Include token in all filter requests 
Fixes #12786

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-15 09:16:55 +01:00
Michal Čihař
0664d15cef Simplify checking for ajax request 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-15 09:11:06 +01:00
Michal Čihař
4e9a342794 Register shutdown directly on singleton instance 
This avoids additional call in the shutdown handler.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-15 09:06:02 +01:00
Michal Čihař
f08907544d Get response instance just once 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-15 08:58:18 +01:00
Michal Čihař
f914fcaba5 Share code for cascading ajax flag 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-15 08:54:45 +01: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
ad414347e4 Translated using Weblate (French) 
Currently translated at 100.0% (3239 of 3239 strings)

[CI skip]
 2016-12-15 00:48:19 +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
0e02568640 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3239 of 3239 strings)

[CI skip]
 2016-12-14 20:32:49 +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
Michal Čihař
71e0c4bb67 Fix early fatal errors 
We can not rely on whole stack being ready.

Fixes #12810

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-14 16:07:55 +01:00
Michal Čihař
2331fa0ead Merge branch 'QA_4_6' 2016-12-14 15:58:17 +01: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ř
06d13fc715 Merge branch 'QA_4_6' 2016-12-14 15:34:54 +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ř
beea41fc96 Merge branch 'QA_4_6' 2016-12-14 15:31:29 +01:00
Michal Čihař
db2e3f392a Merge remote-tracking branch 'origin/QA_4_6' 2016-12-14 15:31:01 +01:00
Domen
a05dc97218 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3239 of 3239 strings)

[CI skip]
 2016-12-14 15:30:45 +01:00
Phillip Rohmberger
b8eecfed8f Translated using Weblate (German) 
Currently translated at 99.2% (3215 of 3239 strings)

[CI skip]
 2016-12-14 15:30:43 +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
Παναγιώτης Παπάζογλου
3f26112698 Translated using Weblate (Greek) 
Currently translated at 100.0% (3239 of 3239 strings)

[CI skip]
 2016-12-14 09:11:13 +01:00
Michal Čihař
c20474b5c5 Properly set Response mock for testing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 17:35:15 +01:00
Michal Čihař
d393505ce1 Avoid using define() for PMA_IS_IIS in tests 
It is not used anywhere in the code.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 17:34:42 +01:00
Michal Čihař
66ac1a3053 Remove unused variable safari_browser 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-13 17:30:00 +01:00
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
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ř
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