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

106006 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deven Bansod
201ba095ce Adjust tests 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-14 10:01:04 +05:30
Deven Bansod
c00cf34886 Use IF EXISTS with DROP Database while exporting to prevent error while importing this dump 
Fix #12634

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-14 10:00:50 +05:30
Deven Bansod
900a12f870 Prevent undefined index errors while editing user privs 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-13 14:10:59 +05:30
Deven Bansod
8c357fab12 Also unset just_one_table while having subquery or having more than or less than 1 tables selected 
Issue #12625

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-13 10:58:05 +05:30
Deven Bansod
7bc630bf25 ChangeLog entry for #12625 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-13 10:18:53 +05:30
Deven Bansod
6b256e89dd Don't set just_one_table to true when JOIN is present in query 
Fix #12625

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-13 10:17:11 +05:30
Michal Čihař
d5028e445a Remove non working todofy badge 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-11 13:16:22 +02:00
Deven Bansod
3166e8c0f2 Use values from request parameter url_param only if it is an array 
Fix #12350

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-11 12:14:10 +05:30
Weblate
5fa394b12b Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-11 08:13:35 +02:00
Deven Bansod
593cbd271f Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-11 11:45:23 +05:30
Deven Bansod
2fdb15c36e Replace call to an old and unavailable function 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-11 11:44:26 +05:30
Giovanni Sora
88f0b6c99d Translated using Weblate (Interlingua) 
Currently translated at 73.9% (2371 of 3206 strings)

[CI skip]
 2016-10-11 08:13:33 +02:00
Michal Čihař
5ded636281 Translated using Weblate (Vietnamese) 
Currently translated at 86.3% (2768 of 3206 strings)

[CI skip]
 2016-10-10 21:33:04 +02:00
Michal Čihař
489e3b5a9a Translated using Weblate (Tamil) 
Currently translated at 34.2% (1098 of 3206 strings)

[CI skip]
 2016-10-10 21:33:03 +02:00
Bogdan Ciobaca
cf4a1a9ee2 Translated using Weblate (Romanian) 
Currently translated at 53.8% (1727 of 3206 strings)

[CI skip]
 2016-10-10 21:33:03 +02:00
Michal Čihař
2fa52f06b9 Translated using Weblate (Portuguese) 
Currently translated at 53.7% (1724 of 3206 strings)

[CI skip]
 2016-10-10 21:33:03 +02:00
Michal Čihař
521e087cec Translated using Weblate (Kurdish Sorani) 
Currently translated at 31.7% (1017 of 3206 strings)

[CI skip]
 2016-10-10 21:33:02 +02:00
Arie Kurniawan
f31699970f Translated using Weblate (Indonesian) 
Currently translated at 69.5% (2231 of 3206 strings)

[CI skip]

Correcting translate
 2016-10-10 21:33:02 +02:00
Michal Čihař
e394ca84a4 Translated using Weblate (Danish) 
Currently translated at 92.0% (2952 of 3206 strings)

[CI skip]
 2016-10-10 21:33:01 +02:00
Deven Bansod
c455a5cf8f Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-10 01:20:34 +05:30
Deven Bansod
afa6e3b85e Initialize newly added Textareas with default values 
Actually default values for textareas are blanks.

Fix #12624

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-10 01:18:50 +05:30
Ranja Hseen
fd31ed27e0 Translated using Weblate (Kurdish Sorani) 
Currently translated at 18.0% (580 of 3206 strings)

[CI skip]
 2016-10-09 12:14:38 +02:00
Deven Bansod
0b355b7446 Add tests for generation of Field spec with TIMESTAMP with precision 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-08 13:11:42 +05:30
Deven Bansod
4f023ac86a Allow for precision specification in TIMESTAMP datatype while editing/adding a column 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-08 13:11:36 +05:30
Weblate
08b496f1d9 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-08 09:39:51 +02:00
SDSkyKlouD
68bebc00ea Translated using Weblate (Korean) 
Currently translated at 78.6% (2521 of 3206 strings)

[CI skip]
 2016-10-08 09:39:50 +02:00
Ihab Mardoud
5ed544a45e Translated using Weblate (Arabic) 
Currently translated at 34.0% (1093 of 3206 strings)

[CI skip]
 2016-10-08 09:39:48 +02:00
Deven Bansod
0de5f6099f ChangeLog entry for #12619 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-05 17:41:54 +05:30
Deven Bansod
9ceb237dd6 Don't append FROM clause for replacing in UNION statements 
If global statement has atleast one union, it should not have a FROM.

Fix #12619

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-05 17:38:23 +05:30
Deven Bansod
7d2760cec5 ChangeLog entry for #12362 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-05 13:48:21 +05:30
Weblate
c4a2e1b6f2 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-05 08:02:30 +02:00
Deven Bansod
889cd31618 Prevent leaving an orphaned file while importing preferences 
Fix #12362

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-05 11:33:44 +05:30
Val Bancer
39f4a595b2 Translated using Weblate (Russian) 
Currently translated at 98.2% (3156 of 3213 strings)

[CI skip]
 2016-10-05 08:02:29 +02:00
Michal Čihař
a7786dd93a Changelog for #12582 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-04 12:17:02 +02:00
Michal Čihař
686db2039d Merge pull request #12582 from devenbansod/fix_12569 
Use Response instead of Message's display method to print error
 2016-10-04 12:16:06 +02:00
Michal Čihař
ddf580c51b Fix OmniWeb version match (issue #12615) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-04 12:02:02 +02:00
Michal Čihař
cd4c8374b1 Fixed regexp for matching browser versions 
Fixes #12615

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-04 11:51:29 +02:00
Deven Bansod
46ae500508 ChangeLog entry for #12419 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-04 10:59:05 +05:30
Deven Bansod
26c7a58533 Merge pull request #12440 from rpv-tomsk/grant-option-description-12419 
Fix #12419 wrong description on GRANT option of table/routine privileges
 2016-10-04 10:54:21 +05:30
Michal Čihař
4ba041720f Changelog entry for #12584 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-03 19:36:33 +02:00
Michal Čihař
5071b8a016 Merge remote-tracking branch 'origin/pull/12584' into QA_4_6 2016-10-03 19:35:56 +02:00
Michal Čihař
0292b89c4a Merge remote-tracking branch 'origin/pull/12596' into QA_4_6 2016-10-03 19:35:07 +02:00
Michal Čihař
200a92b738 Merge remote-tracking branch 'origin/pull/12601' into QA_4_6 2016-10-03 19:33:48 +02:00
Michal Čihař
0a5ab3bfe9 Remove unused script 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-03 19:27:53 +02:00
Michal Čihař
e1d5a1338d Remove outdated script 
This is not used on the demo, there is separate one in scripts repo.

Fixes #12605

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-03 19:27:03 +02:00
Michal Čihař
4e020dea6b Update SQL parser to 3.4.10 
Fixes #12612

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-03 18:29:05 +02:00
Michal Čihař
aa19ffde32 Update SQL parser to 3.4.9 
- issue #12316 Correct export of complex SELECT statements
- issue #12080 Fixed parsing of subselect queries
- issue #11740 Fixed handling DELETE ... USING queries
- issue #12100 Fixed handling of CASE operator

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-03 16:06:10 +02:00
Deven Bansod
c202b7a87c Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-03 14:17:23 +05:30
Deven Bansod
6a53b89cb7 Escape database name properly to be used in MySQL wildcard statements 
Fix #12602

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-03 14:14:11 +05:30
Deven Bansod
b2d337814a Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-03 10:52:03 +05:30