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

101830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
44aa8078c8 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-08-14 13:45:41 -04:00
Marc Delisle
873d1eb8bd Code cleanup 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-14 13:45:34 -04:00
Weblate
6175d91a46 Merge remote-tracking branch 'origin/master' 2015-08-14 17:17:38 +02:00
Andrey Aleksanyants
5f6f3c4caa Translated using Weblate (Armenian) 
Currently translated at 58.7% (1881 of 3200 strings)

[CI skip]
 2015-08-14 17:17:33 +02:00
Marc Delisle
0becd67f44 File is being conditionally included; use "include_once" instead 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-14 11:17:25 -04:00
Andrey Aleksanyants
6c193e16f6 Better favicon with same image for all resolutions 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-14 09:26:06 +02:00
Marc Delisle
776eb6f5d1 Fixes #11396 Error when creating a new db 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-13 14:06:00 -04:00
Marc Delisle
03411af7ed Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-13 13:52:51 -04:00
Marc Delisle
75da81b1bd Refactor to remove display_import.inc.php 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-13 13:52:22 -04:00
Weblate
b7a28847ad Merge remote-tracking branch 'origin/master' 2015-08-13 14:08:47 +02:00
Andrey Aleksanyants
5106b09461 Translated using Weblate (Armenian) 
Currently translated at 57.9% (1853 of 3200 strings)

[CI skip]
 2015-08-13 14:08:43 +02:00
Marc Delisle
03cd70f17d Fix return parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-13 08:08:32 -04:00
Marc Delisle
f25de2d221 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-13 08:02:47 -04:00
Weblate
8b98743a61 Merge remote-tracking branch 'origin/master' 2015-08-13 12:42:19 +02:00
Andrey Aleksanyants
0ba257d03e Translated using Weblate (Armenian) 
Currently translated at 57.5% (1840 of 3200 strings)

[CI skip]
 2015-08-13 12:42:15 +02:00
Marc Delisle
8e63f8a7eb Merge pull request #11393 from udan11/master 
Remove unnecessary code.
 2015-08-13 06:42:13 -04:00
Andrey Aleksanyants
572d8ac822 Translated using Weblate (Armenian) 
Currently translated at 51.7% (1655 of 3200 strings)

[CI skip]
 2015-08-13 12:07:42 +02:00
Madhura Jayaratne
9cf71d9169 Fix #11394 Export/import Designer view 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-13 10:17:24 +05:30
Madhura Jayaratne
6f84ecf3a4 Simplify 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-13 08:27:39 +05:30
Madhura Jayaratne
140aa6b163 Remove redundant checks, fix queries 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-13 08:16:12 +05:30
Madhura Jayaratne
af95a39747 Refactor - Extract method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-13 07:52:40 +05:30
Madhura Jayaratne
8dadf179d2 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-08-13 07:35:04 +05:30
Madhura Jayaratne
224b2245a7 FIx bug - Use control link for db operation related to configuration storage 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-13 07:33:48 +05:30
Weblate
477f9bb054 Merge remote-tracking branch 'origin/master' 2015-08-13 04:02:03 +02:00
Franco
2570956e34 Translated using Weblate (Spanish) 
Currently translated at 99.9% (3198 of 3200 strings)

[CI skip]
 2015-08-13 04:01:58 +02:00
Stefano Martinelli
f4ec67a34c Translated using Weblate (Italian) 
Currently translated at 100.0% (3200 of 3200 strings)

[CI skip]
 2015-08-13 04:01:55 +02:00
Madhura Jayaratne
c1e45a02a1 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-08-13 07:23:15 +05:30
Madhura Jayaratne
906ab32112 Exporting metadata should be done last since it uses a USE statement 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-13 07:20:12 +05:30
Domen
e2ebde3792 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3200 of 3200 strings)

[CI skip]
 2015-08-12 23:23:51 +02:00
Dan Ungureanu
f8a019512f Remove unnecessary code. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-08-13 00:10:00 +03:00
Stefano Martinelli
34bff6fdd0 Translated using Weblate (Italian) 
Currently translated at 100.0% (3200 of 3200 strings)

[CI skip]
 2015-08-12 21:59:29 +02:00
Marc Delisle
2bfe605384 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-12 15:41:16 -04:00
Marc Delisle
7c63935d72 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-12 15:38:56 -04:00
Marc Delisle
790671864b Merge pull request #11391 from madhuracj/issue11387 
Fix #11387 phpseclib < 2.0 produces deprecated messages on PHP
 2015-08-12 15:38:01 -04:00
Παναγιώτης Παπάζογλου
6e23dcfc26 Translated using Weblate (Greek) 
Currently translated at 100.0% (3200 of 3200 strings)

[CI skip]
 2015-08-12 21:31:39 +02:00
Marc Delisle
b6e57e8a03 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-08-12 15:28:15 -04:00
Marc Delisle
a0dabdf52d Merge branch 'QA_4_4' 2015-08-12 15:26:58 -04:00
Marc Delisle
e328976deb Merge commit '2244620' 2015-08-12 15:26:48 -04:00
Weblate
a1401a3e72 Merge remote-tracking branch 'origin/master' 2015-08-12 21:26:34 +02:00
Lari Oesch
200d5215ad Translated using Weblate (Finnish) 
Currently translated at 58.9% (1887 of 3200 strings)

[CI skip]
 2015-08-12 21:26:30 +02:00
Marc Delisle
5bf03ef3e7 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-12 15:26:17 -04:00
Marc Delisle
de7a8a06d0 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-12 15:24:30 -04:00
Weblate
224462063b Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-08-12 21:23:03 +02:00
Lari Oesch
5f8b998654 Translated using Weblate (Finnish) 
Currently translated at 63.1% (1921 of 3040 strings)

[CI skip]
 2015-08-12 21:22:59 +02:00
Michal Čihař
1c765f3349 Translated using Weblate (Czech) 
Currently translated at 98.1% (2984 of 3040 strings)

[CI skip]
 2015-08-12 21:22:57 +02:00
Andrey Aleksanyants
0f286c0854 Translated using Weblate (Armenian) 
Currently translated at 50.8% (1546 of 3040 strings)

[CI skip]
 2015-08-12 21:22:55 +02:00
Marc Delisle
bcf8039509 Merge pull request #11390 from madhuracj/recaptcha 
Fix #11389 ReCaptcha produce deprecated messages under PHP 7
 2015-08-12 15:22:51 -04:00
Burak Yavuz
e13e30e172 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3200 of 3200 strings)

[CI skip]
 2015-08-12 19:04:13 +02:00
Andrey Aleksanyants
eebe530cf9 Translated using Weblate (Armenian) 
Currently translated at 51.6% (1654 of 3200 strings)

[CI skip]
 2015-08-12 16:44:32 +02:00
Marc Delisle
b7267c0280 Translated using Weblate (French) 
Currently translated at 100.0% (3200 of 3200 strings)

[CI skip]
 2015-08-12 16:44:21 +02:00