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

107234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
조영민
186674f4eb Translated using Weblate (Korean) 
Currently translated at 77.4% (2494 of 3219 strings)

[CI skip]
 2016-09-21 17:55:15 +02:00
yanagimoto
aa26a4df5c Translated using Weblate (Japanese) 
Currently translated at 70.8% (2280 of 3219 strings)

[CI skip]
 2016-09-21 17:55:14 +02:00
Niemand Jedermann
d12e8b9e7c Translated using Weblate (German) 
Currently translated at 99.9% (3218 of 3219 strings)

[CI skip]
 2016-09-21 17:55:13 +02:00
Xavier Navarro
9287f46d24 Translated using Weblate (Catalan) 
Currently translated at 99.6% (3209 of 3219 strings)

[CI skip]
 2016-09-21 17:55:13 +02:00
Deven Bansod
05cd315074 Merge branch 'QA_4_6' 2016-09-20 23:05:41 +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
bcebfc81ed Merge branch 'QA_4_6' 2016-09-20 17:02:47 +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ř
fa17f2459e Merge branch 'QA_4_6' 2016-09-20 09:12:54 +02:00
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ř
3a4cad1596 Merge pull request #12568 from devenbansod/fix_12526 
Remove token from links and icon links in Navigation bar
 2016-09-19 13:01:43 +02:00
Michal Čihař
ad87644941 Merge branch 'QA_4_6' 2016-09-19 11:36:54 +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ř
7fc28626fd Merge branch 'QA_4_6' 2016-09-19 10:51:50 +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
Deven Bansod
90433788d6 Remove token from links and icon links in Navigation bar 
After #12415, we have removed the token from GET requests.
So it does not make much sense to have it embedded in the links in navigation, too.

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-19 14:17:46 +05:30
Michal Čihař
61d8dc4791 Merge branch 'QA_4_6' 2016-09-19 10:47:31 +02:00
Michal Čihař
9d1a7aa49d Merge remote-tracking branch 'origin/QA_4_6' 2016-09-19 10:47:29 +02:00
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
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
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