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

107153 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deven Bansod
9517695eb4 Merge branch 'QA_4_6' 2016-09-14 23:07:57 +05:30
Deven Bansod
10e4f0a3dd Check if the regex matching returns null before using it further 
Fix #12473 : Code can throw unhandled exception

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-14 23:06:25 +05:30
Deven Bansod
d6b80ad910 ChangeLog entry for #12473 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-14 23:02:18 +05:30
Michal Čihař
e88343e377 Merge branch 'QA_4_6' 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-13 16:05:16 +02:00
Michal Čihař
b593bfeb7c Update SQL parser to 3.4.6 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-13 16:04:50 +02:00
Michal Čihař
d3df461714 Merge branch 'QA_4_6' 2016-09-13 11:06:07 +02:00
Michal Čihař
16474f3dde Update SQL parser to 3.4.5 
- issue #11628 Proper parsing of INSERT ... ON DUPLICATE KEY queries
- issue #12545 Proper parsing of CREATE TABLE ... PARTITION queries

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-13 11:04:53 +02:00
Deven Bansod
30f7244707 Merge branch 'QA_4_6' 2016-09-13 01:14:05 +05:30
Deven Bansod
bc589dfbbf Fix Class name 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-13 01:13:55 +05:30
Deven Bansod
75c539c281 Merge branch 'QA_4_6' 
Conflicts:
	po/sk.po
	po/zh_CN.po
 2016-09-13 01:10:04 +05:30
Deven Bansod
7fdffa313f Fix label for Add User Group form 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-13 01:08:56 +05:30
jin123456bat
c73c720cb3 Translated using Weblate (Chinese (China)) 
Currently translated at 87.9% (2819 of 3206 strings)

[CI skip]
 2016-09-11 06:44:18 +02:00
Weblate
35cc2bf793 Merge remote-tracking branch 'origin/master' 2016-09-09 16:52:21 +02:00
Deven Bansod
f797a8d87d Variables must be defined even if it's a GET Request 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-09 20:25:12 +05:30
jin123456bat
eacc094242 Translated using Weblate (Chinese (China)) 
Currently translated at 87.4% (2815 of 3219 strings)

[CI skip]
 2016-09-09 16:52:18 +02:00
Martin Lacina
35bf74a174 Translated using Weblate (Slovak) 
Currently translated at 83.5% (2680 of 3206 strings)

[CI skip]
 2016-09-09 15:45:58 +02:00
Martin Lacina
b7c66598a4 Translated using Weblate (Slovak) 
Currently translated at 83.0% (2673 of 3219 strings)

[CI skip]
 2016-09-09 15:45:54 +02:00
Michal Čihař
4984c70894 Changelog entry for #12302 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-07 12:07:01 +02:00
Michal Čihař
91d648d480 Merge pull request #12537 from Seldar/master 
Using number_format parameters instead of Util::localizeNumber
 2016-09-07 12:06:10 +02:00
Volkan Ulukut
7ce0234a2c Using number_format parameters instead of Util::localizeNumber 
Signed-off-by: Volkan Ulukut <arthan@gmail.com>
 2016-09-07 11:42:09 +03:00
Michal Čihař
cdfde388c9 Merge branch 'QA_4_6' 2016-09-07 09:29:56 +02:00
Michal Čihař
0bea337231 Changelog for #11924 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-07 09:29:35 +02:00
Michal Čihař
daaa49d53e Merge branch 'QA_4_6' 2016-09-07 09:28:31 +02:00
Michal Čihař
42d54a938a Remove MySQL version caching 
In my testing the session/cache access is slower than fetching single
value from MySQL and calculating the values.

Also the caching would need some logic for invalidation as the server
can be upgraded or configuration changed.

Fixes #11924

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-07 09:28:13 +02:00
Daniel Mossaband
be315905bd Updated file locations (#12528) 
Documentation Update after PMASA-2016-54 fix #12507

Signed-off-by: Daniel Mossaband <Daniel@Mossaband.com>
 2016-09-06 18:01:09 +02:00
Michal Čihař
138c204cb9 Merge branch 'QA_4_6' 2016-09-06 12:45:41 +02:00
Michal Čihař
f3cd949738 Changelog for issue #12470 
Fix possible race condition in setting URL hash

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-06 12:45:25 +02:00
Michal Čihař
8ebc43ebc1 Merge pull request #12541 from sudheesh001/QA_4_6 
Fixes #12470 Stores tab_id hash into a variable instead of location.hash
 2016-09-06 12:44:44 +02:00
Sudheesh Singanamalla
40d9d82840 Fixes #12470 Stores tab_id hash into a variable instead of location.hash 
Signed-off-by: Sudheesh Singanamalla <sudheesh1995@outlook.com>
 2016-09-06 15:28:46 +05:30
Michal Čihař
2963740451 Merge branch 'QA_4_6' 2016-09-06 11:34:02 +02:00
Michal Čihař
6c9c8a83d0 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-09-06 11:33:45 +02:00
Michal Čihař
3debfa5d1f Merge branch 'QA_4_6' 2016-09-06 11:33:32 +02:00
Michal Čihař
9df5aebc22 Changelog entry for #12531 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-06 11:33:03 +02:00
Weblate
5e15a2b054 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-09-06 11:32:00 +02:00
Sevdimali İsa
954ebe9cbc Translated using Weblate (Azerbaijani) 
Currently translated at 52.4% (1680 of 3206 strings)

[CI skip]
 2016-09-06 11:31:57 +02:00
Michal Čihař
28c981dd31 Merge pull request #12532 from devenbansod/fix_12531 
Fix #12531 : Properly flag queries as DROP DATABASE
 2016-09-06 11:31:53 +02:00
Deven Bansod
715403c0e7 Fix #12531 : Properly flag queries as DROP DATABASE 
Parser recognizes various DROP statements correctly, but the flags set by SQL Parser are incorrectly used.
In js/functions.js, removed the Regex-based matching, rather handle it in PHP as we have correct flags available from SQL Parser

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-06 14:20:19 +05:30
Michal Čihař
92cb95c6d5 Fix other places of wrong value for # in tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-06 10:24:04 +02:00
Deven Bansod
b1d0589b51 Fix numeric errors 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-06 10:04:05 +02:00
Michal Čihař
eb233da10a Set reasonable mock value for tests 
Set integer where we do a COUNT() SQL.

See also #12539

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-06 10:00:14 +02:00
Michal Čihař
7cb6830ec8 Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-06 09:51:45 +02:00
Weblate
477acc6321 Merge remote-tracking branch 'origin/master' 2016-09-06 09:49:06 +02:00
Sevdimali İsa
46305f3386 Translated using Weblate (Azerbaijani) 
Currently translated at 52.0% (1675 of 3219 strings)

[CI skip]
 2016-09-06 09:49:02 +02:00
Michal Čihař
f23c0b9db9 Set correct Uptime value for tests 
MySQL returns this as integer, so we should do the same for tests.

See also #12539

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-06 09:48:38 +02:00
Deven Bansod
ea5cc4a028 Merge branch 'QA_4_6' 2016-09-05 23:00:24 +05:30
Deven Bansod
6bcc593c84 Fix 'Unsupported query' message from Travis logs 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-05 23:00:12 +05:30
Michal Čihař
e52ceecb3d Ensure font size is integer, we do further calculations with it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-05 18:46:01 +02:00
Michal Čihař
a1ff9aaa9d Merge branch 'QA_4_6' 2016-09-05 18:01:15 +02:00
Michal Čihař
d15f505dfd Add PHP 7.1.0RC1 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-05 18:01:08 +02:00
Balázs Úr
934c740c2c Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3206 of 3206 strings)

[CI skip]
 2016-09-05 18:00:46 +02:00