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

101300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marc Delisle
f5566095ec Merge pull request #1814 from nisargjhaveri/bug_1813 
Fix #1813, Delete rows using "Check All" is broken
 2015-07-23 08:38:31 -07:00
Nisarg Jhaveri
31199faff9 Fix #1813, Delete rows using "Check All" is broken 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-07-23 20:03:47 +05:30
Atul Pratap Singh
b47b4e3a5e Remove redundant db table params when parent class is providing them 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-07-23 18:59:31 +05:30
Atul Pratap Singh
682614277c Merge pull request #1777 from gzzhanghao/table 
WIP: Refining Table & TableSearch class
 2015-07-23 18:35:03 +05:30
Weblate
84baa4df3e Merge remote-tracking branch 'origin/master' 2015-07-23 14:38:19 +02:00
Giovanni Sora
1d2fac1006 Translated using Weblate (Interlingua) 
Currently translated at 70.4% (2251 of 3194 strings)

[CI skip]
 2015-07-23 14:38:15 +02:00
Hugues Peccatte
bf61709259 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-23 14:38:07 +02:00
Marc Delisle
1daf0a030f Merge pull request #1811 from udan11/coverage_fix 
The test folder was included in coverage.
 2015-07-23 04:03:10 -07:00
Marc Delisle
befdbb5b3c Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-23 03:55:21 -07:00
Weblate
ecd94743c0 Merge remote-tracking branch 'origin/master' 2015-07-23 12:54:23 +02:00
josep constanti
e3ff2b35f6 Translated using Weblate (Catalan) 
Currently translated at 96.2% (3044 of 3161 strings)

[CI skip]
 2015-07-23 12:54:19 +02:00
Marc Delisle
b399665085 Merge pull request #1807 from udan11/l10n 
Improved localization.
 2015-07-23 03:54:16 -07:00
Jason
6fd29078b6 Fix test failures 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-23 11:46:40 +08:00
Jason
12ac57e0bd Remove references to TableSearch.class.php 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-23 11:29:53 +08:00
Jason
6636153071 Resolve conflicts from upstream 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-23 11:29:53 +08:00
Dan Ungureanu
e724dbb691 The test folder was included in coverage. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-23 03:23:55 +03:00
Weblate
465a9ed5f2 Merge remote-tracking branch 'origin/master' 2015-07-22 22:08:33 +02:00
Franco
e4123a9e4b Translated using Weblate (Spanish) 
Currently translated at 99.7% (3152 of 3161 strings)

[CI skip]
 2015-07-22 22:08:30 +02:00
Hugues Peccatte
a1cf9a24e3 Coding style modification. 
Make PHPCS happy.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-22 22:08:24 +02:00