Commit Graph

102047 Commits

Author SHA1 Message Date
Phillip Rohmberger
bd3fd92598 Translated using Weblate (German)
Currently translated at 99.8% (3203 of 3207 strings)

[CI skip]
2015-08-25 15:43:47 +02:00
Weblate
57fc1b3dde Merge remote-tracking branch 'origin/master' 2015-08-25 14:12:50 +02:00
Chien Wei Lin
e82667cec8 Translated using Weblate (Chinese (Taiwan))
Currently translated at 98.8% (3171 of 3207 strings)

[CI skip]
2015-08-25 14:12:46 +02:00
Atul Pratap Singh
6074ee5afc Merge pull request #11425 from Tithugues/improveJquerySelectors_master
Improve jQuery selectors
2015-08-25 17:42:43 +05:30
Weblate
d0a810bd29 Merge remote-tracking branch 'origin/master' 2015-08-25 13:43:01 +02:00
Chien Wei Lin
8b0d10d5c8 Translated using Weblate (Chinese (Taiwan))
Currently translated at 98.4% (3158 of 3207 strings)

[CI skip]
2015-08-25 13:42:56 +02:00
Chien Wei Lin
db7cfdf161 Translated using Weblate (Chinese (Taiwan))
Currently translated at 98.4% (3158 of 3207 strings)

[CI skip]
2015-08-25 13:42:53 +02:00
Madhura Jayaratne
2f7bd35bbf Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-08-25 21:42:38 +10:00
Madhura Jayaratne
4c968434e5 Use sentence case for these as well
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-25 21:41:27 +10:00
Weblate
118c147996 Merge remote-tracking branch 'origin/master' 2015-08-25 13:38:05 +02:00
Chien Wei Lin
662deb52a0 Translated using Weblate (Chinese (Taiwan))
Currently translated at 98.1% (3149 of 3207 strings)

[CI skip]
2015-08-25 13:38:01 +02:00
Madhura Jayaratne
271d0caabf Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-08-25 21:25:52 +10:00
Madhura Jayaratne
a451c80370 Use sentence case - more instances
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-25 21:24:41 +10:00
Weblate
b06fdf917d Merge remote-tracking branch 'origin/master' 2015-08-25 13:24:09 +02:00
Chien Wei Lin
5d07153082 Translated using Weblate (Chinese (Taiwan))
Currently translated at 97.6% (3131 of 3207 strings)

[CI skip]
2015-08-25 13:24:04 +02:00
Madhura Jayaratne
4030fe9781 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-08-25 21:22:05 +10:00
Madhura Jayaratne
d0fe37bbc7 Use sentence case
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-25 21:21:11 +10:00
Weblate
e4a5a6d631 Merge remote-tracking branch 'origin/master' 2015-08-25 12:07:35 +02:00
Giovanni Sora
f2336f1456 Translated using Weblate (Interlingua)
Currently translated at 70.4% (2259 of 3207 strings)

[CI skip]
2015-08-25 12:07:31 +02:00
Madhura Jayaratne
47e82d6436 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-08-25 20:07:12 +10:00
Madhura Jayaratne
f978e17c69 Allow editing unless it's a static variable. Allow editing new dynamic variables added in MariaDB and newer versions of MySQL.
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-25 20:06:14 +10:00
Atul Pratap Singh
917add1528 Merge pull request #11370 from gzzhanghao/unittest
Recover test coverage
2015-08-25 13:30:44 +05:30
Madhura Jayaratne
8d22e3ab76 Use a proper dialog for instructions
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-25 13:40:39 +10:00
Madhura Jayaratne
dcb359ed2d Use maps only if the data has SRIDs
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-25 12:24:33 +10:00
Madhura Jayaratne
5e170382df groupPanel may not be there is the editor is already closed
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-25 12:03:55 +10:00
Madhura Jayaratne
e29ba1df22 Fix tests. Now there are only 5 as CREATE TABLE options are under 'Add CREATE TABLE statement' option
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-25 09:02:56 +10:00
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
a190826020 Improve jQuery selectors.
Remove duplicated selectors.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-08-24 21:06:27 +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