gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,012 Commits 12 Branches 481 Tags 2.4 GiB
014e9bfe5b
Commit Graph

102012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
014e9bfe5b Merge branch 'QA_4_4' 
Conflicts:
	libraries/rte/rte_routines.lib.php
 2015-08-25 08:06:14 +10:00
Madhura Jayaratne
8923d579ba Fix #11421 Stored-proc / routine - broken parameter parsing 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-25 08:03:10 +10:00
Hugues Peccatte
bd707b871d Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 23:34:50 +02:00
Hugues Peccatte
d7986e0d8d Change variable type. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 22:38:48 +02:00
Hugues Peccatte
a1b134c09e Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 22:38:34 +02:00
Hugues Peccatte
33f9379361 Rename ambiguous variable name. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 22:20:21 +02:00
Hugues Peccatte
7891598a4e Add noinspection tag not to report missing 'break' statement. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 21:51:54 +02:00
Hugues Peccatte
03f5aaaf98 Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 21:50:17 +02:00
Hugues Peccatte
62ed7992a8 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 21:27:25 +02:00
Hugues Peccatte
6bb56cf491 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 21:03:10 +02:00
Hugues Peccatte
fad2c6912d Comment query to fix unit tests. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 20:54:52 +02:00
Hugues Peccatte
340b01b395 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 20:00:22 +02:00
Hugues Peccatte
7af0fcf918 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 19:43:19 +02:00
Hugues Peccatte
00bd7f02f3 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 19:36:16 +02:00
Marc Delisle
a94c5728c3 Use concatenating assignment 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-24 10:27:15 -04:00
Marc Delisle
2f01d42b03 Merge pull request #11426 from Tithugues/sprintfForQueries_master 
Use statements and sprintf to create queries instead of concatenation.
 2015-08-24 10:17:41 -04:00
Hugues Peccatte
48071fb0c5 Remove duplicated space. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 16:16:23 +02:00
Marc Delisle
c49fd9a3c7 Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-24 09:53:33 -04:00
Hugues Peccatte
bf327900ee Merge branch 'sprintfForQueries_master' of https://github.com/tithugues/phpmyadmin into sprintfForQueries_master 2015-08-24 15:30:54 +02:00
Hugues Peccatte
a434017946 Use statements and sprintf to create queries instead of concatenation. 
Initialize variable.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 15:30:30 +02:00
Brad Kent
c8ae9ce598 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-24 15:30:30 +02:00
Marc Delisle
14178be716 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-24 15:30:30 +02:00
Andrea Pezzino
3775fb99a0 Fixes #11411 Undefined "replace" function on numeric scalar 
Signed-off-by: Andrea Pezzino <haxormail@gmail.com>
 2015-08-24 15:30:29 +02:00
Παναγιώτης Παπάζογλου
bce5d6d30b Translated using Weblate (Greek) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2015-08-24 15:30:28 +02:00
Marc Delisle
6575ebc376 Add missing type check 
Fix parameter type

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-24 15:30:27 +02:00
Hugues Peccatte
2493717d98 Remove useless units in CSS. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 15:30:27 +02:00
Marc Delisle
a4914504ff Fix return type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-24 15:30:27 +02:00
Hugues Peccatte
aac7ada391 Use statements and sprintf to create queries instead of concatenation. 
Initialize variable.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 15:29:25 +02:00
Kristjan Räts
8f47a50552 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2015-08-24 09:17:30 +02:00
Hugues Peccatte
3092948add Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-08-23 21:47:06 +02:00
Hugues Peccatte
40c67b505d Remove useless units in CSS. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-23 21:46:46 +02:00
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
Weblate
2277628094 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-08-23 21:16:05 +02:00
Deven Bansod
6c5867a781 Translated using Weblate (Hindi) 
Currently translated at 41.5% (1262 of 3040 strings)

[CI skip]
 2015-08-23 21:16:01 +02: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