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

107345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deven Bansod
f14ad58d69 Merge branch 'QA_4_6' 2016-10-04 10:57:53 +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ř
fc5bb4a278 Merge branch 'QA_4_6' 2016-10-03 19:38:40 +02:00
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ř
d24848400d Merge branch 'QA_4_6' 2016-10-03 19:28:01 +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ř
73fb08a7aa Use stable version for demo links 
Fixes #12606

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-03 19:24:03 +02:00
Michal Čihař
c8200e1fa4 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-10-03 18:29:56 +02:00
Michal Čihař
48baca47b3 Merge branch 'QA_4_6' 2016-10-03 18:29:50 +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ř
9927c37f8d Merge pull request #12595 from nijel/remove-pow 
Remove Util::pow
 2016-10-03 16:45:34 +02:00
Michal Čihař
333ada932d Merge branch 'QA_4_6' 2016-10-03 16:06:42 +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
9419526304 Merge branch 'QA_4_6' 
Conflicts:
	po/id.po
	po/zh_CN.po
 2016-10-03 14:20:10 +05:30
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
Weblate
be1adf18e4 Merge remote-tracking branch 'origin/master' 2016-10-03 07:21:39 +02:00
Deven Bansod
77d1adcc47 Merge branch 'QA_4_6' 
Conflicts:
	po/id.po
	po/mk.po
 2016-10-03 10:53:28 +05:30
Dadan Setia
8e684a1947 Translated using Weblate (Indonesian) 
Currently translated at 68.4% (2204 of 3219 strings)

[CI skip]
 2016-10-03 07:21:37 +02:00
an wei
6de8fad985 Translated using Weblate (Chinese (China)) 
Currently translated at 87.6% (2820 of 3219 strings)

[CI skip]
 2016-10-03 07:21:36 +02:00
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
Dragan Zlatkovski
128c0607ef Translated using Weblate (Macedonian) 
Currently translated at 17.2% (554 of 3219 strings)

[CI skip]
 2016-10-02 18:45:18 +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
Yogi Erka Julyansa Putra
a266bf5016 Translated using Weblate (Indonesian) 
Currently translated at 68.4% (2205 of 3219 strings)

[CI skip]
 2016-10-02 18:37:40 +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
5f84046759 Make PHPCS happy 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-29 09:21:50 +05:30
Deven Bansod
d6571ef86c Merge branch 'QA_4_6' 
Conflicts:
	po/sk.po
 2016-09-28 20:09:45 +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
Michal Čihař
353aadbafb Return HTTP 500 on fatal error 
This makes it clear that something is broken.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-27 13:22:30 +02:00
Michal Čihař
fe549c4e19 Test with PHP 7.1.0RC2 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-27 10:40:33 +02:00
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
Michal Čihař
f143245f62 Use builtin pow for calculations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-27 10:05:33 +02:00
Michal Čihař
0060c36ac9 Remove usage of Util::pow with forcing builtin pow 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-27 10:04:55 +02:00
Michal Čihař
41c4855575 Remove no longer used Util::pow and tests for it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-27 09:34:32 +02:00
Michal Čihař
4d9febb855 Use built in pow for column calculation 
We're certainly not able to process more fields than integer can store.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-27 09:34:32 +02:00