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

110922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
b030ce4e31 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-09-04 15:31:24 +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
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
Piotr Strebski
fcda63498a Translated using Weblate (Polish) 
Currently translated at 80.1% (2589 of 3231 strings)

[CI skip]
 2017-09-04 12:14:25 +02:00
developerchan1
d7d37ae6de Translated using Weblate (Indonesian) 
Currently translated at 76.2% (2464 of 3231 strings)

[CI skip]
 2017-09-04 12:14:21 +02:00
Michal Čihař
0c32545c25 Documnent ctype dependency 
It is required by Twig.

Fixes #13611

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-04 12:13:42 +02:00
Michal Čihař
04279efdff Merge branch 'QA_4_7' 2017-09-04 10:17:45 +02:00
Michal Čihař
0f5ce410b4 Merge remote-tracking branch 'origin/QA_4_7' 2017-09-04 10:17:42 +02:00
Michal Čihař
27fd0a88f6 Include language parameter when loading js messages 
This forces reloading javscript messages when changing language.

Fixes #13633

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-09-04 10:17:13 +02:00
Egorov Artyom
23309680c6 Translated using Weblate (Russian) 
Currently translated at 94.6% (3035 of 3205 strings)

[CI skip]
 2017-09-04 10:17:03 +02:00
developerchan1
b573e8d555 Translated using Weblate (Indonesian) 
Currently translated at 75.3% (2415 of 3205 strings)

[CI skip]
 2017-09-04 10:17:00 +02:00
Weblate
9763e96882 Merge remote-tracking branch 'origin/master' 2017-09-04 09:56:05 +02:00
worw
91ca9ff2bc Translated using Weblate (Russian) 
Currently translated at 93.5% (3023 of 3231 strings)

[CI skip]
 2017-09-04 09:56:03 +02:00
developerchan1
ef174d04a0 Translated using Weblate (Indonesian) 
Currently translated at 75.3% (2434 of 3231 strings)

[CI skip]
 2017-09-04 09:55:56 +02:00
Marc Delisle
3c249eb61a Translated using Weblate (French) 
Currently translated at 99.3% (3210 of 3231 strings)

[CI skip]
 2017-09-04 09:55:49 +02:00
akritianand
4f6335bb59 Do not include messages when copying results 
Unnecessary data should not come in clipboard copied table.

Fixes #13617 

Signed-off-by: Akriti Anand <anand.akriti@gmail.com>
 2017-09-04 09:55:12 +02:00
Chandra Chou
61f8b52136 Translated using Weblate (Indonesian) 
Currently translated at 75.0% (2425 of 3231 strings)

[CI skip]
 2017-09-04 09:20:51 +02:00
Chandra Chou
322d29eca8 Translated using Weblate (Indonesian) 
Currently translated at 75.1% (2407 of 3205 strings)

[CI skip]
 2017-09-04 09:20:42 +02:00
Παναγιώτης Παπάζογλου
ce0c02c0fc Translated using Weblate (Greek) 
Currently translated at 100.0% (3231 of 3231 strings)

[CI skip]
 2017-09-04 08:26:59 +02:00
Παναγιώτης Παπάζογλου
19b30335a2 Translated using Weblate (Greek) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-09-04 07:36:21 +02:00
Cyan K
a16887cf8d Translated using Weblate (Korean) 
Currently translated at 82.6% (2648 of 3205 strings)

[CI skip]
 2017-09-04 06:47:25 +02:00
Cyan K
d998dddae3 Translated using Weblate (Korean) 
Currently translated at 81.9% (2647 of 3231 strings)

[CI skip]
 2017-09-04 06:47:14 +02:00
Anton Alekseevich
19f1e27fa2 Translated using Weblate (Russian) 
Currently translated at 94.6% (3035 of 3205 strings)

[CI skip]
 2017-09-03 23:39:47 +02:00
Vladimir G
98efb0b8e1 Translated using Weblate (Russian) 
Currently translated at 94.6% (3035 of 3205 strings)

[CI skip]
 2017-09-03 23:38:54 +02:00
anonymous
01c0391363 Translated using Weblate (Russian) 
Currently translated at 94.6% (3034 of 3205 strings)

[CI skip]
 2017-09-03 23:38:29 +02:00
worw
00392cc30a Translated using Weblate (Russian) 
Currently translated at 94.6% (3034 of 3205 strings)

[CI skip]
 2017-09-03 23:38:07 +02:00
anonymous
0801f0e1a2 Translated using Weblate (Russian) 
Currently translated at 94.6% (3034 of 3205 strings)

[CI skip]
 2017-09-03 23:37:51 +02:00
Marc Delisle
f2d79a8df9 Translated using Weblate (French) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-09-03 21:35:46 +02:00
Steven WdV
83a19f4cfe Translated using Weblate (Dutch) 
Currently translated at 99.9% (3204 of 3205 strings)

[CI skip]
 2017-09-03 18:45:12 +02:00
Steven WdV
21c83357da Translated using Weblate (Dutch) 
Currently translated at 99.9% (3230 of 3231 strings)

[CI skip]
 2017-09-03 18:45:03 +02:00
Imam Ilham Khawarizma
adfe2ac577 Translated using Weblate (Indonesian) 
Currently translated at 74.7% (2415 of 3231 strings)

[CI skip]
 2017-09-03 17:18:19 +02:00
Imam Ilham Khawarizma
ef9fb6585f Translated using Weblate (Indonesian) 
Currently translated at 74.7% (2397 of 3205 strings)

[CI skip]
 2017-09-03 17:18:11 +02:00
Eurecode
2a08cbbb66 Translated using Weblate (Indonesian) 
Currently translated at 74.7% (2397 of 3205 strings)

[CI skip]
 2017-09-03 14:31:52 +02:00
Eurecode
c731fb07c2 Translated using Weblate (Indonesian) 
Currently translated at 74.7% (2415 of 3231 strings)

[CI skip]
 2017-09-03 14:31:45 +02:00
Chandra Chou
3b8ac76251 Translated using Weblate (Indonesian) 
Currently translated at 74.7% (2415 of 3231 strings)

[CI skip]
 2017-09-03 13:39:41 +02:00
Chandra Chou
83bf1b2180 Translated using Weblate (Indonesian) 
Currently translated at 74.7% (2397 of 3205 strings)

[CI skip]
 2017-09-03 13:39:32 +02:00
Eurecode
b80accf8db Translated using Weblate (Indonesian) 
Currently translated at 74.4% (2386 of 3205 strings)

[CI skip]
 2017-09-03 13:18:18 +02:00