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

101098 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Marc Delisle
fec98e1450 As suggested by Scrutinizer 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-18 14:57:44 -04:00
Marc Delisle
0d2c8996aa Cleanup 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-18 12:49:19 -04:00
Marc Delisle
17d0f783d5 Merge pull request #1793 from Tithugues/templatingErrorReportForm 
Templating error report form.
 2015-07-18 09:58:23 -04:00
Hugues Peccatte
ef16b1e358 Templating error report form. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-17 23:36:23 +02:00
Marc Delisle
770b0a05af Remove duplicate code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-17 16:21:37 -04:00
Dan Ungureanu
3fdd86ceda Updated sql-parser library to udan11/sql-parser@8835414. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-17 22:55:59 +03:00
Dan Ungureanu
98a497e67c Do not process unauthorized requests. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-17 18:14:57 +03:00
Dan Ungureanu
c5a788bfec Use mb_strlen to match the other code base. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-17 18:14:12 +03:00
Madhura Jayaratne
fbd39de216 Opening braces should be on a new line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 15:31:11 +05:30
Madhura Jayaratne
a405adb54d Fix coding style for another function call 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 15:28:39 +05:30
Madhura Jayaratne
453f996b92 Fix more coding style violations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 15:24:33 +05:30
Madhura Jayaratne
6e5baa582c Inline control structures are discouraged 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 15:12:50 +05:30
Madhura Jayaratne
e8d3137a11 File is being conditionally included; use "include_once" instead 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 15:11:31 +05:30
Madhura Jayaratne
aec1782ada More coding style fixes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:48:47 +05:30
Madhura Jayaratne
318ee2dce5 Multi-line assignments must have the equal sign on the second line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:46:45 +05:30
Madhura Jayaratne
2b2b4777b4 Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:42:41 +05:30
Madhura Jayaratne
658b8ad5e3 Revert tab changes in SqlFormatter_Test 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:36:15 +05:30
Madhura Jayaratne
a281d9c70f Use spaces in place of tabs 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:32:55 +05:30
Madhura Jayaratne
9081580c63 Remove extra new line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:23:27 +05:30
Madhura Jayaratne
039d0360fd Use underscore to prefix private variable names 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:19:09 +05:30
Madhura Jayaratne
8c19eedca1 Use correct name format 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:11:19 +05:30
Madhura Jayaratne
d93c110af8 Prefix more private methods with underscore 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:06:06 +05:30
Madhura Jayaratne
4f33dac829 Use underscores for private variables and methods 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:02:03 +05:30
Madhura Jayaratne
c4681f3e89 Fix coding styles for control structures 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 13:57:05 +05:30
Madhura Jayaratne
64d76a2afd Merge branch 'QA_4_4' 2015-07-17 11:43:55 +05:30