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

105985 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Weblate
08b496f1d9 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-08 09:39:51 +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
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
Deven Bansod
4fb7d73401 Don't assume justBrowsing if there is a Join in the query 
Fix #12189

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-03 10:50:32 +05:30
Weblate
b9adbff762 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-03 07:20:15 +02:00
Dadan Setia
cc161ba310 Translated using Weblate (Indonesian) 
Currently translated at 68.8% (2207 of 3206 strings)

[CI skip]
 2016-10-03 07:20:13 +02:00
an wei
0e0fdf985a Translated using Weblate (Chinese (China)) 
Currently translated at 88.0% (2824 of 3206 strings)

[CI skip]
 2016-10-03 07:20:12 +02:00
Dragan Zlatkovski
ada8298508 Translated using Weblate (Macedonian) 
Currently translated at 17.2% (554 of 3206 strings)

[CI skip]
 2016-10-02 18:45:25 +02:00
Yogi Erka Julyansa Putra
a16d1c9a6a Translated using Weblate (Indonesian) 
Currently translated at 68.8% (2208 of 3206 strings)

[CI skip]
 2016-10-02 18:37:48 +02:00
Deven Bansod
5c74f44357 ChangeLog entry for #12455 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-30 11:00:30 +05:30
Deven Bansod
fdc80a2fd9 Fix #12455: Query history stores separate entry for every letter typed 
Don't store history when linting, rather store it only when user has submitted the query.

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-30 10:47:02 +05:30
Deven Bansod
f54f8fa322 ChangeLog for #12579 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-28 20:07:44 +05:30
Deven Bansod
bba3ae2ab5 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-09-28 19:29:20 +05:30
Michal Čihař
7a80af393d Add missing escaping in sample regexp 
Fixes #12594

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-28 19:27:47 +05:30
Jozef Pistej
7084608fff Translated using Weblate (Slovak) 
Currently translated at 83.6% (2682 of 3206 strings)

[CI skip]
 2016-09-28 19:27:47 +05:30
Deven Bansod
59cd9bf3a1 Replace FROM clause aliases only if FROM clause is present 
Fix #12579

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-28 19:27:35 +05:30
Deven Bansod
9bd75db679 ChangeLog entry for #12327 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-27 13:51:30 +05:30
Deven Bansod
96eba72fa6 Fix #12327: Show as PHP No longer works 
Fix output of show_as_php. Don't show the links that are not required
or that may not work as expected

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-27 13:47:31 +05:30
Weblate
5511b39e16 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-09-27 09:23:54 +02:00
Jozef Pistej
f99aa69784 Translated using Weblate (Slovak) 
Currently translated at 83.6% (2682 of 3206 strings)

[CI skip]
 2016-09-27 09:23:54 +02:00
Michal Čihař
2d316e47e1 Add missing escaping in sample regexp 
Fixes #12594

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-27 09:23:06 +02:00
Michal Čihař
a1c27b957c Cleanup code for getting table information 
Fixes #12475

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-26 13:44:57 +02:00
Michal Čihař
d956922a61 Remove duplicate code in SQL escaping 
Fixes #12508

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-26 13:40:04 +02:00
Michal Čihař
07b0f09232 Clarify documentation on ArbitraryServerRegexp 
- recommend using start/end of string in regexp
- add examples
- add note mentioning port inclusion in the match
- fixes #12511

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-26 13:35:41 +02:00