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

107199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deven Bansod
dc43daf34e Translated using Weblate (German) 
Currently translated at 99.2% (3196 of 3219 strings)

[CI skip]
 2016-09-19 10:47:14 +02:00
dingo thirteen
523b2f3ba9 Translated using Weblate (Dutch) 
Currently translated at 99.9% (3216 of 3219 strings)

[CI skip]
 2016-09-19 10:47:13 +02:00
Deven Bansod
774e8d505b Merge branch 'QA_4_6' 2016-09-18 12:05:28 +05:30
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ř
4962a4304c Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-09-16 16:05:39 +02:00
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ř
40a29bb78b Merge branch 'QA_4_6' 2016-09-16 15:59:47 +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
Michal Čihař
3fc7fc0c1b Validate branch and version strings on releasing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 15:33:10 +02:00
Deven Bansod
4605f0b1c9 Merge branch 'QA_4_6' 2016-09-16 18:39:41 +05:30
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ř
91ffece4a8 Sort files in tar by name (issue #12560) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 14:02:49 +02:00
Michal Čihař
541dbd3a5a Do not store uid in tarballs 
Fixes #12560

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 14:00:50 +02:00
Michal Čihař
a2ab6a04af Define namespace as constant 
Also use PHP 5.5 compatible way of defining static variable.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 13:21:20 +02:00
Michal Čihař
ba51eb95b6 Fix operator placement 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 13:12:10 +02:00
Michal Čihař
0ebdd9b6b5 Use environment for configuring tests only on CLI 
See https://httpoxy.org/ for possible problems.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 12:00:32 +02:00
Michal Čihař
1d09172f14 Turn OpenDocument wrapper to a class 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 11:49:53 +02:00
Michal Čihař
7982b7d28f Merge branch 'QA_4_6' 2016-09-16 11:38:54 +02:00
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ř
24c9df9a20 Merge branch 'QA_4_6' 2016-09-16 11:20:46 +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ř
08d491d021 Merge branch 'QA_4_6' 2016-09-16 10:37:59 +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ř
6047e229b7 Merge branch 'QA_4_6' 2016-09-16 10:35:16 +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
Michal Čihař
a716fa6e7e We need to count bytes against memory limit not chars 
Issue #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 10:29:48 +02:00
Michal Čihař
3546bed47e Avoid using mb_strlen for checking whether string is empty 
Using strlen produces same results here, just way faster.

Fixes #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 10:29:21 +02:00
Michal Čihař
6e3d38a1d3 Use strlen for calculating string index 
Issue #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-16 10:18:46 +02:00
Michal Čihař
ddb16a9ca1 Merge branch 'QA_4_6' 2016-09-16 09:48:40 +02:00
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ř
ccee3adaee Merge branch 'QA_4_6' 2016-09-16 09:37:33 +02:00
Michal Čihař
b9e43ac4c9 Merge remote-tracking branch 'origin/QA_4_6' 2016-09-16 09:37:30 +02:00
yanagimoto
9b3a04b811 Translated using Weblate (Japanese) 
Currently translated at 70.5% (2271 of 3219 strings)

[CI skip]
 2016-09-16 09:37:15 +02:00
Dadan Setia
1c82b79524 Translated using Weblate (Indonesian) 
Currently translated at 68.4% (2205 of 3219 strings)

[CI skip]
 2016-09-16 09:37:14 +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
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
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ř
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
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ř
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