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

101808 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Kristjan Räts
262e2ffe90 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3200 of 3200 strings)

[CI skip]
 2015-08-12 15:07:26 +02:00
Marc Delisle
7bc910c306 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-12 08:10:36 -04:00
Weblate
63c5f257aa Merge remote-tracking branch 'origin/master' 2015-08-12 13:08:44 +02:00
Andrey Aleksanyants
86cbf34f8a Translated using Weblate (Armenian) 
Currently translated at 50.6% (1620 of 3201 strings)

[CI skip]
 2015-08-12 13:08:40 +02:00
Madhura Jayaratne
77ac068eda Refactor server_status.lib.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-12 16:38:36 +05:30
Madhura Jayaratne
04023ab6a2 Make translatable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-12 15:39:13 +05:30
Madhura Jayaratne
7bb078f771 Fix some line breaks 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-12 15:35:44 +05:30
Madhura Jayaratne
43f6e8b22a In fact this including replication.inc.php here is not required since it was include earlier 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-12 15:27:40 +05:30
Madhura Jayaratne
20102085ca Include replication.inc.php only if the database is in a slave replication process 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-12 15:11:39 +05:30
Madhura Jayaratne
a908a747b8 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-08-12 15:07:04 +05:30
Madhura Jayaratne
b5a620777e Remove unnecessary line break 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-12 15:05:53 +05:30
Weblate
8e55503437 Merge remote-tracking branch 'origin/master' 2015-08-12 10:42:31 +02:00
Michal Čihař
b2d4640b2c Translated using Weblate (Czech) 
Currently translated at 95.5% (3057 of 3201 strings)

[CI skip]
 2015-08-12 10:42:28 +02:00
Madhura Jayaratne
6187066851 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-08-12 14:12:21 +05:30
Madhura Jayaratne
ea701dfcc1 Do not repeat the same conditions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-12 14:11:16 +05:30
Madhura Jayaratne
ea422a327e Fix #11387 phpseclib < 2.0 produces deprecated messages on PHP 
Update phpseclib to version 2.0.0

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-12 11:27:32 +05:30
Madhura Jayaratne
15204ab227 Fix #11389 ReCaptcha produce deprecated messages under PHP 7 
Upgrade ReCaptcha library to version 1.1.1

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-12 09:49:22 +05:30
Atul Pratap Singh
c0b6e18f5c Add missing includes and update member variables 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-08-12 09:41:54 +05:30
Marc Delisle
b619077bed Merge pull request #11375 from udan11/import_rewrite 
Rewrote a part of the import mechanism.
 2015-08-11 19:16:20 -04:00
Hugues Peccatte
d7c9b2fc94 Refactor code of rte_routines.lib.php. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-11 22:42:05 +02:00
Dan Ungureanu
762d67dc36 Rewrote a part of the import mechanism. 
Updated sql-parser library to udan11/sql-parser@e713c9fa1d.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-08-11 23:32:18 +03:00
Marc Delisle
5024548a77 Merge pull request #11388 from udan11/update 
Fix #11383
 2015-08-11 14:07:44 -04:00