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

101786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Michal Čihař
f5d41a1e6d Fix json markup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-11 16:38:44 +02:00
Michal Čihař
8221cb2a30 Try to add custom composer repository 
See issue #6261

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-11 16:36:07 +02:00
Dan Ungureanu
d8937d8834 Updated sql-parser to udan11/sql-parser@aef354a430. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-08-11 17:17:46 +03:00
Michal Čihař
e14f664a25 No runkit for PHP 7.0 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-11 16:13:36 +02:00
Michal Čihař
cdf51105cb Add PHP 7.0 to Travis 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-11 15:56:42 +02:00
Michal Čihař
6aa5afce53 Do not try to set port 80 for https requests 
This is usually just a bug in our detection, so let's silently discard
port in this situation.

Fixes #10726

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-08-11 15:43:29 +02:00
Marc Delisle
362541e2dd Fix parameters type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-11 09:17:47 -04:00
Madhura Jayaratne
0ecc1ce7a5 Set enum values 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-11 16:04:16 +05:30
Madhura Jayaratne
f1f6ceb36b Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-11 15:58:34 +05:30
Madhura Jayaratne
0a5163826f Remove the hidden field having the same name as the enum select 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-11 15:49:02 +05:30
Madhura Jayaratne
24991614e2 Fix #11382 Selecting values for set field throws JS error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-11 15:42:15 +05:30
Madhura Jayaratne
5e937f4487 Add missing include 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-11 14:55:22 +05:30
Madhura Jayaratne
3e2982dadd Remove one nesting level 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-11 14:19:22 +05:30
Madhura Jayaratne
238b1c5e80 Use purge parameter when dropping columns as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-11 13:16:49 +05:30
Madhura Jayaratne
bd396f9bea Make PMA_cleanupRelations() more cohesive 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-11 13:04:25 +05:30
Madhura Jayaratne
44461cb9f1 Fix - Index list not updated upon dropping a column 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-11 12:51:37 +05:30
Madhura Jayaratne
e959e349c0 Do not attach index table unnecessarily 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-11 12:50:44 +05:30
Madhura Jayaratne
ca1c424e9d Add missing docs for parameters 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-11 12:24:31 +05:30
Madhura Jayaratne
7197a41f17 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-08-11 12:16:03 +05:30
Madhura Jayaratne
9701cbddc2 Fix spacing in doc comments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-11 12:14:43 +05:30
Marc Delisle
429a20d0dc Merge branch 'QA_4_4' 2015-08-10 18:15:02 -04:00
Marc Delisle
12fa1e6481 Incorrect scalar type declaration (reported under PHP 7) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-10 18:14:38 -04:00