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

105913 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deven Bansod
abc1172440 ChangeLog for #12382 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-21 21:25:32 +05:30
Deven Bansod
adcaf7ca4b Use intval to prevent XSS instead, and use numeric to check valid datatype 
Fix #12382

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-21 21:24:00 +05:30
Deven Bansod
54063a75c3 ChangeLog entry for #12575 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-20 23:03:50 +05:30
Deven Bansod
5a456eb1ea Fix extra spaces in field name in adding key and dropping field 
Fix #12575

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-20 22:55:23 +05:30
Deven Bansod
b463665b13 ChangeLog entry for #12242 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-20 17:02:00 +05:30
Deven Bansod
38cb18b0de Fix #12242 : Edit routine detail dialog does not fill "Return length" field in mysql functions 
Use correct field to get the details about the length of returning value's datatype

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-20 17:00:15 +05:30
Michal Čihař
d519c9039e Update SQL parser to 3.4.7 
- issue #12298 Fixed export of view definitions

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-20 09:11:55 +02:00
Michal Čihař
f7f03127f7 Store create options in serapate array instead of polluting global namespace 
This is just a minor cleanup to avoid possible problems when MySQL
create table options would collide with our variable names.

See also issue #12567

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-19 11:34:43 +02:00
Michal Čihař
5c0af8facf Merge remote-tracking branch 'origin/pull/12556' into QA_4_6 2016-09-19 10:51:45 +02:00
Michal Čihař
bccd690673 Merge remote-tracking branch 'origin/pull/12544' into QA_4_6 2016-09-19 10:50:39 +02:00
Michal Čihař
337e5755c0 Merge remote-tracking branch 'origin/pull/12555' into QA_4_6 2016-09-19 10:48:54 +02:00
Michal Čihař
e2ac325a7a Merge remote-tracking branch 'origin/pull/12557' into QA_4_6 2016-09-19 10:46:56 +02:00
Deven Bansod
3992bd65be Translated using Weblate (German) 
Currently translated at 99.8% (3201 of 3206 strings)

[CI skip]
 2016-09-19 10:34:39 +02:00
dingo thirteen
d800fc1679 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3206 of 3206 strings)

[CI skip]
 2016-09-19 10:34:38 +02:00
Deven Bansod
ea5870bb9b Fix class name in export test comments 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-18 12:04:38 +05:30
Michal Čihař
9d27af821c Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-09-16 16:05:31 +02:00
Michal Čihař
2fc2c25aaf Fix documentation to match state after PMASA-2016-54 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 15:59:42 +02:00
Deven Bansod
71cce8e2f5 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 
Conflicts:
	ChangeLog
 2016-09-16 18:38:31 +05:30
Deven Bansod
14340f9c31 ChangeLog entry for #12272 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 18:37:03 +05:30
Deven Bansod
a588880750 Special handling for radio fields after cloning on tbl insert page 
Fix #12272

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 18:33:28 +05:30
Michal Čihař
bd9bbc4b4d Document test removal suggestion for production usage 
Issue #12547

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 11:38:13 +02:00
Michal Čihař
b18426f887 Correctly reference Math.min (issue #12550) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 11:20:42 +02:00
Michal Čihař
350be95a53 Changelog entry for #12553 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 10:37:22 +02:00
Michal Čihař
b5c10991e9 Merge pull request #12553 from devenbansod/fix_12320 
Fix #12320 : Copying a user does not copy usergroup
 2016-09-16 10:36:41 +02:00
Michal Čihař
ea90f28551 Changelog for #12548 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 10:34:55 +02:00
Michal Čihař
3424fae642 Merge pull request #12548 from devenbansod/fix_12518 
Fix Export and Copy of Tables with Generated/Virtual columns
 2016-09-16 10:34:02 +02:00
Deven Bansod
b6952bbe55 ChangeLog entry for #12554 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	ChangeLog
 2016-09-16 13:59:00 +05:30
Deven Bansod
e8d07e3783 Allow vertical scrolling to read longer text values in grid editing 
Fix #12554

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 13:58:42 +05:30
Deven Bansod
4f1432eb2f ChangeLog entry for #12300 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	ChangeLog
 2016-09-16 13:57:26 +05:30
Deven Bansod
b054aa70ef Uncheck the Add CREATE PROCEDURE / FUNCTION etc. checkbox for a selective export 
User can always check it if he/she wants to export the procs,funcs etc. too

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 13:57:07 +05:30
Deven Bansod
14616cbcdf Fixed tests 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 13:56:15 +05:30
Deven Bansod
a52597f048 Include explaning statements near related code 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 13:56:15 +05:30
Deven Bansod
734b69b418 ChangeLog entry for #12487 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	ChangeLog
 2016-09-16 13:56:09 +05:30
Deven Bansod
023ced3552 Don't use PMA_DROP_IMPORT on Table insert if it has Blob field 
If we force PMA_DROP_IMPORT on all pages, users can't use Chrome's drag-drop-files feature
on Table Insert page with blob field

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 13:55:46 +05:30
Deven Bansod
815bf44584 Fix error messages to suit better localization 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 13:51:50 +05:30
Deven Bansod
f8ea67f2bc Fix #12530: Show enabled links for Edit and Execute after proper priv checks 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-16 13:51:34 +05:30
Michal Čihař
ee7d7d0b45 Fixed rendering BBCode links in setup 
The URL validation needs to be adjusted for setup as the links need to
go one level up.

Fixes #12512

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 09:47:29 +02:00
Michal Čihař
54e3434c0f Do not try to keep alive session even after expiry 
There is no sense in sending keepalive requests even after potential
session expiry. So limit sending of these only as long we're not idle
over cookie login validity.

Fixes #12550

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 09:36:50 +02:00
yanagimoto
168a419f48 Translated using Weblate (Japanese) 
Currently translated at 70.9% (2276 of 3206 strings)

[CI skip]
 2016-09-16 09:36:24 +02:00
Dadan Setia
e285135deb Translated using Weblate (Indonesian) 
Currently translated at 68.8% (2208 of 3206 strings)

[CI skip]
 2016-09-16 09:36:23 +02:00
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
Deven Bansod
093620495b Added tests for Usergroup as hidden field in Copy User form 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-13 22:25:24 +05:30
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
Deven Bansod
37ff86315b Fix usage of backquote parameter in getNonGenerated func 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-13 16:31:59 +05:30
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
5145c8c323 Fix #12320 : Copying a user does not copy usergroup 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-13 13:09:34 +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
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