gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,550 Commits 12 Branches 481 Tags 2.4 GiB
37375734b7
Commit Graph

102550 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
37375734b7 Merge commit 'ae77949' 2015-09-14 10:51:30 -04:00
Marc Delisle
50073470a7 Merge branch 'QA_4_5' 2015-09-14 08:17:20 -04:00
Marc Delisle
f5fb9cdad1 Merge commit '829a5f7' 2015-09-14 08:17:14 -04:00
Marc Delisle
e6c7f66b0e Fixes #11480 Notice Undefined index: drop_database 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-14 08:16:38 -04:00
Weblate
1af3fcfd96 Merge remote-tracking branch 'origin/master' 2015-09-14 10:36:24 +02:00
muhammad
d28d68c6aa Translated using Weblate (Kurdish Sorani) 
Currently translated at 18.3% (589 of 3209 strings)

[CI skip]
 2015-09-14 10:36:18 +02:00
Michal Čihař
ead7b50cf6 Merge remote-tracking branch 'origin/QA_4_5' 2015-09-14 10:36:07 +02:00
Weblate
829a5f7b42 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-14 10:35:59 +02:00
Martin Lacina
2bf27f7426 Translated using Weblate (Slovak) 
Currently translated at 82.0% (2633 of 3209 strings)

[CI skip]
 2015-09-14 10:35:56 +02:00
muhammad
4608b4f77e Translated using Weblate (Kurdish Sorani) 
Currently translated at 18.3% (589 of 3209 strings)

[CI skip]
 2015-09-14 10:35:53 +02:00
Atul Pratap Singh
8c7f40393d Translated using Weblate (Hindi) 
Currently translated at 37.9% (1219 of 3209 strings)

[CI skip]
 2015-09-14 10:35:51 +02:00
Xosé Calvo
d9cba54024 Translated using Weblate (Galician) 
Currently translated at 81.2% (2606 of 3209 strings)

[CI skip]
 2015-09-14 10:35:48 +02:00
Michal Čihař
9edddbf598 Avoid failure if allowdeny rules are not set 
Fixes #11478

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-09-14 10:34:58 +02:00
Madhura Jayaratne
53277f8b67 Merge branch 'ssl' 2015-09-14 14:07:42 +10:00
Madhura Jayaratne
2cbcf730fe Simplify require SSL 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-14 14:07:14 +10:00
Weblate
595d473d41 Merge remote-tracking branch 'origin/master' 2015-09-14 02:25:08 +02:00
Atul Pratap Singh
298e144501 Translated using Weblate (Hindi) 
Currently translated at 37.9% (1219 of 3209 strings)

[CI skip]
 2015-09-14 02:25:00 +02:00
Xosé Calvo
94ceae22df Translated using Weblate (Galician) 
Currently translated at 81.2% (2607 of 3209 strings)

[CI skip]
 2015-09-14 02:24:57 +02:00
Madhura Jayaratne
55d2593213 Merge branch 'drizzle' 2015-09-14 10:24:43 +10:00
Madhura Jayaratne
b7d48ad8e3 Fix #11475 Warnings linked to Drizzle 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-14 10:22:16 +10:00
Weblate
8243f01ce7 Merge remote-tracking branch 'origin/master' 2015-09-13 15:46:00 +02:00
Martin Lacina
49a43e1f6e Translated using Weblate (Slovak) 
Currently translated at 82.0% (2633 of 3209 strings)

[CI skip]
 2015-09-13 15:45:55 +02:00
Marc Delisle
c7cde580c8 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-13 09:45:44 -04:00
Marc Delisle
b1d955e3e1 Merge branch 'QA_4_5' 2015-09-12 07:31:35 -04:00
Marc Delisle
9c20e644a5 Fix error report #14350 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-12 07:31:10 -04:00
Marc Delisle
00482376a3 Merge branch 'QA_4_5' 2015-09-12 06:53:25 -04:00
Marc Delisle
aeb7344c39 Merge commit 'd4bcfa1' 2015-09-12 06:53:17 -04:00
Marc Delisle
efb71af6f4 Fix error report #14326 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-12 06:51:51 -04:00
Marc Delisle
a2c009e670 Remove duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-12 06:25:36 -04:00
Marc Delisle
77c0d66a1b Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-11 13:37:54 -04:00
Marc Delisle
f1823798ff Remove duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-11 13:15:49 -04:00
Marc Delisle
27e54fb194 Refactor to remove display_export.inc.php 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-11 11:44:26 -04:00
Marc Delisle
a0927dcc47 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-11 08:19:02 -04:00
Marc Delisle
10863f9c28 Translated using Weblate (French) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2015-09-11 00:55:03 +02:00
Marc Delisle
d4bcfa1076 Translated using Weblate (French) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2015-09-11 00:12:11 +02:00
Marc Delisle
ae77949f39 Fixes #11472 Tiny translation issue in French 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-10 18:10:07 -04:00
Marc Delisle
bf311efef6 Merge branch 'QA_4_5' 2015-09-10 10:26:51 -04:00
Marc Delisle
22e927e912 Merge commit 'a9cd33e' 2015-09-10 10:26:16 -04:00
Weblate
441dc1bde9 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-10 16:25:55 +02:00
Andrey Aleksanyants
946a939b98 Translated using Weblate (Armenian) 
Currently translated at 62.8% (2016 of 3209 strings)

[CI skip]
 2015-09-10 16:25:50 +02:00
Marc Delisle
d2475b6f8b Merge branch 'QA_4_4' into QA_4_5 2015-09-10 10:25:21 -04:00
Marc Delisle
cff9058c36 Another instance of "Invalid argument supplied for foreach()" 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-10 10:24:45 -04:00
Weblate
4459969b78 Merge remote-tracking branch 'origin/master' 2015-09-10 12:01:34 +02:00
Andrey Aleksanyants
6d103cdec9 Translated using Weblate (Armenian) 
Currently translated at 62.8% (2016 of 3209 strings)

[CI skip]
 2015-09-10 12:01:28 +02:00
Madhura Jayaratne
a134c074cf Merge pull request #11430 from madhuracj/rfe6297 
Fix #6297 Use GET only for read only operations
 2015-09-10 20:01:23 +10:00
Madhura Jayaratne
6a163eaa46 Merge pull request #11460 from madhuracj/drizzle 
Removing Drizzle support from master branch
 2015-09-10 01:09:56 +10:00
Madhura Jayaratne
80f5322fe2 Remove server plugin page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:07:00 +10:00
Madhura Jayaratne
93bfdbe371 Remove more references to Drizzle 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:06:58 +10:00
Madhura Jayaratne
439fc3035c Remove create_tables_drizzle.sql 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:06:56 +10:00
Madhura Jayaratne
3c17f2c3b0 Remove references to Drizzle from documentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:06:55 +10:00