gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,979 Commits 12 Branches 481 Tags 2.4 GiB
2edb392efc
Commit Graph

101979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Kent
2edb392efc fix for routine radio and checkbox width 
fixes execute enum/set options and the "is deterministic" checkbox on edit

Signed-off-by: Brad Kent <bkfake-github@yahoo.com>
 2015-08-23 15:28:09 -04:00
Marc Delisle
68767c0ce6 Merge branch 'QA_4_4' 2015-08-23 15:16:13 -04:00
Marc Delisle
73261814fd ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-23 15:15:37 -04:00
Andrea Pezzino
95c8f9fd84 Fixes #11411 Undefined "replace" function on numeric scalar 
Signed-off-by: Andrea Pezzino <haxormail@gmail.com>
 2015-08-23 15:13:43 -04:00
Παναγιώτης Παπάζογλου
2d9d60b5b4 Translated using Weblate (Greek) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2015-08-23 20:15:59 +02:00
Marc Delisle
4b0cd53e75 Add missing type check 
Fix parameter type

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-23 12:34:42 -04:00
Weblate
79cb5f3c14 Merge remote-tracking branch 'origin/master' 2015-08-23 15:55:32 +02:00
Deven Bansod
92398a85aa Translated using Weblate (Hindi) 
Currently translated at 38.7% (1243 of 3207 strings)

[CI skip]
 2015-08-23 15:55:28 +02:00
Marc Delisle
93d0534439 Fix return type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-23 09:55:19 -04:00
Marc Delisle
aa52e9abd5 Merge pull request #11424 from devenbansod/fix_non_supported_query 
Fixed an unsupported query in Travis log
 2015-08-23 08:12:39 -04:00
Deven Bansod
0d78bfbad4 Fixed an unsupported query in Travis log 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-08-23 22:17:35 +05:30
Hugues Peccatte
a7455bf43f Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-08-23 13:45:33 +02:00
Hugues Peccatte
43077d22a3 PHPDoc update. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-23 13:29:33 +02:00
Marc Delisle
68313a0e0a Merge pull request #11423 from devenbansod/sha256_not_in_mariadb 
MariaDB 10.0.21 does not support sha256_password auth plugin
 2015-08-23 07:20:33 -04:00
Deven Bansod
30c754c350 MariaDB 10.0.21 also does not support sha256_password auth plugin 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-08-23 21:33:21 +05:30
Hugues Peccatte
3b50d8156d Minor coding style modification. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-23 13:12:05 +02:00
Hugues Peccatte
3aae312335 Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-23 13:11:27 +02:00
Hugues Peccatte
00dee1085c Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-08-23 13:04:46 +02:00
Hugues Peccatte
42ee7ceb3d Add missing ";". 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-23 12:49:42 +02:00
dingo thirteen
d073bf4ca7 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2015-08-23 12:37:35 +02:00
Marc Delisle
c6c6e5fa41 Translated using Weblate (French) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2015-08-23 12:27:04 +02:00
Domen
d00e9b998d Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2015-08-22 17:01:17 +02:00
Stefano Martinelli
9a3caeb8a8 Translated using Weblate (Italian) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2015-08-22 16:49:03 +02:00
Marc Delisle
cc42bd2b99 Make Travis happy 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-22 10:31:00 -04:00
Burak Yavuz
70b5c9ddeb Translated using Weblate (Turkish) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2015-08-22 16:12:46 +02:00
Marc Delisle
66f8e7d1db Merge pull request #11420 from udan11/update 
Updated sql-parser library.
 2015-08-22 07:55:08 -04:00
Marc Delisle
4d33796041 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-22 07:48:31 -04:00
Marc Delisle
325c318e00 Clarify explanation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-22 07:47:49 -04:00
Marc Delisle
c3702e8d93 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-22 07:41:11 -04:00
Marc Delisle
569e0c1414 Merge pull request #11419 from nisargjhaveri/combine_indexes 
Create indexes with table creation if "IF NOT EXISTS" is on
 2015-08-22 07:37:45 -04:00
Nisarg Jhaveri
b2e8e4660b Create indexes with table creation if "IF NOT EXISTS" is on 
- change default of IF NOT EXISTS option in export
- Add warning for efficiency with IF NOT EXISTS option

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-08-22 02:18:38 +05:30
Dan Ungureanu
4988084fff Fixed minor formatting issues. 
Updated sql-parser library to udan11/sql-parser@1b2988f296.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-08-21 15:55:26 +03:00
Marc Delisle
6a9d80eb89 Minimum supported PHP version is now 5.5 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-21 07:55:16 -04:00
Jason
fb2fb18dcd Fixes issue #11399. 
- Also some changes were made to prevent same kind of bug from occuring again

Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-08-21 07:23:27 -04:00
Madhura Jayaratne
88132a7fc6 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-21 06:49:47 +05:30
Madhura Jayaratne
aed8527845 Make the SQL exports compatible for side by side comparison with old exports 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 23:45:46 +05:30
Marc Delisle
932471e46b Fixes #11416 Can't use method return value in write context 
(Tested in PHP 5.4.44)

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-20 12:04:01 -04:00
Marc Delisle
3f307d21cb Some GSoC 2015 credits 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-20 09:42:01 -04:00
Marc Delisle
8a20928516 4.4.14 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-20 08:51:15 -04:00
Marc Delisle
df2a09773b Merge branch 'QA_4_4' 2015-08-20 08:50:27 -04:00
Marc Delisle
8085010441 4.4.15-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-20 08:45:53 -04:00
Madhura Jayaratne
5f4e8e0f2b Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:53:01 +05:30
Madhura Jayaratne
259564b979 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:46:35 +05:30
Madhura Jayaratne
e27ae93962 Organize export options 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:46:24 +05:30
Madhura Jayaratne
3307089efa Be more explicit that this directive is about auto increment value 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:38:25 +05:30
Madhura Jayaratne
f5a02f0eca sql_auto_increment is about auto increment value 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:30:44 +05:30
Madhura Jayaratne
da1d274078 Fix - Respect the Auto increment checkbox 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:24:29 +05:30
Madhura Jayaratne
769a8aa15f Fix #11414 Unclear export options / organization / hierarchy 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:06:38 +05:30
Madhura Jayaratne
5a94689562 Spatial indexes with multiple columns are not allowed 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 07:15:03 +05:30
Madhura Jayaratne
f6e64a1ddc Merge branch 'QA_4_4' 
Conflicts:
	libraries/structure.lib.php
 2015-08-20 07:11:30 +05:30