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

101123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
3cbe5d5078 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-20 12:15:47 +05:30
Madhura Jayaratne
19c9ab55bd Link to new FAQ entry 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-20 12:13:26 +05:30
Weblate
48f799dd75 Merge remote-tracking branch 'origin/master' 2015-07-20 08:38:00 +02:00
josep constanti
a774de04f1 Translated using Weblate (Catalan) 
Currently translated at 96.2% (3039 of 3159 strings)

[CI skip]
 2015-07-20 08:37:51 +02:00
Madhura Jayaratne
26df8109a6 Add a FAQ entry regarding the bind parameters feature 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-20 12:07:32 +05:30
Madhura Jayaratne
f424b63a49 Use 'User name' in db and table privilege pages as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-20 11:06:11 +05:30
Madhura Jayaratne
7b70565fe8 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-20 09:55:12 +05:30
Madhura Jayaratne
473d9ba54a For tests MySQL version is defined as 5.50. So document links will get point to the latest, which is 5.7 now 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-20 09:54:02 +05:30
Hauke Henningsen
fc634aa168 Translated using Weblate (German) 
Currently translated at 100.0% (3159 of 3159 strings)

[CI skip]
 2015-07-20 05:04:22 +02:00
Madhura Jayaratne
60bcbd0418 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-20 08:11:13 +05:30
Madhura Jayaratne
12a4c93da6 Allow linking 5.7 doc links 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-20 08:09:45 +05:30
Weblate
6206ee13cf Merge remote-tracking branch 'origin/master' 2015-07-20 04:22:11 +02:00
Giovanni Sora
ad069344b6 Translated using Weblate (Interlingua) 
Currently translated at 70.9% (2240 of 3159 strings)

[CI skip]
 2015-07-20 04:22:06 +02:00
Hauke Henningsen
5cf258a714 Translated using Weblate (German) 
Currently translated at 98.7% (3120 of 3159 strings)

[CI skip]
 2015-07-20 04:22:03 +02:00
Madhura Jayaratne
6adb96f3a7 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-20 07:49:38 +05:30
Madhura Jayaratne
b4bf7f7bb7 Use disabled edit icon for read only variables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-20 07:49:15 +05:30
Madhura Jayaratne
1d2f085bfe Improve coding style 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-20 07:48:56 +05:30
Hugues Peccatte
7ae011d1a5 Merge pull request #1794 from Tithugues/templatingHeaderLocation 
Templating header location
 2015-07-19 21:53:34 +02:00
Hugues Peccatte
ad59cb9c20 Templating header location. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-19 17:36:06 +02:00
Hugues Peccatte
f8eb5b71c9 PHPDoc update. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-19 16:07:40 +02:00
Hugues Peccatte
b92c1f4fdd Update PHPDoc. 
Make PHPCS happy.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-19 15:32:27 +02:00
Hugues Peccatte
5aff600e25 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-07-19 15:14:31 +02:00
Hugues Peccatte
9a9b390239 Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-19 15:07:01 +02:00
Marc Delisle
47ad60d0cb Merge pull request #1800 from udan11/fix 
Fix undefined index when executing some queries.
 2015-07-19 08:29:51 -04:00
Weblate
a5ff4c47c7 Merge remote-tracking branch 'origin/master' 2015-07-19 14:29:27 +02:00
Domen
7e89565101 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3159 of 3159 strings)

[CI skip]
 2015-07-19 14:29:23 +02:00
Marc Delisle
7fbb82a9e4 Merge pull request #1799 from udan11/lint_console 
Enabled lint for console.
 2015-07-19 08:29:17 -04:00
Domen
1e514ff686 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3159 of 3159 strings)

[CI skip]
 2015-07-19 14:17:51 +02:00
Hugues Peccatte
a99aad77e8 Add missing file comment and security. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-19 13:59:47 +02:00
Dan Ungureanu
8939bd312f Fix undefined index when executing some queries. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-19 14:56:58 +03:00
Dan Ungureanu
d1f494219a Enabled lint for console. 
Updated sql-parser library to udan11/sql-parser@5e554b3.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-19 14:53:02 +03:00
Hugues Peccatte
5fcd7cb50b Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-19 13:47:38 +02:00
Hugues Peccatte
2069f50518 Rename fields. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-19 13:47:19 +02:00
Hugues Peccatte
212809a1b8 Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-19 13:44:17 +02:00
Hugues Peccatte
114f1a66e1 Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-19 13:41:13 +02:00
Παναγιώτης Παπάζογλου
92af50b4a5 Translated using Weblate (Greek) 
Currently translated at 100.0% (3159 of 3159 strings)

[CI skip]
 2015-07-19 12:56:14 +02:00
Marc Delisle
4c5b1a4131 Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-19 06:20:14 -04:00
Burak Yavuz
01a7320b73 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3159 of 3159 strings)

[CI skip]
 2015-07-19 12:11:46 +02:00
Marc Delisle
78c14c044b Translated using Weblate (French) 
Currently translated at 100.0% (3159 of 3159 strings)

[CI skip]
 2015-07-19 12:07:34 +02:00
Marc Delisle
8dd010d814 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-19 05:31:31 -04:00
Marc Delisle
6caa8df53b Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-19 05:30:59 -04:00
Marc Delisle
0dab8dce4b Add space between sentences 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-19 05:29:38 -04:00
Burak Yavuz
5daf1fae9c Translated using Weblate (Turkish) 
Currently translated at 100.0% (3159 of 3159 strings)

[CI skip]
 2015-07-19 11:25:12 +02:00
Marc Delisle
8a9a6fd324 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-18 18:02:31 -04:00
Marc Delisle
a9391348da Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-18 18:01:58 -04:00
Marc Delisle
48044b5d48 Merge pull request #1798 from udan11/coding_style 
Miscellaneous coding style fixes
 2015-07-18 17:57:15 -04:00
Marc Delisle
e4d4349024 Merge pull request #1788 from udan11/lint 
[WIP] Added lint.
 2015-07-18 17:54:40 -04:00
Dan Ungureanu
236e0b6a6b Fixed coding style. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-19 00:18:49 +03:00
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-19 00:18:38 +03:00
Dan Ungureanu
f0667aa663 Updated sql-parser library to udan11/sql-parser@e713c9f. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-18 23:52:26 +03:00