gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,956 Commits 12 Branches 481 Tags 2.4 GiB
4e3d32475c
Commit Graph

110956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
4e3d32475c Switch some external links to https 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-05 10:54:54 +02:00
Michal Čihař
541e72a019 Fix parameter description 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-05 09:12:25 +02:00
Weblate
6ed4a3c533 Merge remote-tracking branch 'origin/master' 2017-09-05 04:38:07 +02:00
pitchblack
79c93517c5 Translated using Weblate (Russian) 
Currently translated at 95.5% (3087 of 3231 strings)

[CI skip]
 2017-09-05 04:38:05 +02:00
Maurício Meneghini Fauth
18b7845b5a Merge pull request #13644 from mauriciofauth/import 
Refactor import functions to static methods
 2017-09-04 23:37:19 -03:00
Maurício Meneghini Fauth
19e0199a36 Refactor import functions to static methods 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-09-04 22:35:55 -03:00
Maurício Meneghini Fauth
53f77c7a49 Merge pull request #13642 from mauriciofauth/display-export 
Refactor display_export to static methods
 2017-09-04 16:08:23 -03:00
Michal Čihař
7eeca859a8 Merge branch 'QA_4_7' 2017-09-04 17:46:29 +02:00
Michal Čihař
2e33126b0b Move configuration checks to Core 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-04 17:46:10 +02:00
Michal Čihař
b11f479c5b Fix handling of early fatal errors 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-04 17:46:10 +02:00
Michal Čihař
ba92aeeac6 Add runtime check for ctype extension 
Issue #13611

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-04 17:46:10 +02:00
Michal Čihař
dffa9f06b7 Move PHP confguration to Core class 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-04 17:46:10 +02:00
Māris
446ed7630b Translated using Weblate (Latvian) 
Currently translated at 17.9% (574 of 3205 strings)

[CI skip]
 2017-09-04 17:45:20 +02:00
Māris
fee96096e7 Translated using Weblate (Latvian) 
Currently translated at 17.6% (571 of 3231 strings)

[CI skip]
 2017-09-04 17:45:20 +02:00
developerchan1
e081e180c8 Translated using Weblate (Indonesian) 
Currently translated at 77.2% (2477 of 3205 strings)

[CI skip]
 2017-09-04 17:45:17 +02:00
developerchan1
90b5eb4f2b Translated using Weblate (Indonesian) 
Currently translated at 77.2% (2496 of 3231 strings)

[CI skip]
 2017-09-04 17:45:17 +02:00
Weblate
a9c6f6a2d6 Merge remote-tracking branch 'origin/master' 2017-09-04 16:58:40 +02:00
Weblate
a33730f8a1 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-09-04 16:58:39 +02:00
Māris
d053eabd06 Translated using Weblate (Latvian) 
Currently translated at 17.6% (571 of 3231 strings)

[CI skip]
 2017-09-04 16:58:37 +02:00
Māris
c67034677d Translated using Weblate (Latvian) 
Currently translated at 17.9% (574 of 3205 strings)

[CI skip]
 2017-09-04 16:58:37 +02:00
Surya Widi
0f76b39b85 Translated using Weblate (Indonesian) 
Currently translated at 76.9% (2487 of 3231 strings)

[CI skip]
 2017-09-04 16:58:35 +02:00
Surya Widi
2d11872d1e Translated using Weblate (Indonesian) 
Currently translated at 77.0% (2468 of 3205 strings)

[CI skip]
 2017-09-04 16:58:35 +02:00
Michal Čihař
811d124503 Merge branch 'QA_4_7' 2017-09-04 16:58:11 +02:00
Michal Čihař
04add7c918 Better report connection errors 
Provide verbose error description when we can't connect to the server
from client.

Fixes #13183

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-04 16:57:27 +02:00
Michal Čihař
0fcceb9b2f Do not include error code 0 in the message 
It really is not useful information.

Issue #13183

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-04 16:53:56 +02:00
Michal Čihař
2a883f8ba1 Include error detail in the error message 
Issue #13183

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-04 16:51:19 +02:00
Michal Čihař
b8be1fecd5 Merge branch 'QA_4_7' 2017-09-04 16:21:49 +02:00
Michal Čihař
71370f1be3 Remove no longer needed attribute 
Issue #13533

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-04 16:19:48 +02:00
Michal Čihař
ed912090ec Fixed saving column to display 
- avoid consulting current value as that can be automatically guessed
- use REPLACE query to avoid need of figuring out query type

Fixes #13533

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-04 16:17:30 +02:00
Michal Čihař
b7b4c41325 Merge branch 'QA_4_7' 2017-09-04 15:35:01 +02:00
Michal Čihař
48b95ece85 Adjust tests to new attributes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-04 15:34:56 +02:00
Michal Čihař
3163ad3181 Merge branch 'QA_4_7' 2017-09-04 15:31:31 +02:00
Michal Čihař
b030ce4e31 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-09-04 15:31:24 +02:00
Michal Čihař
f4b0faf698 Ensure we use correct name for internal relations 
Fixes #13638

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-04 15:30:58 +02:00
Michal Čihař
f6364e45ab Merge branch 'QA_4_7' 2017-09-04 15:18:43 +02:00
Michal Čihař
f407601d59 Ignore some development files when exporting Git 
Fixes #13632

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-04 15:17:57 +02:00
Maurício Meneghini Fauth
43ff4566d0 Refactor display_export to static methods 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-09-04 10:15:47 -03:00
Weblate
17821c2bcb Merge remote-tracking branch 'origin/master' 2017-09-04 15:08:03 +02:00
Māris
05dea67cbb Translated using Weblate (Latvian) 
Currently translated at 17.6% (569 of 3231 strings)

[CI skip]
 2017-09-04 15:07:53 +02:00
Michal Čihař
f52beffd3d Merge branch 'QA_4_7' 2017-09-04 15:07:21 +02:00
Michal Čihař
7fe6131e63 Merge remote-tracking branch 'origin/QA_4_7' 2017-09-04 15:05:04 +02:00
Michal Čihař
2b87c7d643 Fix condition checking for result 
Fixes #13637

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-04 15:04:46 +02:00
Michal Čihař
47f7ba159e Fixed error when browsing non SELECT results 
We can not assume that the analyzer will work on our query.

Fixes #13639

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-04 15:04:46 +02:00
Michal Čihař
483324d0a9 Fixed crash on invalid ordering data 
We have to validate the data prior to use. Having just integer doesn't
make them work.

Fixes #13604

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-04 15:04:46 +02:00
Michal Čihař
00485eb593 Share code for getting column params 
Issue #13604

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-04 15:04:46 +02:00
Michal Čihař
aa75d66eec Remove tested propery 
Originally the code could delete PROP_COLUMN_ORDER when asking for
PROP_COLUMN_VISIB.

Issue #13604

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-04 15:04:46 +02:00
Piotr Strebski
6adb95b4ae Translated using Weblate (Polish) 
Currently translated at 81.0% (2598 of 3205 strings)

[CI skip]
 2017-09-04 15:04:35 +02:00
Māris
56c61b7f37 Translated using Weblate (Latvian) 
Currently translated at 17.8% (572 of 3205 strings)

[CI skip]
 2017-09-04 15:04:31 +02:00
developerchan1
1ad3734810 Translated using Weblate (Indonesian) 
Currently translated at 76.2% (2445 of 3205 strings)

[CI skip]
 2017-09-04 15:04:25 +02:00
Weblate
81fd5d212b Merge remote-tracking branch 'origin/master' 2017-09-04 12:14:28 +02:00