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

101319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrey Aleksanyants
c4cdc3969e Translated using Weblate (Armenian) 
Currently translated at 25.1% (802 of 3194 strings)

[CI skip]
 2015-07-25 09:36:49 +02:00
Weblate
a5d43db550 Merge remote-tracking branch 'origin/master' 2015-07-24 23:54:05 +02:00
Hugues Peccatte
603953955a Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-24 23:54:03 +02:00
Andrey Aleksanyants
63a2333f0c Translated using Weblate (Armenian) 
Currently translated at 23.7% (759 of 3194 strings)

[CI skip]
 2015-07-24 23:54:01 +02:00
Weblate
3e080120da Merge remote-tracking branch 'origin/master' 2015-07-24 20:25:04 +02:00
Andrey Aleksanyants
9e8a0accc7 Translated using Weblate (Armenian) 
Currently translated at 17.6% (564 of 3194 strings)

[CI skip]
 2015-07-24 20:24:59 +02:00
Michal Čihař
a1484b2eb0 Fix format strings 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-07-24 20:24:52 +02:00
Weblate
7786be11a3 Merge remote-tracking branch 'origin/master' 2015-07-24 16:24:24 +02:00
Shameem Ahmed A Mulla
d1686f1a09 Translated using Weblate (Kannada) 
Currently translated at 4.5% (144 of 3194 strings)

[CI skip]
 2015-07-24 16:24:21 +02:00
Andrey Aleksanyants
4042842ef3 Translated using Weblate (Armenian) 
Currently translated at 4.3% (139 of 3194 strings)

[CI skip]
 2015-07-24 16:24:18 +02:00
Michal Čihař
c29b43a3b1 Move mailing lists to own server 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-07-24 16:24:08 +02:00
Shameem Ahmed A Mulla
1e0d9e286d Translated using Weblate (Kannada) 
Currently translated at 3.6% (116 of 3194 strings)

[CI skip]
 2015-07-24 11:28:30 +02:00
Marc Delisle
8ea2b6867b Translated using Weblate (French) 
Currently translated at 99.0% (3164 of 3194 strings)

[CI skip]
 2015-07-24 11:28:21 +02:00
Madhura Jayaratne
6711e4a520 We shouldn't be setting PMA_DRIZZLE arbitrarily 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-24 12:07:20 +05:30
Madhura Jayaratne
8a9c38ca23 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-24 11:57:44 +05:30
Madhura Jayaratne
29184d4e57 Simplify the logic 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-24 11:56:37 +05:30
Madhura Jayaratne
dcd537e4c4 New 'sys' schema (http://mysqlserverteam.com/the-mysql-sys-schema-in-mysql-5-7-7/) is a system schema 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-24 11:52:10 +05:30
Weblate
9ca619f621 Merge remote-tracking branch 'origin/master' 2015-07-24 07:52:17 +02:00
Madhura Jayaratne
2b8c9b8c9b Translated using Weblate (Sinhala) 
Currently translated at 62.3% (1993 of 3194 strings)

[CI skip]
 2015-07-24 07:52:13 +02:00
Madhura Jayaratne
082df1b5a9 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-24 11:22:01 +05:30
Madhura Jayaratne
50d7c81e7d Fix #1817 Creating configuration storage tables fail in MySQL 5.7 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-24 11:20:49 +05:30
Παναγιώτης Παπάζογλου
761fa631fa Translated using Weblate (Greek) 
Currently translated at 100.0% (3193 of 3193 strings)

[CI skip]
 2015-07-24 07:27:02 +02:00
Madhura Jayaratne
431c504640 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-24 08:39:20 +05:30
Madhura Jayaratne
bc66187533 More coding style fixes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-24 08:38:23 +05:30
Marc Delisle
b28dfd0ee3 Merge pull request #1815 from nisargjhaveri/dead_comments 
Remove dead old comments
 2015-07-23 20:05:36 -07:00
Madhura Jayaratne
edbc9650f2 Opening braces should be on a new line - another instance 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-24 08:33:32 +05:30
Madhura Jayaratne
539a114c1d Fix indentation for parameters 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-24 08:10:31 +05:30
Madhura Jayaratne
ac672d967e Opening braces should be on a new line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-24 08:06:09 +05:30
Madhura Jayaratne
3b5e8eefc2 Fix more doc comments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-24 07:59:30 +05:30
Madhura Jayaratne
1cd690b11f Fix doc comments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-24 07:53:39 +05:30
Madhura Jayaratne
5ef15a4025 Indentation for conditions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-24 07:47:38 +05:30
Madhura Jayaratne
9fb4dcb863 Use require or include based on whether the file is being conditionally 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-24 07:40:41 +05:30
Madhura Jayaratne
a5784d8d82 Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-24 07:37:31 +05:30
Madhura Jayaratne
6b6b5c5a38 Merge branch 'QA_4_4' 2015-07-24 06:09:42 +05:30
Madhura Jayaratne
34b32de9e4 Update ChangeLog links 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-24 06:06:57 +05:30
Burak Yavuz
cb77ab1e50 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2015-07-23 22:37:04 +02:00
Weblate
b98d5a6cb7 Merge remote-tracking branch 'origin/master' 2015-07-23 22:32:01 +02:00
Burak Yavuz
3d43d5174c Translated using Weblate (Turkish) 
Currently translated at 99.9% (3193 of 3194 strings)

[CI skip]
 2015-07-23 22:31:56 +02:00
Hugues Peccatte
7782bdc637 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-07-23 22:31:50 +02:00
Hugues Peccatte
47dcd7c762 Make PHPCS happy. 
Update PHPDoc.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-23 22:31:37 +02:00
Weblate
1bba4a60d7 Merge remote-tracking branch 'origin/master' 2015-07-23 22:20:45 +02:00
Burak Yavuz
4c711fdd8d Translated using Weblate (Turkish) 
Currently translated at 99.8% (3188 of 3194 strings)

[CI skip]
 2015-07-23 22:20:40 +02:00
Domen
923fb4cc88 Translated using Weblate (Slovenian) 
Currently translated at 99.4% (3176 of 3194 strings)

[CI skip]
 2015-07-23 22:20:36 +02:00
Hugues Peccatte
e29101e06f Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-23 22:20:28 +02:00
Nisarg Jhaveri
7655b267e3 Remove dead comments 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-07-23 21:45:15 +05:30
Hugues Peccatte
1221a76991 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-07-23 18:05:30 +02:00
Weblate
52b80e19c0 Merge remote-tracking branch 'origin/master' 2015-07-23 17:48:33 +02:00
Burak Yavuz
9f3ba0ce4a Translated using Weblate (Turkish) 
Currently translated at 99.0% (3164 of 3194 strings)

[CI skip]
 2015-07-23 17:48:29 +02:00
Hugues Peccatte
9cbfa30745 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-23 17:47:53 +02:00
Marc Delisle
35981069da Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-23 08:47:11 -07:00