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

101757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Hugues Peccatte
b230ab9bb8 Ignore composer.lock file. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-11 00:02:43 +02:00
Hugues Peccatte
b675dd8e5f Fix split code modifications. 
Update PHPDoc.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-10 23:59:50 +02:00
Hugues Peccatte
3de772470a Use object instead of instantiating a new one. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-10 22:43:10 +02:00
Hugues Peccatte
82d7132774 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-10 22:41:11 +02:00
Hugues Peccatte
9b0e7652a5 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-10 22:22:51 +02:00
Hugues Peccatte
2f7aecc12a Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-10 21:27:51 +02:00
Hugues Peccatte
a39ab76a24 Remove Generic.Files.LineLength from PMAStandard because already in PEAR standard. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-10 20:26:40 +02:00
Hugues Peccatte
0a058c6b34 Add PHPCS to composer. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-10 20:18:20 +02:00
Hugues Peccatte
5ade365619 Merge pull request #11374 from Tithugues/splitRte_master 
Split code of rte_routines.lib.php.
 2015-08-10 20:08:11 +02:00
Hugues Peccatte
19dcf73dba Merge pull request #11363 from Tithugues/templatingUL_master 
Templating ul tag.
 2015-08-10 20:06:57 +02:00
Madhura Jayaratne
bdce9e3ca6 Add missing include 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-10 21:26:16 +05:30
Marc Delisle
86136cbc49 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-10 09:15:57 -04:00
Sebastian Ott
e29119cb64 Improved schema svg export 
Signed-off-by: Sebastian Ott <sebastian@it-ott.de>
 2015-08-10 09:09:43 -04:00
Weblate
b29dc104bf Merge remote-tracking branch 'origin/master' 2015-08-10 14:42:41 +02:00
dingo thirteen
f7d0f9ac34 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3201 of 3201 strings)

[CI skip]
 2015-08-10 14:42:37 +02:00
Marc Delisle
a6fedd3415 Merge branch 'QA_4_4' 2015-08-10 08:42:23 -04:00
Marc Delisle
9fb5d8393d Merge commit '5924811' 2015-08-10 08:42:16 -04:00
Marc Delisle
c0803823f2 Fixes #11380 Incomplete message after import 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-10 08:41:07 -04:00
dingo thirteen
5924811985 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3040 of 3040 strings)

[CI skip]
 2015-08-10 14:38:35 +02:00
Madhura Jayaratne
52516b07e6 No longer used 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-10 16:36:31 +05:30
Stefano Martinelli
4b35964699 Translated using Weblate (Italian) 
Currently translated at 100.0% (3040 of 3040 strings)

[CI skip]
 2015-08-10 13:03:54 +02:00
Giovanni Sora
630bf5db8a Translated using Weblate (Interlingua) 
Currently translated at 69.6% (2116 of 3040 strings)

[CI skip]
 2015-08-10 13:03:53 +02:00
Marc Delisle
6e7c0a1cb4 Translated using Weblate (French) 
Currently translated at 100.0% (3040 of 3040 strings)

[CI skip]
 2015-08-10 13:03:37 +02:00
Madhura Jayaratne
ba4eb9e538 Merge pull request #11379 from madhuracj/structureController 
Create separate controllers from table and database structure pages
 2015-08-10 16:21:49 +05:30
Madhura Jayaratne
edf833644b Merge branch 'master' into structureController 
Conflicts:
	libraries/controllers/StructureController.class.php
 2015-08-10 16:19:13 +05:30
Madhura Jayaratne
2109cd3c35 Merge pull request #11378 from madhuracj/templates 
Organize templates into a meaningful structure
 2015-08-10 16:07:03 +05:30
Παναγιώτης Παπάζογλου
625f4e4f9f Translated using Weblate (Greek) 
Currently translated at 100.0% (3201 of 3201 strings)

[CI skip]
 2015-08-10 12:21:27 +02:00
Madhura Jayaratne
c90d05f3b2 Use instance variables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-10 15:50:32 +05:30
Παναγιώτης Παπάζογλου
fff8ccd5b9 Translated using Weblate (Greek) 
Currently translated at 100.0% (3040 of 3040 strings)

[CI skip]
 2015-08-10 12:06:11 +02:00